diff --git a/examples/README.md b/examples/README.md index 57e9a7a4..bd26f3af 100644 --- a/examples/README.md +++ b/examples/README.md @@ -17,8 +17,8 @@ Follow the instructions for setting up Cubed to run on your chosen cloud and exe | Executor | Cloud | Set up instructions | |----------|--------|--------------------------------------------------------------| -| Lithops | AWS | [lithops/aws-lambda/README.md](lithops/aws-lambda/README.md) | -| | Google | [lithops/gcf/README.md](lithops/gcf/README.md) | +| Lithops | AWS | [lithops/aws/README.md](lithops/aws/README.md) | +| | Google | [lithops/gcp/README.md](lithops/gcp/README.md) | | Modal | AWS | [modal/aws/README.md](modal/aws/README.md) | | | Google | [modal/gcp/README.md](modal/gcp/README.md) | | Coiled | AWS | [coiled/aws/README.md](coiled/aws/README.md) | @@ -30,7 +30,7 @@ The `add-asarray.py` script is a small example that adds two small 4x4 arrays to Export `CUBED_CONFIG` as described in the set up instructions, then run the script. This is for Lithops on AWS: ```shell -export CUBED_CONFIG=$(pwd)/lithops/aws-lambda +export CUBED_CONFIG=$(pwd)/lithops/aws python add-asarray.py ``` diff --git a/examples/lithops/aws-lambda/README.md b/examples/lithops/aws/README.md similarity index 98% rename from examples/lithops/aws-lambda/README.md rename to examples/lithops/aws/README.md index 7ca3ef66..1a273669 100644 --- a/examples/lithops/aws-lambda/README.md +++ b/examples/lithops/aws/README.md @@ -38,7 +38,7 @@ ulimit -n 1024 Before running the examples, first change to the top-level examples directory (`cd ../..`) and type ```shell -export CUBED_CONFIG=$(pwd)/lithops/aws-lambda +export CUBED_CONFIG=$(pwd)/lithops/aws ``` Then you can run the examples described [there](../../README.md). diff --git a/examples/lithops/aws-lambda/cubed.yaml b/examples/lithops/aws/cubed.yaml similarity index 100% rename from examples/lithops/aws-lambda/cubed.yaml rename to examples/lithops/aws/cubed.yaml diff --git a/examples/lithops/aws-lambda/docker/Dockerfile_aws_lambda b/examples/lithops/aws/docker/Dockerfile_aws_lambda similarity index 100% rename from examples/lithops/aws-lambda/docker/Dockerfile_aws_lambda rename to examples/lithops/aws/docker/Dockerfile_aws_lambda diff --git a/examples/lithops/aws-lambda/lithops-add-random-local.ipynb b/examples/lithops/aws/lithops-add-random-local.ipynb similarity index 100% rename from examples/lithops/aws-lambda/lithops-add-random-local.ipynb rename to examples/lithops/aws/lithops-add-random-local.ipynb diff --git a/examples/lithops/aws-lambda/lithops-matmul-random-local.ipynb b/examples/lithops/aws/lithops-matmul-random-local.ipynb similarity index 100% rename from examples/lithops/aws-lambda/lithops-matmul-random-local.ipynb rename to examples/lithops/aws/lithops-matmul-random-local.ipynb diff --git a/examples/lithops/aws-lambda/requirements.txt b/examples/lithops/aws/requirements.txt similarity index 100% rename from examples/lithops/aws-lambda/requirements.txt rename to examples/lithops/aws/requirements.txt diff --git a/examples/lithops/gcf/README.md b/examples/lithops/gcp/README.md similarity index 91% rename from examples/lithops/gcf/README.md rename to examples/lithops/gcp/README.md index 9b8b5689..fd7a4115 100644 --- a/examples/lithops/gcf/README.md +++ b/examples/lithops/gcp/README.md @@ -10,13 +10,13 @@ ```shell # from this directory -conda create --name cubed-lithops-gcf-examples -y python=3.11 -conda activate cubed-lithops-gcf-examples +conda create --name cubed-lithops-gcp-examples -y python=3.11 +conda activate cubed-lithops-gcp-examples pip install -r requirements.txt # use requirements file from same directory as this readme ``` 2. Configure Lithops with a [Google Cloud Functions compute backend](https://lithops-cloud.github.io/docs/source/compute_config/gcp_functions.html#configuration), and a [Google Cloud Storage backend](https://lithops-cloud.github.io/docs/source/storage_config/gcp_storage.html#configuration). - - Note: it may be useful to put the configuration in a different place to the default (e.g. `~/.lithops/config.gcf`), and then call `export LITHOPS_CONFIG_FILE=~/.lithops/config.gcf` + - Note: it may be useful to put the configuration in a different place to the default (e.g. `~/.lithops/config.gcp`), and then call `export LITHOPS_CONFIG_FILE=~/.lithops/config.gcp` - Although optional, it is convenient to [configure Lithops logging](https://lithops-cloud.github.io/docs/source/configuration.html) by setting `log_filename` (to `lithops.log`, for example), so that messages are sent to a file, rather than the console. 3. Give permissions to access your GCP buckets by calling `export GOOGLE_APPLICATION_CREDENTIALS=`, where `` is the full path to the `.json` key file you downloaded when configuring GCP storage for Lithops in the previous step. 4. Create a new GCP bucket (called `cubed--temp`, for example) in the same region you chose when configuring Google Cloud Functions and Storage for Lithops. This will be used for intermediate zarr data. Note that this is different to the bucket created when configuring Lithops, which just stores configuration data. @@ -38,7 +38,7 @@ ulimit -n 1024 Before running the examples, first change to the top-level examples directory (`cd ../..`) and type ```shell -export CUBED_CONFIG=$(pwd)/lithops/gcf +export CUBED_CONFIG=$(pwd)/lithops/gcp ``` Then you can run the examples described [there](../../README.md). diff --git a/examples/lithops/gcf/cubed.yaml b/examples/lithops/gcp/cubed.yaml similarity index 100% rename from examples/lithops/gcf/cubed.yaml rename to examples/lithops/gcp/cubed.yaml diff --git a/examples/lithops/gcf/requirements.txt b/examples/lithops/gcp/requirements.txt similarity index 100% rename from examples/lithops/gcf/requirements.txt rename to examples/lithops/gcp/requirements.txt