Skip to content

Commit bcc7d5b

Browse files
lowenerlowener
committed
Merge branch 'main' into 26.02-cagra-extend
2 parents 8ba5eed + 2168fe5 commit bcc7d5b

190 files changed

Lines changed: 11271 additions & 2206 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devcontainer/cuda12.9-conda/devcontainer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
"args": {
66
"CUDA": "12.9",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:26.02-cpp-mambaforge"
8+
"BASE": "rapidsai/devcontainers:26.04-cpp-mambaforge"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.02-cuda12.9-conda",
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.04-cuda12.9-conda",
1515
"--ulimit",
1616
"nofile=500000"
1717
],
1818
"hostRequirements": {"gpu": "optional"},
1919
"features": {
20-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.2": {}
20+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.4": {}
2121
},
2222
"overrideFeatureInstallOrder": [
2323
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda12.9-pip/devcontainer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
"args": {
66
"CUDA": "12.9",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:26.02-cpp-cuda12.9-ucx1.19.0-openmpi5.0.7"
8+
"BASE": "rapidsai/devcontainers:26.04-cpp-cuda12.9-ucx1.19.0-openmpi5.0.7"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.02-cuda12.9-pip",
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.04-cuda12.9-pip",
1515
"--ulimit",
1616
"nofile=500000"
1717
],
1818
"hostRequirements": {"gpu": "optional"},
1919
"features": {
20-
"ghcr.io/rapidsai/devcontainers/features/cuda:26.2": {
20+
"ghcr.io/rapidsai/devcontainers/features/cuda:26.4": {
2121
"version": "12.9",
2222
"installcuBLAS": true,
2323
"installcuSOLVER": true,
2424
"installcuRAND": true,
2525
"installcuSPARSE": true
2626
},
27-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.2": {}
27+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.4": {}
2828
},
2929
"overrideFeatureInstallOrder": [
3030
"ghcr.io/rapidsai/devcontainers/features/ucx",

.devcontainer/cuda13.0-conda/devcontainer.json renamed to .devcontainer/cuda13.1-conda/devcontainer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
"context": "${localWorkspaceFolder}/.devcontainer",
44
"dockerfile": "${localWorkspaceFolder}/.devcontainer/Dockerfile",
55
"args": {
6-
"CUDA": "13.0",
6+
"CUDA": "13.1",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:26.02-cpp-mambaforge"
8+
"BASE": "rapidsai/devcontainers:26.04-cpp-mambaforge"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.02-cuda13.0-conda",
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.04-cuda13.1-conda",
1515
"--ulimit",
1616
"nofile=500000"
1717
],
1818
"hostRequirements": {"gpu": "optional"},
1919
"features": {
20-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.2": {}
20+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.4": {}
2121
},
2222
"overrideFeatureInstallOrder": [
2323
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
2424
],
25-
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda13.0-envs}"],
25+
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda13.1-envs}"],
2626
"postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
2727
"workspaceFolder": "/home/coder",
2828
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cuvs,type=bind,consistency=consistent",
@@ -31,7 +31,7 @@
3131
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
3232
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
3333
"source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
34-
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda13.0-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
34+
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda13.1-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
3535
],
3636
"customizations": {
3737
"vscode": {

.devcontainer/cuda13.0-pip/devcontainer.json renamed to .devcontainer/cuda13.1-pip/devcontainer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,43 @@
33
"context": "${localWorkspaceFolder}/.devcontainer",
44
"dockerfile": "${localWorkspaceFolder}/.devcontainer/Dockerfile",
55
"args": {
6-
"CUDA": "13.0",
6+
"CUDA": "13.1",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:26.02-cpp-cuda13.0-ucx1.19.0-openmpi5.0.7"
8+
"BASE": "rapidsai/devcontainers:26.04-cpp-cuda13.1-ucx1.19.0-openmpi5.0.7"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.02-cuda13.0-pip",
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.04-cuda13.1-pip",
1515
"--ulimit",
1616
"nofile=500000"
1717
],
1818
"hostRequirements": {"gpu": "optional"},
1919
"features": {
20-
"ghcr.io/rapidsai/devcontainers/features/cuda:26.2": {
21-
"version": "13.0",
20+
"ghcr.io/rapidsai/devcontainers/features/cuda:26.4": {
21+
"version": "13.1",
2222
"installcuBLAS": true,
2323
"installcuSOLVER": true,
2424
"installcuRAND": true,
2525
"installcuSPARSE": true
2626
},
27-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.2": {}
27+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.4": {}
2828
},
2929
"overrideFeatureInstallOrder": [
3030
"ghcr.io/rapidsai/devcontainers/features/ucx",
3131
"ghcr.io/rapidsai/devcontainers/features/cuda",
3232
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
3333
],
34-
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda13.0-venvs}"],
34+
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda13.1-venvs}"],
3535
"postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
3636
"workspaceFolder": "/home/coder",
3737
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cuvs,type=bind,consistency=consistent",
3838
"mounts": [
3939
"source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
4040
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
4141
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
42-
"source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda13.0-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent"
42+
"source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda13.1-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent"
4343
],
4444
"customizations": {
4545
"vscode": {

‎.github/workflows/build.yaml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,20 @@ jobs:
5252
matrix:
5353
cuda_version:
5454
- &latest_cuda12 '12.9.1'
55-
- &latest_cuda13 '13.0.2'
55+
- &latest_cuda13 '13.1.0'
56+
arch:
57+
- amd64
58+
- arm64
5659
with:
5760
build_type: ${{ inputs.build_type || 'branch' }}
5861
branch: ${{ inputs.branch }}
59-
arch: "amd64"
62+
arch: "${{matrix.arch}}"
6063
date: ${{ inputs.date }}
61-
container_image: "rapidsai/ci-wheel:26.02-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
64+
container_image: "rapidsai/ci-wheel:26.04-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
6265
node_type: "cpu16"
6366
# requires_license_builder: false
6467
script: "ci/build_standalone_c.sh"
65-
artifact-name: "libcuvs_c_${{ matrix.cuda_version }}.tar.gz"
68+
artifact-name: "libcuvs_c_${{ matrix.cuda_version }}_${{ matrix.arch }}.tar.gz"
6669
file_to_upload: "libcuvs_c.tar.gz"
6770
sha: ${{ inputs.sha }}
6871
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
@@ -83,7 +86,7 @@ jobs:
8386
branch: ${{ inputs.branch }}
8487
arch: "amd64"
8588
date: ${{ inputs.date }}
86-
container_image: "rapidsai/ci-conda:26.02-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
89+
container_image: "rapidsai/ci-conda:26.04-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
8790
node_type: "gpu-l4-latest-1"
8891
script: "ci/build_rust.sh"
8992
sha: ${{ inputs.sha }}
@@ -105,7 +108,7 @@ jobs:
105108
branch: ${{ inputs.branch }}
106109
arch: "amd64"
107110
date: ${{ inputs.date }}
108-
container_image: "rapidsai/ci-conda:26.02-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
111+
container_image: "rapidsai/ci-conda:26.04-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
109112
node_type: "gpu-l4-latest-1"
110113
script: "ci/build_go.sh"
111114
sha: ${{ inputs.sha }}
@@ -126,7 +129,7 @@ jobs:
126129
branch: ${{ inputs.branch }}
127130
arch: "amd64"
128131
date: ${{ inputs.date }}
129-
container_image: "rapidsai/ci-conda:26.02-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
132+
container_image: "rapidsai/ci-conda:26.04-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
130133
script: "ci/build_java.sh"
131134
artifact-name: "cuvs-java-cuda${{ matrix.cuda_version }}"
132135
file_to_upload: "java/cuvs-java/target/"
@@ -166,7 +169,7 @@ jobs:
166169
arch: "amd64"
167170
branch: ${{ inputs.branch }}
168171
build_type: ${{ inputs.build_type || 'branch' }}
169-
container_image: "rapidsai/ci-conda:26.02-latest"
172+
container_image: "rapidsai/ci-conda:26.04-latest"
170173
date: ${{ inputs.date }}
171174
node_type: "gpu-l4-latest-1"
172175
script: "ci/build_docs.sh"

‎.github/workflows/pr.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,15 @@ jobs:
186186
matrix:
187187
cuda_version:
188188
- &latest_cuda12 '12.9.1'
189-
- &latest_cuda13 '13.0.2'
189+
- &latest_cuda13 '13.1.0'
190190
arch:
191191
- amd64
192192
- arm64
193193
with:
194194
build_type: pull-request
195195
arch: "${{matrix.arch}}"
196196
date: ${{ inputs.date }}_c
197-
container_image: "rapidsai/ci-wheel:26.02-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
197+
container_image: "rapidsai/ci-wheel:26.04-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
198198
node_type: "cpu16"
199199
# requires_license_builder: false
200200
script: "ci/build_standalone_c.sh --build-tests"
@@ -221,7 +221,7 @@ jobs:
221221
node_type: "gpu-l4-latest-1"
222222
arch: "${{matrix.arch}}"
223223
date: ${{ inputs.date }}_c
224-
container_image: "rapidsai/ci-wheel:26.02-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
224+
container_image: "rapidsai/ci-wheel:26.04-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
225225
script: "ci/test_standalone_c.sh libcuvs_c_${{ matrix.cuda_version }}_${{ matrix.arch }}.tar.gz"
226226
sha: ${{ inputs.sha }}
227227
conda-java-build-and-tests:
@@ -241,7 +241,7 @@ jobs:
241241
build_type: pull-request
242242
node_type: "gpu-l4-latest-1"
243243
arch: "amd64"
244-
container_image: "rapidsai/ci-conda:26.02-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
244+
container_image: "rapidsai/ci-conda:26.04-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
245245
script: "ci/test_java.sh"
246246
artifact-name: "cuvs-java-cuda${{ matrix.cuda_version }}"
247247
file_to_upload: "java/cuvs-java/target/"
@@ -263,7 +263,7 @@ jobs:
263263
build_type: pull-request
264264
node_type: "gpu-l4-latest-1"
265265
arch: "amd64"
266-
container_image: "rapidsai/ci-conda:26.02-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
266+
container_image: "rapidsai/ci-conda:26.04-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
267267
script: "ci/build_rust.sh"
268268
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
269269
go-build:
@@ -283,7 +283,7 @@ jobs:
283283
build_type: pull-request
284284
node_type: "gpu-l4-latest-1"
285285
arch: "amd64"
286-
container_image: "rapidsai/ci-conda:26.02-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
286+
container_image: "rapidsai/ci-conda:26.04-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
287287
script: "ci/build_go.sh"
288288
docs-build:
289289
needs: conda-python-build
@@ -293,7 +293,7 @@ jobs:
293293
build_type: pull-request
294294
node_type: "gpu-l4-latest-1"
295295
arch: "amd64"
296-
container_image: "rapidsai/ci-conda:26.02-latest"
296+
container_image: "rapidsai/ci-conda:26.04-latest"
297297
script: "ci/build_docs.sh"
298298
wheel-build-libcuvs:
299299
needs: checks
@@ -334,7 +334,7 @@ jobs:
334334
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@main
335335
with:
336336
arch: '["amd64", "arm64"]'
337-
cuda: '["13.0"]'
337+
cuda: '["13.1"]'
338338
node_type: "cpu8"
339339
rapids-aux-secret-1: GIST_REPO_READ_ORG_GITHUB_TOKEN
340340
env: |

‎.github/workflows/publish-rust.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
cuda_version:
1717
- '12.9.1'
1818
container:
19-
image: "rapidsai/ci-conda:26.02-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
19+
image: "rapidsai/ci-conda:26.04-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
2020
steps:
2121
- uses: actions/checkout@v4
2222
- name: Check if release build

‎.github/workflows/test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ jobs:
6262
matrix:
6363
cuda_version:
6464
- '12.9.1'
65-
- '13.0.2'
65+
- '13.1.0'
6666
with:
6767
build_type: ${{ inputs.build_type }}
6868
branch: ${{ inputs.branch }}
6969
date: ${{ inputs.date }}
7070
sha: ${{ inputs.sha }}
7171
node_type: "gpu-l4-latest-1"
7272
arch: "amd64"
73-
container_image: "rapidsai/ci-conda:26.02-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
73+
container_image: "rapidsai/ci-conda:26.04-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
7474
script: "ci/test_java.sh"
7575
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
7676
wheel-tests-cuvs:

‎Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
# syntax=docker/dockerfile:1.5
25

36
# ==============================================================================
@@ -55,7 +58,7 @@ RUN wget --quiet https://github.com/conda-forge/miniforge/releases/latest/downlo
5558

5659
# Create conda environment and install cuVS packages with pinned dependencies
5760
RUN conda create -n cuvs python=${PYTHON_VER} -y && \
58-
conda run -n cuvs conda install -c rapidsai -c conda-forge -c nvidia \
61+
conda run -n cuvs conda install -c rapidsai -c conda-forge \
5962
cuvs=${RAPIDS_VER} \
6063
libcuvs=${RAPIDS_VER} \
6164
cuda-version=${CUDA_VER} \

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ If installing a version that has not yet been released, the `rapidsai` channel c
106106

107107
```bash
108108
# CUDA 13
109-
conda install -c rapidsai-nightly -c conda-forge cuvs=26.02 cuda-version=13.0
109+
conda install -c rapidsai-nightly -c conda-forge cuvs=26.04 cuda-version=13.1
110110

111111
# CUDA 12
112-
conda install -c rapidsai-nightly -c conda-forge cuvs=26.02 cuda-version=12.9
112+
conda install -c rapidsai-nightly -c conda-forge cuvs=26.04 cuda-version=12.9
113113
```
114114

115115
> [!NOTE]

0 commit comments

Comments
 (0)