From d240fc3b92456c85470898f8c0703f1cff988072 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Fri, 19 Jul 2024 22:34:56 -0500
Subject: [PATCH] add CUDA 12.5 images (#689)

Contributes to https://github.com/rapidsai/build-planning/issues/73

Proposes the following:

* adding CUDA 12.5 images
* PR builds:
    * +1 test job covering `(cuda=12.5, arch=arm64)`
* branch builds:
    * +1 test job covering `(cuda=12.5, arch=x86_64)`
    * -1  test job covering `(cuda=12.2, arch=arm64)`

context: https://github.com/rapidsai/build-planning/issues/73#issuecomment-2231443095

## Notes for Reviewers

Per offline discussion with @raydouglass , this would be accompanied by a deprecation notice in the RAPIDS 24.08 release stating that the CUDA 12.2 images will be removed in some future release (future release not yet determined).

Authors:
  - James Lamb (https://github.com/jameslamb)
  - https://github.com/jakirkham

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)
  - https://github.com/jakirkham

URL: https://github.com/rapidsai/docker/pull/689
---
 .github/workflows/build-image.yml | 2 +-
 Dockerfile                        | 4 ++--
 matrix-test.yaml                  | 3 ++-
 matrix.yaml                       | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index eda2c7f2..8ed8b8c9 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -146,7 +146,7 @@ jobs:
             RAPIDS_VER=${{ inputs.RAPIDS_VER }}
           tags: ${{ inputs.RAFT_ANN_BENCH_DATASETS_TAG }}-${{ matrix.ARCH }}
       - name: Build RAFT ANN Benchmarks CPU image
-        if: inputs.CUDA_VER == '12.2.2' # we don't need to build CPU packages for different CUDA versions.
+        if: inputs.CUDA_VER == '12.5.1' # we don't need to build CPU packages for different CUDA versions.
         uses: docker/build-push-action@v6
         with:
           context: context
diff --git a/Dockerfile b/Dockerfile
index 8b68b5cd..5b72c8e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG CUDA_VER=12.0.1
-ARG PYTHON_VER=3.11
+ARG CUDA_VER=unset
+ARG PYTHON_VER=unset
 ARG LINUX_DISTRO=ubuntu
 ARG LINUX_DISTRO_VER=22.04
 ARG LINUX_VER=${LINUX_DISTRO}${LINUX_DISTRO_VER}
diff --git a/matrix-test.yaml b/matrix-test.yaml
index d57f63a7..f8ffdc60 100644
--- a/matrix-test.yaml
+++ b/matrix-test.yaml
@@ -4,10 +4,11 @@ pull-request:
   - { CUDA_VER: '11.8', ARCH: 'amd64', PYTHON_VER: '3.9', GPU: 'v100', DRIVER: 'earliest' }
   - { CUDA_VER: '12.0', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'v100', DRIVER: 'latest' }
   - { CUDA_VER: '12.2', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'a100', DRIVER: 'latest' }
+  - { CUDA_VER: '12.5', ARCH: 'amd64', PYTHON_VER: '3.11', GPU: 'v100', DRIVER: 'latest' }
 branch:
   - { CUDA_VER: '11.8', ARCH: 'amd64', PYTHON_VER: '3.9', GPU: 'v100', DRIVER: 'earliest' }
   - { CUDA_VER: '11.8', ARCH: 'amd64', PYTHON_VER: '3.9', GPU: 'v100', DRIVER: 'latest' }
   - { CUDA_VER: '12.0', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'v100', DRIVER: 'latest' }
   - { CUDA_VER: '12.0', ARCH: 'arm64', PYTHON_VER: '3.10', GPU: 'a100', DRIVER: 'latest' }
   - { CUDA_VER: '12.2', ARCH: 'amd64', PYTHON_VER: '3.11', GPU: 'v100', DRIVER: 'latest' }
-  - { CUDA_VER: '12.2', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'a100', DRIVER: 'latest' }
+  - { CUDA_VER: '12.5', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'a100', DRIVER: 'latest' }
diff --git a/matrix.yaml b/matrix.yaml
index cd76af0a..0e0c0c0b 100644
--- a/matrix.yaml
+++ b/matrix.yaml
@@ -2,6 +2,7 @@ CUDA_VER: # Should be `<major>.<minor>.<patch>` (e.g. `11.2.2`)
   - "11.8.0"
   - "12.0.1"
   - "12.2.2"
+  - "12.5.1"
 PYTHON_VER:
   - "3.9"
   - "3.10"