Skip to content

Commit 8ff98cd

Browse files
jamxia155jamxia155
committed
Merge remote-tracking branch 'origin/main' into nn-descent-dedup-packed-bitset
2 parents d1e2dc0 + 2140532 commit 8ff98cd

255 files changed

Lines changed: 28224 additions & 2343 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"BASE": "rapidsai/devcontainers:26.10-cpp-mambaforge"
99
},
1010
"cacheFrom": [
11-
"ghcr.io/rapidsai/cuvs/devcontainer:26.08-cuda12.9-conda"
11+
"ghcr.io/rapidsai/cuvs/devcontainer:26.10-cuda12.9-conda"
1212
]
1313
},
1414
"runArgs": [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"BASE": "rapidsai/devcontainers:26.10-cpp-cuda12.9-ucx1.19.0-openmpi5.0.10"
99
},
1010
"cacheFrom": [
11-
"ghcr.io/rapidsai/cuvs/devcontainer:26.08-cuda12.9-pip"
11+
"ghcr.io/rapidsai/cuvs/devcontainer:26.10-cuda12.9-pip"
1212
]
1313
},
1414
"runArgs": [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"BASE": "rapidsai/devcontainers:26.10-cpp-mambaforge"
99
},
1010
"cacheFrom": [
11-
"ghcr.io/rapidsai/cuvs/devcontainer:26.08-cuda13.3-conda"
11+
"ghcr.io/rapidsai/cuvs/devcontainer:26.10-cuda13.3-conda"
1212
]
1313
},
1414
"runArgs": [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"BASE": "rapidsai/devcontainers:26.10-cpp-cuda13.3-ucx1.19.0-openmpi5.0.10"
99
},
1010
"cacheFrom": [
11-
"ghcr.io/rapidsai/cuvs/devcontainer:26.08-cuda13.3-pip"
11+
"ghcr.io/rapidsai/cuvs/devcontainer:26.10-cuda13.3-pip"
1212
]
1313
},
1414
"runArgs": [

‎.github/workflows/build.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,32 @@ jobs:
189189
artifact-name: "cuvs-java-cuda${{ matrix.CUDA_VER }}"
190190
file_to_upload: "java/cuvs-java/target/"
191191
sha: ${{ inputs.sha }}
192+
lucene-build:
193+
# Depends on the Java job for the cuvs-java artifact that cuvs-lucene builds against.
194+
needs: [java-build-matrix, java-build]
195+
permissions:
196+
actions: read
197+
contents: read
198+
id-token: write
199+
packages: read
200+
pull-requests: read
201+
secrets: inherit # zizmor: ignore[secrets-inherit]
202+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
203+
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
204+
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
205+
strategy:
206+
fail-fast: false
207+
matrix: ${{ fromJSON(needs.java-build-matrix.outputs.matrix) }}
208+
with:
209+
build_type: ${{ inputs.build_type || 'branch' }}
210+
branch: ${{ inputs.branch }}
211+
arch: "amd64"
212+
date: ${{ inputs.date }}
213+
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
214+
script: "ci/build_lucene.sh cuvs-java-cuda${{ matrix.CUDA_VER }}"
215+
artifact-name: "cuvs-lucene-cuda${{ matrix.CUDA_VER }}"
216+
file_to_upload: "java/cuvs-lucene/target/"
217+
sha: ${{ inputs.sha }}
192218
python-build:
193219
needs: [build-details, cpp-build]
194220
permissions:

‎.github/workflows/pr.yaml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
- rocky8-clib-tests
2727
- conda-java-build-and-tests-matrix
2828
- conda-java-build-and-tests
29+
- conda-lucene-build-and-tests
2930
- rust-build-matrix
3031
- rust-build
3132
- go-build-matrix
@@ -143,12 +144,17 @@ jobs:
143144
- '!README.md'
144145
- '!SECURITY.md'
145146
- '!ci/build_docs.sh'
147+
- '!ci/build_go.sh'
148+
- '!ci/build_java.sh'
149+
- '!ci/build_lucene.sh'
146150
- '!ci/build_python.sh'
151+
- '!ci/build_rust.sh'
147152
- '!ci/build_wheel*.sh'
148153
- '!ci/check_style.sh'
149154
- '!ci/release/update-version.sh'
150155
- '!ci/run_cuvs_pytests.sh'
151156
- '!ci/test_java.sh'
157+
- '!ci/test_lucene.sh'
152158
- '!ci/test_python.sh'
153159
- '!ci/test_wheel_cuvs.sh'
154160
- '!ci/validate_wheel.sh'
@@ -238,12 +244,14 @@ jobs:
238244
- '!.yamllint.yaml'
239245
- '!ci/build_go.sh'
240246
- '!ci/build_java.sh'
247+
- '!ci/build_lucene.sh'
241248
- '!ci/build_rust.sh'
242249
- '!ci/check_style.sh'
243250
- '!ci/release/update-version.sh'
244251
- '!ci/run_ctests.sh'
245252
- '!ci/test_cpp.sh'
246253
- '!ci/test_java.sh'
254+
- '!ci/test_lucene.sh'
247255
- '!ci/test_standalone_c.sh'
248256
- '!ci/test_wheel_cuvs.sh'
249257
- '!ci/validate_wheel.sh'
@@ -289,6 +297,7 @@ jobs:
289297
- '!ci/build_docs.sh'
290298
- '!ci/build_go.sh'
291299
- '!ci/build_java.sh'
300+
- '!ci/build_lucene.sh'
292301
- '!ci/build_python.sh'
293302
- '!ci/build_rust.sh'
294303
- '!ci/build_standalone_c.sh'
@@ -297,6 +306,7 @@ jobs:
297306
- '!ci/run_ctests.sh'
298307
- '!ci/test_cpp.sh'
299308
- '!ci/test_java.sh'
309+
- '!ci/test_lucene.sh'
300310
- '!ci/test_python.sh'
301311
- '!ci/test_standalone_c.sh'
302312
- '!ci/validate_wheel.sh'
@@ -346,6 +356,7 @@ jobs:
346356
- '!ci/build_docs.sh'
347357
- '!ci/build_go.sh'
348358
- '!ci/build_java.sh'
359+
- '!ci/build_lucene.sh'
349360
- '!ci/build_python.sh'
350361
- '!ci/build_wheel*.sh'
351362
- '!ci/check_style.sh'
@@ -354,6 +365,7 @@ jobs:
354365
- '!ci/run_cuvs_pytests.sh'
355366
- '!ci/test_cpp.sh'
356367
- '!ci/test_java.sh'
368+
- '!ci/test_lucene.sh'
357369
- '!ci/test_python.sh'
358370
- '!ci/test_wheel_cuvs.sh'
359371
- '!ci/validate_wheel.sh'
@@ -394,6 +406,7 @@ jobs:
394406
- '!SECURITY.md'
395407
- '!ci/build_docs.sh'
396408
- '!ci/build_java.sh'
409+
- '!ci/build_lucene.sh'
397410
- '!ci/build_python.sh'
398411
- '!ci/build_rust.sh'
399412
- '!ci/build_wheel*.sh'
@@ -403,6 +416,7 @@ jobs:
403416
- '!ci/run_cuvs_pytests.sh'
404417
- '!ci/test_cpp.sh'
405418
- '!ci/test_java.sh'
419+
- '!ci/test_lucene.sh'
406420
- '!ci/test_python.sh'
407421
- '!ci/test_standalone_c.sh'
408422
- '!ci/test_wheel_cuvs.sh'
@@ -599,6 +613,31 @@ jobs:
599613
script: "ci/test_java.sh"
600614
artifact-name: "cuvs-java-cuda${{ matrix.CUDA_VER }}"
601615
file_to_upload: "java/cuvs-java/target/"
616+
conda-lucene-build-and-tests:
617+
# Depends on the Java job for the cuvs-java artifact that cuvs-lucene builds against, and
618+
# reuses its matrix so the two always agree on the set of CUDA versions.
619+
needs: [conda-java-build-and-tests-matrix, conda-java-build-and-tests]
620+
permissions:
621+
actions: read
622+
contents: read
623+
id-token: write
624+
packages: read
625+
pull-requests: read
626+
secrets: inherit # zizmor: ignore[secrets-inherit]
627+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
628+
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
629+
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
630+
strategy:
631+
fail-fast: false
632+
matrix: ${{ fromJSON(needs.conda-java-build-and-tests-matrix.outputs.matrix) }}
633+
with:
634+
build_type: pull-request
635+
node_type: "gpu-l4-latest-1"
636+
arch: "amd64"
637+
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
638+
script: "ci/test_lucene.sh cuvs-java-cuda${{ matrix.CUDA_VER }}"
639+
artifact-name: "cuvs-lucene-cuda${{ matrix.CUDA_VER }}"
640+
file_to_upload: "java/cuvs-lucene/target/"
602641
rust-build-matrix:
603642
needs: [conda-cpp-build, changed-files]
604643
permissions:

‎.github/workflows/test.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,34 @@ jobs:
104104
script: "ci/test_java.sh"
105105
artifact-name: "cuvs-java-cuda${{ matrix.CUDA_VER }}"
106106
file_to_upload: "java/cuvs-java/target/"
107+
conda-lucene-build-and-tests:
108+
# Depends on the Java job for the cuvs-java artifact that cuvs-lucene builds against, and
109+
# reuses its matrix so the two always agree on the set of CUDA versions.
110+
needs: [conda-java-build-and-tests-matrix, conda-java-build-and-tests]
111+
permissions:
112+
actions: read
113+
contents: read
114+
id-token: write
115+
packages: read
116+
pull-requests: read
117+
secrets: inherit # zizmor: ignore[secrets-inherit]
118+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
119+
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
120+
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
121+
strategy:
122+
fail-fast: false
123+
matrix: ${{ fromJSON(needs.conda-java-build-and-tests-matrix.outputs.matrix) }}
124+
with:
125+
build_type: ${{ inputs.build_type }}
126+
branch: ${{ inputs.branch }}
127+
date: ${{ inputs.date }}
128+
sha: ${{ inputs.sha }}
129+
node_type: "gpu-l4-latest-1"
130+
arch: "amd64"
131+
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
132+
script: "ci/test_lucene.sh cuvs-java-cuda${{ matrix.CUDA_VER }}"
133+
artifact-name: "cuvs-lucene-cuda${{ matrix.CUDA_VER }}"
134+
file_to_upload: "java/cuvs-lucene/target/"
107135
wheel-tests-cuvs:
108136
permissions:
109137
actions: read

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ repos:
9797
name: spotless-fmt
9898
entry: ci/checks/run_spotless.sh
9999
pass_filenames: false
100-
files: ^java/cuvs-java/src/.*\.java$
100+
files: ^java/(cuvs-java|cuvs-lucene)/([^/]+/)?src/.*\.java$
101101
exclude: .*/panama/.*
102102
language: script
103103
- id: clang-format-with-cmake-placeholders

0 commit comments

Comments
 (0)