From c4137cf4dc75c0e3889cd05ab08fa390e47c539f Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Fri, 22 Apr 2022 00:26:42 +0900 Subject: [PATCH 1/6] Update default cuda version --- dockers/base-cuda/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/base-cuda/Dockerfile b/dockers/base-cuda/Dockerfile index 44ffab8833c29..2e70a72d16ee3 100644 --- a/dockers/base-cuda/Dockerfile +++ b/dockers/base-cuda/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG CUDA_VERSION=11.1 +ARG CUDA_VERSION=11.3.1 FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu20.04 From 662c07c9cae77aaedf665ed70e0d36cc8732858c Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Fri, 22 Apr 2022 00:32:47 +0900 Subject: [PATCH 2/6] Specify cuda_version of docker build arguments --- .github/workflows/events-nightly.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/events-nightly.yml b/.github/workflows/events-nightly.yml index c3c92d7965aea..729f8a167ff75 100644 --- a/.github/workflows/events-nightly.yml +++ b/.github/workflows/events-nightly.yml @@ -115,12 +115,12 @@ jobs: matrix: include: # the config used in '.azure-pipelines/gpu-tests.yml' - - {python_version: "3.7", pytorch_version: "1.8"} - - {python_version: "3.7", pytorch_version: "1.10"} + - {python_version: "3.7", pytorch_version: "1.8", cuda_version: "11.1"} + - {python_version: "3.7", pytorch_version: "1.10", cuda_version: "11.3.1"} # latest (used in Tutorials) - - {python_version: "3.8", pytorch_version: "1.8"} - - {python_version: "3.9", pytorch_version: "1.10"} - - {python_version: "3.9", pytorch_version: "1.11"} + - {python_version: "3.8", pytorch_version: "1.8", cuda_version: "11.1"} + - {python_version: "3.9", pytorch_version: "1.10", cuda_version: "11.1"} + - {python_version: "3.9", pytorch_version: "1.11", cuda_version: "11.3.1"} steps: - name: Checkout From e35e1b66f383749a62cbbad78c2ddf84ec717d42 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Fri, 22 Apr 2022 00:39:03 +0900 Subject: [PATCH 3/6] Revert cuda_version --- .github/workflows/events-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/events-nightly.yml b/.github/workflows/events-nightly.yml index 729f8a167ff75..a7d968d49ffe2 100644 --- a/.github/workflows/events-nightly.yml +++ b/.github/workflows/events-nightly.yml @@ -116,7 +116,7 @@ jobs: include: # the config used in '.azure-pipelines/gpu-tests.yml' - {python_version: "3.7", pytorch_version: "1.8", cuda_version: "11.1"} - - {python_version: "3.7", pytorch_version: "1.10", cuda_version: "11.3.1"} + - {python_version: "3.7", pytorch_version: "1.10", cuda_version: "11.1"} # latest (used in Tutorials) - {python_version: "3.8", pytorch_version: "1.8", cuda_version: "11.1"} - {python_version: "3.9", pytorch_version: "1.10", cuda_version: "11.1"} From 0d2155ecc45bb0cddb39e72546de7a47f78bfc42 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Fri, 22 Apr 2022 00:41:19 +0900 Subject: [PATCH 4/6] Build more docker images --- .github/workflows/ci_dockers.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_dockers.yml b/.github/workflows/ci_dockers.yml index a159539fd9229..e06ee2d236307 100644 --- a/.github/workflows/ci_dockers.yml +++ b/.github/workflows/ci_dockers.yml @@ -73,11 +73,14 @@ jobs: strategy: fail-fast: false matrix: - python_version: ["3.7", "3.9"] - pytorch_version: ["1.8", "1.11"] include: # the config used in '.azure-pipelines/gpu-tests.yml' - - {python_version: "3.9", pytorch_version: "1.10"} + - {python_version: "3.7", pytorch_version: "1.8", cuda_version: "11.1"} + - {python_version: "3.7", pytorch_version: "1.10", cuda_version: "11.1"} + # latest (used in Tutorials) + - {python_version: "3.8", pytorch_version: "1.8", cuda_version: "11.1"} + - {python_version: "3.9", pytorch_version: "1.10", cuda_version: "11.1"} + - {python_version: "3.9", pytorch_version: "1.11", cuda_version: "11.3.1"} steps: - name: Checkout uses: actions/checkout@v2 From d2a179687c17ae48e2c2435e53799d737f5782e9 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Thu, 21 Apr 2022 13:01:58 -0400 Subject: [PATCH 5/6] Use cuda_version in CI --- .github/workflows/ci_dockers.yml | 1 + .github/workflows/events-nightly.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ci_dockers.yml b/.github/workflows/ci_dockers.yml index e06ee2d236307..8b6a843d28d30 100644 --- a/.github/workflows/ci_dockers.yml +++ b/.github/workflows/ci_dockers.yml @@ -91,6 +91,7 @@ jobs: build-args: | PYTHON_VERSION=${{ matrix.python_version }} PYTORCH_VERSION=${{ matrix.pytorch_version }} + CUDA_VERSION=${{ matrix.cuda_version }} file: dockers/base-cuda/Dockerfile push: false timeout-minutes: 75 diff --git a/.github/workflows/events-nightly.yml b/.github/workflows/events-nightly.yml index a7d968d49ffe2..d9aefaa1196f0 100644 --- a/.github/workflows/events-nightly.yml +++ b/.github/workflows/events-nightly.yml @@ -140,6 +140,7 @@ jobs: build-args: | PYTHON_VERSION=${{ matrix.python_version }} PYTORCH_VERSION=${{ matrix.pytorch_version }} + CUDA_VERSION=${{ matrix.cuda_version }} file: dockers/base-cuda/Dockerfile push: ${{ env.PUSH_TO_HUB }} tags: pytorchlightning/pytorch_lightning:base-cuda-py${{ matrix.python_version }}-torch${{ matrix.pytorch_version }} From 228bd1e7b981bcd2d6f2aa21029c492d45543b05 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Thu, 21 Apr 2022 13:54:17 -0400 Subject: [PATCH 6/6] Update cuda images to build --- .github/workflows/ci_dockers.yml | 2 +- .github/workflows/events-nightly.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_dockers.yml b/.github/workflows/ci_dockers.yml index 8b6a843d28d30..2481eddd7f633 100644 --- a/.github/workflows/ci_dockers.yml +++ b/.github/workflows/ci_dockers.yml @@ -75,8 +75,8 @@ jobs: matrix: include: # the config used in '.azure-pipelines/gpu-tests.yml' - - {python_version: "3.7", pytorch_version: "1.8", cuda_version: "11.1"} - {python_version: "3.7", pytorch_version: "1.10", cuda_version: "11.1"} + - {python_version: "3.7", pytorch_version: "1.11", cuda_version: "11.3.1"} # latest (used in Tutorials) - {python_version: "3.8", pytorch_version: "1.8", cuda_version: "11.1"} - {python_version: "3.9", pytorch_version: "1.10", cuda_version: "11.1"} diff --git a/.github/workflows/events-nightly.yml b/.github/workflows/events-nightly.yml index d9aefaa1196f0..361b318629b28 100644 --- a/.github/workflows/events-nightly.yml +++ b/.github/workflows/events-nightly.yml @@ -115,8 +115,8 @@ jobs: matrix: include: # the config used in '.azure-pipelines/gpu-tests.yml' - - {python_version: "3.7", pytorch_version: "1.8", cuda_version: "11.1"} - {python_version: "3.7", pytorch_version: "1.10", cuda_version: "11.1"} + - {python_version: "3.7", pytorch_version: "1.11", cuda_version: "11.3.1"} # latest (used in Tutorials) - {python_version: "3.8", pytorch_version: "1.8", cuda_version: "11.1"} - {python_version: "3.9", pytorch_version: "1.10", cuda_version: "11.1"}