From 029c4bc9d9d8a5cbfa67111f4428e3ddd847cb72 Mon Sep 17 00:00:00 2001 From: RaulPPealez Date: Wed, 12 Apr 2023 13:35:05 +0200 Subject: [PATCH 1/5] Use Ubuntu-latest instead of deprecated Ubuntu 18 in CI --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 03041b9a..8a3e2d13 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -25,7 +25,7 @@ jobs: # Oldest supported versions # NOTE: renable CUDA 10.2 when it supported by NNPOps (https://github.com/conda-forge/nnpops-feedstock/pull/8) - name: Linux (CUDA 11.0, Python 3.7, PyTorch 1.11) - os: ubuntu-18.04 + os: ubuntu-latest cuda-version: "11.0.3" gcc-version: "8.5.*" nvcc-version: "11.0" @@ -34,7 +34,7 @@ jobs: # Latest supported versions - name: Linux (CUDA 11.2, Python 3.10, PyTorch 1.12) - os: ubuntu-18.04 + os: ubuntu-latest cuda-version: "11.2.2" gcc-version: "10.3.*" nvcc-version: "11.2" From 0d99f2f871ba3273664f93c3225ba3c5a9dac6aa Mon Sep 17 00:00:00 2001 From: RaulPPealez Date: Thu, 13 Apr 2023 11:30:38 +0200 Subject: [PATCH 2/5] Update cuda-toolkit action to 0.2.10 Change to Ubuntu 22.04 --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8a3e2d13..20d8e34e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -25,7 +25,7 @@ jobs: # Oldest supported versions # NOTE: renable CUDA 10.2 when it supported by NNPOps (https://github.com/conda-forge/nnpops-feedstock/pull/8) - name: Linux (CUDA 11.0, Python 3.7, PyTorch 1.11) - os: ubuntu-latest + os: ubuntu-22.04 cuda-version: "11.0.3" gcc-version: "8.5.*" nvcc-version: "11.0" @@ -34,7 +34,7 @@ jobs: # Latest supported versions - name: Linux (CUDA 11.2, Python 3.10, PyTorch 1.12) - os: ubuntu-latest + os: ubuntu-22.04 cuda-version: "11.2.2" gcc-version: "10.3.*" nvcc-version: "11.2" @@ -55,7 +55,7 @@ jobs: uses: actions/checkout@v2 - name: "Install CUDA Toolkit on Linux (if needed)" - uses: Jimver/cuda-toolkit@v0.2.5 + uses: Jimver/cuda-toolkit@v0.2.10 with: cuda: ${{ matrix.cuda-version }} if: startsWith(matrix.os, 'ubuntu') From 67446a8349f373aacae233d2754d12e9c976b25a Mon Sep 17 00:00:00 2001 From: RaulPPealez Date: Thu, 13 Apr 2023 11:40:06 +0200 Subject: [PATCH 3/5] Change to Ubuntu 20.04 --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 20d8e34e..757a8540 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -25,7 +25,7 @@ jobs: # Oldest supported versions # NOTE: renable CUDA 10.2 when it supported by NNPOps (https://github.com/conda-forge/nnpops-feedstock/pull/8) - name: Linux (CUDA 11.0, Python 3.7, PyTorch 1.11) - os: ubuntu-22.04 + os: ubuntu-20.04 cuda-version: "11.0.3" gcc-version: "8.5.*" nvcc-version: "11.0" @@ -34,7 +34,7 @@ jobs: # Latest supported versions - name: Linux (CUDA 11.2, Python 3.10, PyTorch 1.12) - os: ubuntu-22.04 + os: ubuntu-20.04 cuda-version: "11.2.2" gcc-version: "10.3.*" nvcc-version: "11.2" From d31c71e5d1bedf72fb3f961cc97664297de4a8a5 Mon Sep 17 00:00:00 2001 From: RaulPPealez Date: Thu, 13 Apr 2023 11:45:05 +0200 Subject: [PATCH 4/5] Add override to cuda install. Go back to Ubuntu 22.04 --- .github/workflows/CI.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 757a8540..75de4b2a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -25,7 +25,7 @@ jobs: # Oldest supported versions # NOTE: renable CUDA 10.2 when it supported by NNPOps (https://github.com/conda-forge/nnpops-feedstock/pull/8) - name: Linux (CUDA 11.0, Python 3.7, PyTorch 1.11) - os: ubuntu-20.04 + os: ubuntu-22.04 cuda-version: "11.0.3" gcc-version: "8.5.*" nvcc-version: "11.0" @@ -34,7 +34,7 @@ jobs: # Latest supported versions - name: Linux (CUDA 11.2, Python 3.10, PyTorch 1.12) - os: ubuntu-20.04 + os: ubuntu-22.04 cuda-version: "11.2.2" gcc-version: "10.3.*" nvcc-version: "11.2" @@ -58,6 +58,7 @@ jobs: uses: Jimver/cuda-toolkit@v0.2.10 with: cuda: ${{ matrix.cuda-version }} + linux-local-args: '["--toolkit", "--override"]' if: startsWith(matrix.os, 'ubuntu') - name: "Install SDK on MacOS (if needed)" From 60862c264e5bcf56fe6181d0ef01c7f98f3f9e39 Mon Sep 17 00:00:00 2001 From: RaulPPealez Date: Thu, 13 Apr 2023 11:52:19 +0200 Subject: [PATCH 5/5] Rename conda env to ubuntu 22 --- .../{build-ubuntu-18.04.yml => build-ubuntu-22.04.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename devtools/conda-envs/{build-ubuntu-18.04.yml => build-ubuntu-22.04.yml} (96%) diff --git a/devtools/conda-envs/build-ubuntu-18.04.yml b/devtools/conda-envs/build-ubuntu-22.04.yml similarity index 96% rename from devtools/conda-envs/build-ubuntu-18.04.yml rename to devtools/conda-envs/build-ubuntu-22.04.yml index 40271720..ffd4d2f7 100644 --- a/devtools/conda-envs/build-ubuntu-18.04.yml +++ b/devtools/conda-envs/build-ubuntu-22.04.yml @@ -17,4 +17,4 @@ dependencies: - pytorch-gpu @PYTORCH_VERSION@ - swig - sysroot_linux-64 2.17 - - torchani \ No newline at end of file + - torchani