-
Notifications
You must be signed in to change notification settings - Fork 18
use GCS mirror for Maven, fix benchmarks version, other small changes #166
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| -e | ||
| -B | ||
| -Daether.connector.basic.downstreamThreads=1 | ||
| -Daether.transport.http.retryHandler.count=5 | ||
| -Daether.transport.http.retryHandler.interval=10000 | ||
| -Dmaven.wagon.http.retryHandler.count=5 | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION. | ||
| # SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What is the context behind this addition?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It was added automatically by the This became the default in February (rapidsai/pre-commit-hooks#120) based on internal conversations about the preferred form. It's showing up here now because:
If you have questions about the history behind rapidsai/pre-commit-hooks#120 you can talk to @KyleFromNVIDIA . But this has been the standard across RAPIDS for a few months now. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we need this in other files then? A few files here changed, but not all have this particular wording
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't know why this project doesn't include |
||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| repos: | ||
|
|
@@ -9,8 +9,9 @@ repos: | |
| - id: trailing-whitespace | ||
| - id: end-of-file-fixer | ||
| - id: check-symlinks | ||
| - id: check-xml | ||
| - repo: https://github.com/rapidsai/pre-commit-hooks | ||
| rev: v1.4.2 | ||
| rev: v1.5.1 | ||
| hooks: | ||
| - id: verify-copyright | ||
| name: verify-copyright | ||
|
|
@@ -24,7 +25,7 @@ repos: | |
| dependencies[.]yaml$| | ||
| ^[.]pre-commit-config[.]yaml$ | ||
| - repo: https://github.com/rapidsai/dependency-file-generator | ||
| rev: v1.20.2 | ||
| rev: v1.21.0 | ||
| hooks: | ||
| - id: rapids-dependency-file-generator | ||
| args: ["--clean", "--warn-all", "--strict"] | ||
|
|
@@ -33,6 +34,6 @@ repos: | |
| hooks: | ||
| - id: shellcheck | ||
| - repo: https://github.com/zizmorcore/zizmor-pre-commit | ||
| rev: v1.24.1 | ||
| rev: v1.26.1 | ||
| hooks: | ||
| - id: zizmor | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,11 +11,65 @@ | |
|
|
||
| <groupId>com.nvidia.cuvs.lucene.benchmarks</groupId> | ||
| <artifactId>cuvs-lucene-benchmarks</artifactId> | ||
| <!--CUVS_JAVA#VERSION_UPDATE_MARKER_START--><version>26.02.0</version><!--CUVS_JAVA#VERSION_UPDATE_MARKER_END--> | ||
| <!--CUVS_LUCENE#VERSION_UPDATE_MARKER_START--><version>26.08.0</version><!--CUVS_LUCENE#VERSION_UPDATE_MARKER_END--> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is there anywhere else that needs this change?
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Possibly needs changes in ci/release/update-version.sh?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
No. $ git grep -E '26\.|25\.'
.github/workflows/build.yaml: container_image: "rapidsai/ci-conda:26.08-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
.github/workflows/pr.yaml: container_image: "rapidsai/ci-conda:26.08-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
.github/workflows/test.yaml: container_image: "rapidsai/ci-conda:26.08-cuda${{ matrix.cuda_version }}-ubuntu24.04-py3.13"
.pre-commit-config.yaml: rev: v1.26.1
VERSION:26.08.00
bench/pom.xml: <!--CUVS_LUCENE#VERSION_UPDATE_MARKER_START--><version>26.08.0</version><!--CUVS_LUCENE#VERSION_UPDATE_MARKER_END-->
bench/pom.xml: <!--CUVS_LUCENE#VERSION_UPDATE_MARKER_START--><version>26.08.0</version><!--CUVS_LUCENE#VERSION_UPDATE_MARKER_END-->
build.sh:VERSION="26.08.0" # Note: The version is updated automatically when ci/release/update-version.sh is invoked
ci/release/update-version.sh:# Strip leading 0s in versions, so e.g. '25.10.00' becomes '25.10.0'
conda/environments/all_cuda-129_arch-aarch64.yaml:- libcuvs==26.08.*
conda/environments/all_cuda-129_arch-x86_64.yaml:- libcuvs==26.08.*
conda/environments/all_cuda-132_arch-aarch64.yaml:- libcuvs==26.08.*
conda/environments/all_cuda-132_arch-x86_64.yaml:- libcuvs==26.08.*
dependencies.yaml: - libcuvs==26.08.*
examples/README.md:docker run --rm --gpus all --pull=always --volume $PWD:$PWD --workdir $PWD -it rapidsai/ci-conda:26.08-cuda13.2.0-ubuntu24.04-py3.13
examples/README.md:mvn clean install && java -Djava.util.logging.config.file=src/main/resources/logging.properties -cp target/examples-26.08.0-jar-with-merged-services.jar com.nvidia.cuvs.lucene.examples.AcceleratedHnswExample
examples/README.md:mvn clean install && java -Djava.util.logging.config.file=src/main/resources/logging.properties -cp target/examples-26.08.0-jar-with-merged-services.jar com.nvidia.cuvs.lucene.examples.IndexAndSearchonGPUExample
examples/pom.xml: <!--CUVS_LUCENE#VERSION_UPDATE_MARKER_START--><version>26.08.0</version><!--CUVS_LUCENE#VERSION_UPDATE_MARKER_END-->
examples/pom.xml: <!--CUVS_LUCENE#VERSION_UPDATE_MARKER_START--><version>26.08.0</version><!--CUVS_LUCENE#VERSION_UPDATE_MARKER_END-->
pom.xml: <!--CUVS_LUCENE#VERSION_UPDATE_MARKER_START--><version>26.08.0</version><!--CUVS_LUCENE#VERSION_UPDATE_MARKER_END-->
pom.xml: <!--CUVS_LUCENE#VERSION_UPDATE_MARKER_START--><version>26.08.0</version><!--CUVS_LUCENE#VERSION_UPDATE_MARKER_END-->
src/main/java/com/nvidia/cuvs/lucene/CuVS2510GPUSearchCodec.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/CuVS2510GPUVectorsFormat.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/CuVS2510GPUVectorsReader.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/CuVS2510GPUVectorsWriter.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/FilterCuVSServiceProvider.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/GPUBuiltHnswGraph.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/GPUFieldWriter.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/GPUIndex.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/GPUKnnFloatVectorQuery.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/GPUPerLeafCuVSKnnCollector.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/IndexInputInputStream.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/IndexOutputOutputStream.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/Lucene101AcceleratedHNSWCodec.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/Lucene99AcceleratedHNSWVectorsFormat.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/Lucene99AcceleratedHNSWVectorsWriter.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/LuceneAcceleratedHNSWBinaryQuantizedCodec.java: * @since 26.02
src/main/java/com/nvidia/cuvs/lucene/LuceneAcceleratedHNSWBinaryQuantizedVectorsFormat.java: * @since 26.02
src/main/java/com/nvidia/cuvs/lucene/LuceneAcceleratedHNSWBinaryQuantizedVectorsWriter.java: * @since 26.02
src/main/java/com/nvidia/cuvs/lucene/LuceneAcceleratedHNSWScalarQuantizedCodec.java: * @since 26.02
src/main/java/com/nvidia/cuvs/lucene/LuceneAcceleratedHNSWScalarQuantizedVectorsFormat.java: * @since 26.02
src/main/java/com/nvidia/cuvs/lucene/LuceneAcceleratedHNSWScalarQuantizedVectorsWriter.java: * @since 26.02
src/main/java/com/nvidia/cuvs/lucene/LuceneProvider.java: * @since 25.12
src/main/java/com/nvidia/cuvs/lucene/ThreadLocalCuVSResourcesProvider.java: * @since 26.02
src/main/java/com/nvidia/cuvs/lucene/Utils.java: * @since 25.10
src/main/java/com/nvidia/cuvs/lucene/package-info.java: * @since 25.10
src/test/java/com/nvidia/cuvs/lucene/TestBackCompat.java: * @since 25.12
I don't think so. The file was covered already, the pattern was just wrong. bash ./ci/release/update-version.sh '26.10.00' --run-context=main
git grep -E '25\.|26\.'
# (same result as above, but with all 26.08 changed to 26.10) |
||
| <packaging>jar</packaging> | ||
|
|
||
| <name>cuvs-lucene-benchmarks</name> | ||
|
|
||
| <repositories> | ||
| <!-- Prefer Google Cloud mirror, which has higher rate limits --> | ||
| <repository> | ||
| <id>gcs-maven-central-mirror</id> | ||
| <name>GCS Maven Central mirror</name> | ||
| <url>https://maven-central.storage-download.googleapis.com/maven2/</url> | ||
| <releases> | ||
| <enabled>true</enabled> | ||
| </releases> | ||
| <snapshots> | ||
| <enabled>false</enabled> | ||
| </snapshots> | ||
| </repository> | ||
| <!-- Fall back to Maven upstream for packages not found in GCS mirror --> | ||
| <repository> | ||
| <id>central</id> | ||
| <name>Maven Central</name> | ||
| <url>https://repo.maven.apache.org/maven2</url> | ||
| <releases> | ||
| <enabled>true</enabled> | ||
| </releases> | ||
| <snapshots> | ||
| <enabled>false</enabled> | ||
| </snapshots> | ||
| </repository> | ||
| </repositories> | ||
|
|
||
| <pluginRepositories> | ||
| <!-- Prefer Google Cloud mirror, which has higher rate limits --> | ||
| <pluginRepository> | ||
| <id>gcs-maven-central-mirror</id> | ||
| <name>GCS Maven Central mirror</name> | ||
| <url>https://maven-central.storage-download.googleapis.com/maven2/</url> | ||
| <releases> | ||
| <enabled>true</enabled> | ||
| </releases> | ||
| <snapshots> | ||
| <enabled>false</enabled> | ||
| </snapshots> | ||
| </pluginRepository> | ||
| <!-- Fall back to Maven upstream for packages not found in GCS mirror --> | ||
| <pluginRepository> | ||
| <id>central</id> | ||
| <name>Maven Plugin Repository</name> | ||
| <url>https://repo.maven.apache.org/maven2</url> | ||
| <releases> | ||
| <enabled>true</enabled> | ||
| </releases> | ||
| <snapshots> | ||
| <enabled>false</enabled> | ||
| </snapshots> | ||
| </pluginRepository> | ||
| </pluginRepositories> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.openjdk.jmh</groupId> | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See NVIDIA/cuvs#2253 (comment) for an explanation of these flags.
I believe comments are not allowed in this file because its contents are passed literally to
mvn.