Forward merge branch-24.04 to branch-24.06

.gitignore

@@ -66,3 +66,9 @@ docs/source/_static/rust
 # clang tooling
 compile_commands.json
 .clangd/
+
+# serialized ann indexes
+cagra_index
+ivf_flat_index
+ivf_pq_index
+

.pre-commit-config.yaml

@@ -79,12 +79,6 @@ repos:
                 verbose: true
                 require_serial: true
                 exclude: .*/thirdparty/.*
-              - id: copyright-check
-                name: copyright-check
-                entry: python ./ci/checks/copyright.py --git-modified-only --update-current-year
-                language: python
-                pass_filenames: false
-                additional_dependencies: [gitpython]
               - id: include-check
                 name: include-check
                 entry: python ./cpp/scripts/include_checker.py cpp/bench cpp/include cpp/test
@@ -107,6 +101,22 @@ repos:
         rev: v4.5.0
         hooks:
               - id: check-json
+      - repo: https://github.com/rapidsai/pre-commit-hooks
+        rev: v0.0.3
+        hooks:
+          - id: verify-copyright
+            files: |
+              (?x)
+                  [.](cmake|cpp|cu|cuh|h|hpp|sh|pxd|py|pyx|rs)$|
+                  CMakeLists[.]txt$|
+                  CMakeLists_standalone[.]txt$|
+                  meta[.]yaml$|
+                  setup[.]cfg$
+            exclude: |
+              (?x)
+                  cpp/include/cuvs/neighbors/detail/faiss_select/|
+                  docs/source/sphinxext/github_link\.py|
+                  cpp/cmake/modules/FindAVX\.cmake|
 
 default_language_version:
       python: python3

README.md

@@ -11,7 +11,7 @@
 
 1. [Useful Resources](#useful-resources)
 2. [What is cuVS?](#what-is-cuvs)
-3. [Installing cuVS](#installing)
+3. [Installing cuVS](#installing-cuvs)
 4. [Getting Started](#getting-started)
 5. [Contributing](#contributing)
 6. [References](#references)

build.sh

@@ -419,7 +419,7 @@ fi
 # Initiate build for c++ examples (if needed)
 
 if hasArg examples; then
-    pushd ${REPODIR}/examples/cpp
+    pushd ${REPODIR}/examples
     ./build.sh
     popd
 fi

ci/build_docs.sh

@@ -11,7 +11,7 @@ rapids-dependency-file-generator \
   --file_key docs \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
 
-rapids-mamba-retry env create --force -f env.yaml -n docs
+rapids-mamba-retry env create --yes -f env.yaml -n docs
 
 # seeing failures on activating the environment here on unbound locals
 # apply workaround from https://github.com/conda/conda/issues/8186#issuecomment-532874667

ci/build_rust.sh

@@ -11,7 +11,7 @@ rapids-dependency-file-generator \
   --file_key rust \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
 
-rapids-mamba-retry env create --force -f env.yaml -n rust
+rapids-mamba-retry env create --yes -f env.yaml -n rust
 
 # seeing failures on activating the environment here on unbound locals
 # apply workaround from https://github.com/conda/conda/issues/8186#issuecomment-532874667
@@ -35,5 +35,4 @@ rapids-mamba-retry install \
   libcuvs  \
   libraft
 
-export EXTRA_CMAKE_ARGS=""
 bash ./build.sh rust

ci/check_style.sh

@@ -11,7 +11,7 @@ rapids-dependency-file-generator \
   --file_key checks \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
 
-rapids-mamba-retry env create --force -f env.yaml -n checks
+rapids-mamba-retry env create --yes -f env.yaml -n checks
 conda activate checks
 
 # Run pre-commit checks

ci/test_cpp.sh

@@ -11,7 +11,7 @@ rapids-dependency-file-generator \
   --file_key test_cpp \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml
 
-rapids-mamba-retry env create --force -f env.yaml -n test
+rapids-mamba-retry env create --yes -f env.yaml -n test
 
 # Temporarily allow unbound variables for conda activation.
 set +u