Skip to content

Commit e7b3bee

Browse files
authored
Merge branch 'main' into pre-commit-ci-update-config
2 parents b94fae6 + 5f0ef7d commit e7b3bee

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ ARG MINIFORGE_VER=notset
6565

6666
FROM condaforge/miniforge3:${MINIFORGE_VER} AS miniforge-upstream
6767

68+
COPY pinned /opt/conda/conda-meta/pinned
69+
6870
RUN \
6971
--mount=type=bind,source=scripts,target=/tmp/build-scripts \
7072
<<EOF
@@ -94,6 +96,8 @@ EOF
9496
# Ownership & permissions based on https://docs.anaconda.com/anaconda/install/multi-user/#multi-user-anaconda-installation-on-linux
9597
COPY --from=miniforge-upstream --chown=root:conda --chmod=770 /opt/conda /opt/conda
9698

99+
COPY pinned /opt/conda/conda-meta/pinned
100+
97101
RUN \
98102
--mount=type=bind,source=scripts,target=/tmp/build-scripts \
99103
<<EOF
@@ -169,7 +173,6 @@ PACKAGES_TO_INSTALL=(
169173
"cuda-version=${CUDA_VER%.*}.*"
170174
'ipython>=8.37.0'
171175
'rapids-cli==0.1.*'
172-
'openssl==3.6.0'
173176
)
174177
rapids-mamba-retry install -y -n base \
175178
"${PACKAGES_TO_INSTALL[@]}"

context/.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
!cuvs-bench/
55
!entrypoint.sh
66
!notebooks.sh
7+
!pinned
78
!scripts/configure-apt
89
!scripts/configure-conda-base-environment
910
!scripts/install-gha-tools

context/pinned

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
openssl >=3.6.1
2+
wheel >=0.46.2

matrix-test.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
# Copyright (c) 2023-2025, NVIDIA CORPORATION.
1+
# Copyright (c) 2023-2026, NVIDIA CORPORATION.
22
# CUDA_VER is `<major>` (e.g. `13`)
33

44
pull-request:
5-
- { CUDA_VER: '12', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'l4', DRIVER: 'earliest' }
65
- { CUDA_VER: '12', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'a100', DRIVER: 'earliest' }
76
- { CUDA_VER: '12', ARCH: 'amd64', PYTHON_VER: '3.12', GPU: 'l4', DRIVER: 'latest' }
87
- { CUDA_VER: '13', ARCH: 'amd64', PYTHON_VER: '3.13', GPU: 'h100', DRIVER: 'latest' }
98
- { CUDA_VER: '13', ARCH: 'arm64', PYTHON_VER: '3.13', GPU: 'l4', DRIVER: 'latest' }
109
branch:
11-
- { CUDA_VER: '12', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'l4', DRIVER: 'earliest' }
1210
- { CUDA_VER: '12', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'a100', DRIVER: 'earliest' }
1311
- { CUDA_VER: '12', ARCH: 'amd64', PYTHON_VER: '3.12', GPU: 'l4', DRIVER: 'latest' }
1412
- { CUDA_VER: '13', ARCH: 'amd64', PYTHON_VER: '3.13', GPU: 'h100', DRIVER: 'latest' }

matrix.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
# Copyright (c) 2023-2025, NVIDIA CORPORATION.
1+
# Copyright (c) 2023-2026, NVIDIA CORPORATION.
22

33
CUDA_VER:
4-
# The version format is `<major>.<minor>.<patch>` (e.g. `13.1.0`).
4+
# The version format is `<major>.<minor>.<patch>` (e.g. `13.1.1`).
55
# Use the latest supported minor/patch version for each supported CUDA major
66
# version. Only one entry is allowed per CUDA major version.
77
- "12.9.1"
8-
- "13.1.0"
8+
- "13.1.1"
99
PYTHON_VER:
10-
- "3.10"
1110
- "3.11"
1211
- "3.12"
1312
- "3.13"

0 commit comments

Comments
 (0)