Switch to nvidia/cuda docker image.

glotzerlab · Jun 19, 2024 · fe47d8c · fe47d8c
1 parent d09650e
commit fe47d8c
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 1,822 deletions.
diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
@@ -62,7 +62,6 @@ jobs:
       run: |
         if [[ "${{ inputs.compiler_family }}" == "gcc" ]]
         then
-          echo "cuda=none" >> "$GITHUB_OUTPUT"
           case ${{ inputs.compiler_version }} in
             10|11)
               echo "image=glotzerlab/ci:ubuntu-22.04" >> "$GITHUB_OUTPUT";;
@@ -73,7 +72,6 @@ jobs:
           esac
         elif [[ "${{ inputs.compiler_family }}" == "clang" ]]
         then
-          echo "cuda=none" >> "$GITHUB_OUTPUT"
           case "${{ inputs.compiler_version }}" in
             13|14|15)
               echo "image=glotzerlab/ci:ubuntu-22.04" >> "$GITHUB_OUTPUT";;
@@ -87,7 +85,7 @@ jobs:
           echo "cuda=cuda${{ inputs.compiler_version }}" >> "$GITHUB_OUTPUT"
           case "${{ inputs.compiler_version }}" in
             125)
-              echo "image=glotzerlab/ci:ubuntu-24.04" >> "$GITHUB_OUTPUT";;
+              echo "image=nvidia/cuda:12.5.0-devel-ubuntu22.04" >> "$GITHUB_OUTPUT";;
             *)
               echo "Unknown compiler" && exit 1;;
             esac
@@ -109,6 +107,11 @@ jobs:
       run: ( shopt -s dotglob nullglob; rm -rf ./* )
     - name: Clean HOME
       run: ( shopt -s dotglob nullglob; rm -rf $HOME/* )
+    - name: Install git
+      if: ${{ startsWith(needs.prepare.outputs.image, 'nvidia') }}
+      run: |
+        apt-get update
+        apt-get install git --yes
     - name: Checkout
       uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
       with:
@@ -120,7 +123,7 @@ jobs:
       with:
         micromamba-version: '1.5.8-0'
         environment-name: test
-        environment-file: code/.github/workflows/environments/py${{ inputs.python }}-${{ needs.prepare.outputs.cuda }}-conda-lock.yml
+        environment-file: code/.github/workflows/environments/py${{ inputs.python }}-conda-lock.yml
         post-cleanup: all
 
     - name: Configure conda environment variables
@@ -212,6 +215,11 @@ jobs:
       run: ( shopt -s dotglob nullglob; rm -rf ./* )
     - name: Clean HOME
       run: ( shopt -s dotglob nullglob; rm -rf $HOME/* )
+    - name: Install git
+      if: ${{ startsWith(needs.prepare.outputs.image, 'nvidia') }}
+      run: |
+        apt-get update
+        apt-get install git --yes
     - name: Checkout
       uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
       with:
@@ -222,7 +230,7 @@ jobs:
       with:
         micromamba-version: '1.5.8-0'
         environment-name: test
-        environment-file: code/.github/workflows/environments/py${{ inputs.python }}-${{ needs.prepare.outputs.cuda }}-conda-lock.yml
+        environment-file: code/.github/workflows/environments/py${{ inputs.python }}-conda-lock.yml
         post-cleanup: environment
 
     - name: Configure conda environment variables

diff --git a/...ws/environments/py310-none-conda-lock.yml → ...rkflows/environments/py310-conda-lock.yml b/...ws/environments/py310-none-conda-lock.yml → ...rkflows/environments/py310-conda-lock.yml
@@ -5,11 +5,11 @@
 # available, unless you explicitly update the lock file.
 #
 # Install this environment as "YOURENV" with:
-#     conda-lock install -n YOURENV py310-none-conda-lock.yml
+#     conda-lock install -n YOURENV py310-conda-lock.yml
 # To update a single package to the latest version compatible with the version constraints in the source:
-#     conda-lock lock  --lockfile py310-none-conda-lock.yml --update PACKAGE
+#     conda-lock lock  --lockfile py310-conda-lock.yml --update PACKAGE
 # To re-solve the entire environment, e.g. after changing a version constraint in the source file:
-#     conda-lock -f tmp.yaml --lockfile py310-none-conda-lock.yml
+#     conda-lock -f tmp.yaml --lockfile py310-conda-lock.yml
 version: 1
 metadata:
   content_hash:

diff --git a/...ws/environments/py311-none-conda-lock.yml → ...rkflows/environments/py311-conda-lock.yml b/...ws/environments/py311-none-conda-lock.yml → ...rkflows/environments/py311-conda-lock.yml
@@ -5,11 +5,11 @@
 # available, unless you explicitly update the lock file.
 #
 # Install this environment as "YOURENV" with:
-#     conda-lock install -n YOURENV py311-none-conda-lock.yml
+#     conda-lock install -n YOURENV py311-conda-lock.yml
 # To update a single package to the latest version compatible with the version constraints in the source:
-#     conda-lock lock  --lockfile py311-none-conda-lock.yml --update PACKAGE
+#     conda-lock lock  --lockfile py311-conda-lock.yml --update PACKAGE
 # To re-solve the entire environment, e.g. after changing a version constraint in the source file:
-#     conda-lock -f tmp.yaml --lockfile py311-none-conda-lock.yml
+#     conda-lock -f tmp.yaml --lockfile py311-conda-lock.yml
 version: 1
 metadata:
   content_hash:

diff --git a/...ws/environments/py312-none-conda-lock.yml → ...rkflows/environments/py312-conda-lock.yml b/...ws/environments/py312-none-conda-lock.yml → ...rkflows/environments/py312-conda-lock.yml
@@ -5,11 +5,11 @@
 # available, unless you explicitly update the lock file.
 #
 # Install this environment as "YOURENV" with:
-#     conda-lock install -n YOURENV py312-none-conda-lock.yml
+#     conda-lock install -n YOURENV py312-conda-lock.yml
 # To update a single package to the latest version compatible with the version constraints in the source:
-#     conda-lock lock  --lockfile py312-none-conda-lock.yml --update PACKAGE
+#     conda-lock lock  --lockfile py312-conda-lock.yml --update PACKAGE
 # To re-solve the entire environment, e.g. after changing a version constraint in the source file:
-#     conda-lock -f tmp.yaml --lockfile py312-none-conda-lock.yml
+#     conda-lock -f tmp.yaml --lockfile py312-conda-lock.yml
 version: 1
 metadata:
   content_hash: