Skip to content

Commit efd9f8b

Browse files
julianmijulianmi
authored
Merge branch 'main' into ace-fused-hnsw-build
2 parents 35234d5 + ef29c4c commit efd9f8b

310 files changed

Lines changed: 9905 additions & 3101 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
"args": {
66
"CUDA": "12.9",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:26.10-cpp-mambaforge"
8+
"BASE": "rapidsai/devcontainers:26.12-cpp-mambaforge"
99
},
1010
"cacheFrom": [
11-
"ghcr.io/rapidsai/cuvs/devcontainer:26.10-cuda12.9-conda"
11+
"ghcr.io/rapidsai/cuvs/devcontainer:26.12-cuda12.9-conda"
1212
]
1313
},
1414
"runArgs": [
1515
"--rm",
1616
"--name",
17-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.10-cuda12.9-conda",
17+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.12-cuda12.9-conda",
1818
"--ulimit",
1919
"nofile=500000"
2020
],
2121
"hostRequirements": {"gpu": "optional"},
2222
"features": {
23-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.10": {}
23+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.12": {}
2424
},
2525
"overrideFeatureInstallOrder": [
2626
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@
55
"args": {
66
"CUDA": "12.9",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:26.10-cpp-cuda12.9-ucx1.19.0-openmpi5.0.10"
8+
"BASE": "rapidsai/devcontainers:26.12-cpp-cuda12.9-ucx1.21.0-openmpi5.0.10"
99
},
1010
"cacheFrom": [
11-
"ghcr.io/rapidsai/cuvs/devcontainer:26.10-cuda12.9-pip"
11+
"ghcr.io/rapidsai/cuvs/devcontainer:26.12-cuda12.9-pip"
1212
]
1313
},
1414
"runArgs": [
1515
"--rm",
1616
"--name",
17-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.10-cuda12.9-pip",
17+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.12-cuda12.9-pip",
1818
"--ulimit",
1919
"nofile=500000"
2020
],
2121
"hostRequirements": {"gpu": "optional"},
2222
"features": {
23-
"ghcr.io/rapidsai/devcontainers/features/cuda:26.10": {
23+
"ghcr.io/rapidsai/devcontainers/features/cuda:26.12": {
2424
"version": "12.9",
2525
"installcuBLAS": true,
2626
"installcuSOLVER": true,
2727
"installcuRAND": true,
2828
"installcuSPARSE": true
2929
},
30-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.10": {}
30+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.12": {}
3131
},
3232
"overrideFeatureInstallOrder": [
3333
"ghcr.io/rapidsai/devcontainers/features/ucx",

‎.devcontainer/cuda13.3-conda/devcontainer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
"args": {
66
"CUDA": "13.3",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:26.10-cpp-mambaforge"
8+
"BASE": "rapidsai/devcontainers:26.12-cpp-mambaforge"
99
},
1010
"cacheFrom": [
11-
"ghcr.io/rapidsai/cuvs/devcontainer:26.10-cuda13.3-conda"
11+
"ghcr.io/rapidsai/cuvs/devcontainer:26.12-cuda13.3-conda"
1212
]
1313
},
1414
"runArgs": [
1515
"--rm",
1616
"--name",
17-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.10-cuda13.3-conda",
17+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.12-cuda13.3-conda",
1818
"--ulimit",
1919
"nofile=500000"
2020
],
2121
"hostRequirements": {"gpu": "optional"},
2222
"features": {
23-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.10": {}
23+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.12": {}
2424
},
2525
"overrideFeatureInstallOrder": [
2626
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda13.3-pip/devcontainer.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@
55
"args": {
66
"CUDA": "13.3",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:26.10-cpp-cuda13.3-ucx1.19.0-openmpi5.0.10"
8+
"BASE": "rapidsai/devcontainers:26.12-cpp-cuda13.3-ucx1.21.0-openmpi5.0.10"
99
},
1010
"cacheFrom": [
11-
"ghcr.io/rapidsai/cuvs/devcontainer:26.10-cuda13.3-pip"
11+
"ghcr.io/rapidsai/cuvs/devcontainer:26.12-cuda13.3-pip"
1212
]
1313
},
1414
"runArgs": [
1515
"--rm",
1616
"--name",
17-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.10-cuda13.3-pip",
17+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.12-cuda13.3-pip",
1818
"--ulimit",
1919
"nofile=500000"
2020
],
2121
"hostRequirements": {"gpu": "optional"},
2222
"features": {
23-
"ghcr.io/rapidsai/devcontainers/features/cuda:26.10": {
23+
"ghcr.io/rapidsai/devcontainers/features/cuda:26.12": {
2424
"version": "13.3",
2525
"installcuBLAS": true,
2626
"installcuSOLVER": true,
2727
"installcuRAND": true,
2828
"installcuSPARSE": true
2929
},
30-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.10": {}
30+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.12": {}
3131
},
3232
"overrideFeatureInstallOrder": [
3333
"ghcr.io/rapidsai/devcontainers/features/ucx",

‎.github/workflows/build.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
branch: ${{ inputs.branch }}
8383
arch: "${{matrix.ARCH}}"
8484
date: ${{ inputs.date }}
85-
container_image: "rapidsai/ci-wheel:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
85+
container_image: "rapidsai/ci-wheel:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
8686
node_type: "cpu16"
8787
requires_license_builder: true
8888
script: "ci/build_standalone_c.sh"
@@ -118,7 +118,7 @@ jobs:
118118
branch: ${{ inputs.branch }}
119119
arch: "amd64"
120120
date: ${{ inputs.date }}
121-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
121+
container_image: "rapidsai/ci-conda:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
122122
node_type: "gpu-l4-latest-1"
123123
script: "ci/build_rust.sh"
124124
sha: ${{ inputs.sha }}
@@ -151,7 +151,7 @@ jobs:
151151
branch: ${{ inputs.branch }}
152152
arch: "amd64"
153153
date: ${{ inputs.date }}
154-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
154+
container_image: "rapidsai/ci-conda:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
155155
node_type: "gpu-l4-latest-1"
156156
script: "ci/build_go.sh"
157157
sha: ${{ inputs.sha }}
@@ -184,7 +184,7 @@ jobs:
184184
branch: ${{ inputs.branch }}
185185
arch: "amd64"
186186
date: ${{ inputs.date }}
187-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
187+
container_image: "rapidsai/ci-conda:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
188188
script: "ci/build_java.sh"
189189
artifact-name: "cuvs-java-cuda${{ matrix.CUDA_VER }}"
190190
file_to_upload: "java/cuvs-java/target/"
@@ -210,7 +210,7 @@ jobs:
210210
branch: ${{ inputs.branch }}
211211
arch: "amd64"
212212
date: ${{ inputs.date }}
213-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
213+
container_image: "rapidsai/ci-conda:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
214214
script: "ci/build_lucene.sh cuvs-java-cuda${{ matrix.CUDA_VER }}"
215215
artifact-name: "cuvs-lucene-cuda${{ matrix.CUDA_VER }}"
216216
file_to_upload: "java/cuvs-lucene/target/"
@@ -273,7 +273,7 @@ jobs:
273273
arch: "amd64"
274274
branch: ${{ inputs.branch }}
275275
build_type: ${{ inputs.build_type || 'branch' }}
276-
container_image: "rapidsai/ci-conda:26.10-latest"
276+
container_image: "rapidsai/ci-conda:26.12-latest"
277277
date: ${{ inputs.date }}
278278
node_type: "gpu-l4-latest-1"
279279
script: "ci/build_docs.sh"

‎.github/workflows/pr.yaml‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ jobs:
162162
- '!ci/test_wheel_cuvs.sh'
163163
- '!ci/validate_wheel.sh'
164164
- '!docs/**'
165+
- '!examples/go/**'
166+
- '!examples/java/**'
165167
- '!fern/**'
166168
- '!go/**'
167169
- '!img/**'
@@ -214,7 +216,15 @@ jobs:
214216
- '!conda/recipes/cuvs-bench/**'
215217
- '!conda/recipes/cuvs-bench-cpu/**'
216218
- '!docs/**'
217-
- '!examples/**'
219+
- '!examples/.clang-format'
220+
- '!examples/.clang-tidy'
221+
- '!examples/.clangd'
222+
- '!examples/README.md'
223+
- '!examples/build.sh'
224+
- '!examples/c/**'
225+
- '!examples/cmake/**'
226+
- '!examples/cpp/**'
227+
- '!examples/go/**'
218228
- '!fern/**'
219229
- '!go/**'
220230
- '!img/**'
@@ -268,6 +278,7 @@ jobs:
268278
- '!README.md'
269279
- '!SECURITY.md'
270280
- '!docs/**'
281+
- '!examples/**'
271282
- '!fern/**'
272283
- '!go/**'
273284
- '!img/**'
@@ -325,6 +336,7 @@ jobs:
325336
- '!cpp/.clang-tidy'
326337
- '!cpp/doxygen/**'
327338
- '!docs/**'
339+
- '!examples/**'
328340
- '!fern/**'
329341
- '!java/**'
330342
- '!go/**'
@@ -377,6 +389,7 @@ jobs:
377389
- '!ci/test_wheel_cuvs.sh'
378390
- '!ci/validate_wheel.sh'
379391
- '!docs/**'
392+
- '!examples/**'
380393
- '!fern/**'
381394
- '!go/**'
382395
- '!img/**'
@@ -430,6 +443,15 @@ jobs:
430443
- '!ci/test_wheel_cuvs.sh'
431444
- '!ci/validate_wheel.sh'
432445
- '!docs/**'
446+
- '!examples/.clang-format'
447+
- '!examples/.clang-tidy'
448+
- '!examples/.clangd'
449+
- '!examples/README.md'
450+
- '!examples/build.sh'
451+
- '!examples/c/**'
452+
- '!examples/cmake/**'
453+
- '!examples/cpp/**'
454+
- '!examples/java/**'
433455
- '!fern/**'
434456
- '!img/**'
435457
- '!java/**'
@@ -558,7 +580,7 @@ jobs:
558580
build-datetime: ${{ needs.build-details.outputs.build-datetime }}
559581
arch: "${{matrix.arch}}"
560582
date: ${{ inputs.date }}_c
561-
container_image: "rapidsai/ci-wheel:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
583+
container_image: "rapidsai/ci-wheel:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
562584
node_type: "cpu16"
563585
requires_license_builder: true
564586
script: "ci/build_standalone_c.sh --build-tests"
@@ -592,7 +614,7 @@ jobs:
592614
node_type: "gpu-l4-latest-1"
593615
arch: "${{matrix.arch}}"
594616
date: ${{ inputs.date }}_c
595-
container_image: "rapidsai/ci-wheel:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
617+
container_image: "rapidsai/ci-wheel:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
596618
script: "ci/test_standalone_c.sh libcuvs_c_${{ matrix.CUDA_VER }}_${{ matrix.ARCH }}.tar.gz"
597619
sha: ${{ inputs.sha }}
598620
conda-java-build-and-tests-matrix:
@@ -624,7 +646,7 @@ jobs:
624646
build_type: pull-request
625647
node_type: "gpu-l4-latest-1"
626648
arch: "amd64"
627-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
649+
container_image: "rapidsai/ci-conda:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
628650
script: "ci/test_java.sh"
629651
artifact-name: "cuvs-java-cuda${{ matrix.CUDA_VER }}"
630652
file_to_upload: "java/cuvs-java/target/"
@@ -649,7 +671,7 @@ jobs:
649671
build_type: pull-request
650672
node_type: "gpu-l4-latest-1"
651673
arch: "amd64"
652-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
674+
container_image: "rapidsai/ci-conda:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
653675
script: "ci/test_lucene.sh cuvs-java-cuda${{ matrix.CUDA_VER }}"
654676
artifact-name: "cuvs-lucene-cuda${{ matrix.CUDA_VER }}"
655677
file_to_upload: "java/cuvs-lucene/target/"
@@ -682,7 +704,7 @@ jobs:
682704
build_type: pull-request
683705
node_type: "gpu-l4-latest-1"
684706
arch: "amd64"
685-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
707+
container_image: "rapidsai/ci-conda:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
686708
script: "ci/build_rust.sh"
687709
go-build-matrix:
688710
needs: [conda-cpp-build, changed-files]
@@ -713,7 +735,7 @@ jobs:
713735
build_type: pull-request
714736
node_type: "gpu-l4-latest-1"
715737
arch: "amd64"
716-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
738+
container_image: "rapidsai/ci-conda:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
717739
script: "ci/build_go.sh"
718740
docs-build:
719741
permissions:
@@ -728,7 +750,7 @@ jobs:
728750
build_type: pull-request
729751
node_type: "gpu-l4-latest-1"
730752
arch: "amd64"
731-
container_image: "rapidsai/ci-conda:26.10-latest"
753+
container_image: "rapidsai/ci-conda:26.12-latest"
732754
script: "ci/build_docs.sh"
733755
wheel-build-libcuvs:
734756
needs: [build-details, checks]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
cuda_version:
2020
- '13.3.0'
2121
container:
22-
image: "rapidsai/ci-conda:26.10-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
22+
image: "rapidsai/ci-conda:26.12-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
2323
steps:
2424
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
2525
with:

‎.github/workflows/test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
sha: ${{ inputs.sha }}
101101
node_type: "gpu-l4-latest-1"
102102
arch: "amd64"
103-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
103+
container_image: "rapidsai/ci-conda:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
104104
script: "ci/test_java.sh"
105105
artifact-name: "cuvs-java-cuda${{ matrix.CUDA_VER }}"
106106
file_to_upload: "java/cuvs-java/target/"
@@ -128,7 +128,7 @@ jobs:
128128
sha: ${{ inputs.sha }}
129129
node_type: "gpu-l4-latest-1"
130130
arch: "amd64"
131-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
131+
container_image: "rapidsai/ci-conda:26.12-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
132132
script: "ci/test_lucene.sh cuvs-java-cuda${{ matrix.CUDA_VER }}"
133133
artifact-name: "cuvs-lucene-cuda${{ matrix.CUDA_VER }}"
134134
file_to_upload: "java/cuvs-lucene/target/"

‎.pre-commit-config.yaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,25 @@ repos:
5656
args: ["-fallback-style=none", "-style=file", "-i"]
5757
- repo: local
5858
hooks:
59+
- id: fern-api-reference
60+
name: fern-api-reference
61+
description: 'Regenerate the Fern API reference pages from the sources'
62+
entry: python3 fern/scripts/generate_api_reference.py --quiet
63+
language: system
64+
pass_filenames: false
65+
require_serial: true
66+
files: |
67+
(?x)
68+
^c/include/.*[.](h|hpp)$|
69+
^cpp/include/.*[.](h|hpp|cuh)$|
70+
^python/cuvs/cuvs/.*[.](py|pyx|pxd)$|
71+
^java/cuvs-java/src/main/.*[.]java$|
72+
^rust/cuvs/src/.*[.]rs$|
73+
^go/.*[.]go$|
74+
^fern/scripts/generate_api_reference[.]py$|
75+
^fern/pages/(c|cpp|python|java|rust|go)_api/.*[.]md$|
76+
^fern/pages/api_reference[.]md$|
77+
^fern/docs[.]yml$
5978
- id: no-deprecationwarning
6079
name: no-deprecationwarning
6180
description: 'Enforce that DeprecationWarning is not introduced (use FutureWarning instead)'
@@ -102,7 +121,7 @@ repos:
102121
name: spotless-fmt
103122
entry: ci/checks/run_spotless.sh
104123
pass_filenames: false
105-
files: ^java/(cuvs-java|cuvs-lucene)/([^/]+/)?src/.*\.java$
124+
files: ^(java|examples/java)/(cuvs-java|cuvs-lucene)/([^/]+/)?src/.*\.java$
106125
exclude: .*/panama/.*
107126
language: script
108127
verbose: true

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
26.10.00
1+
26.12.00

0 commit comments

Comments
 (0)