From 677117db1ac929ca8dfd45b2a317525f9ccfe57f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 16 Jul 2024 15:08:45 -0500 Subject: [PATCH 1/3] add CUDA 12.5 images --- .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 8e1bf937..ef414fea 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.0' # we don't need to build CPU packages for different CUDA versions. uses: docker/build-push-action@v5 with: context: context diff --git a/Dockerfile b/Dockerfile index a0bc1905..414047f3 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..a11315f7 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: 'arm64', PYTHON_VER: '3.11', GPU: 'a100', 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: 'amd64', PYTHON_VER: '3.11', GPU: 'v100', 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 `..` (e.g. `11.2.2`) - "11.8.0" - "12.0.1" - "12.2.2" + - "12.5.1" PYTHON_VER: - "3.9" - "3.10" From d2e18fbe1ad8fb92f4746251c00342f736a16640 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 16 Jul 2024 17:01:00 -0500 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: jakirkham --- matrix-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/matrix-test.yaml b/matrix-test.yaml index a11315f7..2f68ba14 100644 --- a/matrix-test.yaml +++ b/matrix-test.yaml @@ -4,11 +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: '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.5', ARCH: 'amd64', PYTHON_VER: '3.11', GPU: 'v100', DRIVER: 'latest' } + - { CUDA_VER: '12.5', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'v100', DRIVER: 'latest' } From adf7816646c82813d482df6d09b2e5f2035f7eef Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 16 Jul 2024 17:01:42 -0500 Subject: [PATCH 3/3] Update matrix-test.yaml --- matrix-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-test.yaml b/matrix-test.yaml index 2f68ba14..f8ffdc60 100644 --- a/matrix-test.yaml +++ b/matrix-test.yaml @@ -11,4 +11,4 @@ branch: - { 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.5', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'v100', DRIVER: 'latest' } + - { CUDA_VER: '12.5', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'a100', DRIVER: 'latest' }