diff --git a/.github/workflows/cml.yml b/.github/workflows/cml.yml index 7f1238cac..e1bbe3470 100644 --- a/.github/workflows/cml.yml +++ b/.github/workflows/cml.yml @@ -64,6 +64,7 @@ jobs: --reuse-idle \ --cloud=gcp \ --cloud-type=n1-highmem-96+nvidia-tesla-t4*4 \ + --cloud-gpu=tesla \ --cloud-hdd-size=500 \ --cloud-region="$zone" \ --cloud-permission-set="${GCP_SERVICE_ACCOUNT},scopes=storage-rw" \ @@ -98,14 +99,14 @@ jobs: with: path: .venv key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} + - name: Setup tmate debug session + uses: mxschmitt/action-tmate@v3 + if: ${{ inputs.model_debug_enabled }} - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: poetry install -E dev -E plotting --no-interaction --no-root - name: Install project run: poetry install -E dev -E plotting --no-interaction - - name: Setup tmate debug session - uses: mxschmitt/action-tmate@v3 - if: ${{ inputs.model_debug_enabled }} - name: CML setup run: cml ci - name: Setup rclone diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 5a275e1a6..ece965530 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -# FROM ghcr.io/iterative/cml:0-dvc2-base1-gpu -FROM ghcr.io/iterative/cml@sha256:ad10a563de25311241f10d9d5509cecab6bc754b6b2c90b61e309e34fe80911e +FROM ghcr.io/iterative/cml:0-dvc2-base1-gpu +# FROM ghcr.io/iterative/cml@sha256:ad10a563de25311241f10d9d5509cecab6bc754b6b2c90b61e309e34fe80911e WORKDIR ${CML_RUNNER_PATH} COPY . pyrovelocity/ diff --git a/reproducibility/figures/upload_figures_drive.sh b/reproducibility/figures/upload_figures_drive.sh index 5584dec66..afb366ca9 100755 --- a/reproducibility/figures/upload_figures_drive.sh +++ b/reproducibility/figures/upload_figures_drive.sh @@ -13,12 +13,17 @@ # # A shared Google Drive folder named "pyrovelocity/figures" must exist # and an rclone remote name pyrovelocitydrive must be configured. +# Generate client_id and client_secret at: +# +# https://rclone.org/drive/#making-your-own-client-id +# # Update the values of gdrive_name and prefix_path below accordingly # # mamba install -y rclone # rclone config create "pyrovelocitydrive" drive user_acknowledge_abuse true # -# The latter will redirect to the web browser to authenticate the rclone remote. +# Use the client_id and client_secret generated above to authenticate. +# See: https://rclone.org/drive/#configuration #-------------# set -euxo pipefail