Merge branch 'branch-24.04' into rust_bindings

README.md

@@ -1,2 +1,40 @@
-# <div align="left"><img src="https://rapids.ai/assets/images/rapids_logo.png" width="90px"/>&nbsp;cuVS: Vector Search on the GPU</div>
+# <div align="left"><img src="https://rapids.ai/assets/images/rapids_logo.png" width="90px"/>&nbsp;cuVS: Vector Search and Clustering on the GPU</div>
+
+### NOTE: cuVS is currently being 
+
+## Contents
+<hr>
+
+1. [Useful Resources](#useful-resources)
+2. [What is cuVS?](#what-is-cuvs)
+3. [Getting Started](#getting-started)
+4. [Installing cuVS](#installing)
+5. [Contributing](#contributing)
+6. [References](#references)
+
+<hr>
+
+## Useful Resources
+
+- [cuVS Reference Documentation](https://docs.rapids.ai/api/cuvs/stable/): API Documentation.
+- [cuVS Getting Started](./docs/source/quick_start.md): Getting started with RAFT.
+- [Build and Install cuVS](./docs/source/build.md): Instructions for installing and building cuVS.
+- [Example Notebooks](./notebooks): Example jupyer notebooks
+- [RAPIDS Community](https://rapids.ai/community.html): Get help, contribute, and collaborate.
+- [GitHub repository](https://github.com/rapidsai/cuvs): Download the cuVS source code.
+- [Issue tracker](https://github.com/rapidsai/cuvs/issues): Report issues or request features.
+
+## What is cuVS?
+
+cuVS contains many algorithms for running approximate nearest neighbors and clustering on the GPU.
+
+## Getting Started
+
+
+
+## Installing cuVS
+
+## Contributing
+
+## References
 

ci/build_python.sh

@@ -34,24 +34,3 @@ rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
   conda/recipes/cuvs
-
-
-# Build ann-bench for each cuda and python version
-rapids-conda-retry mambabuild \
---no-test \
---channel "${CPP_CHANNEL}" \
---channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
-conda/recipes/cuda-ann-bench
-
-# Build ann-bench-cpu only in CUDA 11 jobs since it only depends on python
-# version
-RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}"
-if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then
-  rapids-conda-retry mambabuild \
-  --no-test \
-  --channel "${CPP_CHANNEL}" \
-  --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
-  conda/recipes/cuda-ann-bench-cpu
-fi
-
-rapids-upload-conda-to-s3 python

ci/build_wheel_cuvs.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
-# Copyright (c) 2023, NVIDIA CORPORATION.
+# Copyright (c) 2023-2024, NVIDIA CORPORATION.
 
 set -euo pipefail
 
 # Set up skbuild options. Enable sccache in skbuild config options
 export SKBUILD_CONFIGURE_OPTIONS="-DRAFT_BUILD_WHEELS=ON -DDETECT_CONDA_ENV=OFF -DFIND_RAFT_CPP=OFF"
 
-ci/build_wheel.sh cuvs python/cuvs
+#ci/build_wheel.sh cuvs python/cuvs

ci/test_python.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, NVIDIA CORPORATION.
+# Copyright (c) 2022-2024, NVIDIA CORPORATION.
 
 set -euo pipefail
 
@@ -31,7 +31,7 @@ rapids-print-env
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
   --channel "${PYTHON_CHANNEL}" \
-  libcuvs cuvs
+  libcuvs #cuvs
 
 rapids-logger "Check GPU usage"
 nvidia-smi
@@ -40,17 +40,17 @@ EXITCODE=0
 trap "EXITCODE=1" ERR
 set +e
 
-rapids-logger "pytest cuvs"
-pushd python/cuvs/cuvs
-pytest \
-  --cache-clear \
-  --junitxml="${RAPIDS_TESTS_DIR}/junit-cuvs.xml" \
-  --cov-config=../.coveragerc \
-  --cov=cuvs \
-  --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cuvs-coverage.xml" \
-  --cov-report=term \
-  test
-popd
+#rapids-logger "pytest cuvs"
+#pushd python/cuvs/cuvs
+#pytest \
+#  --cache-clear \
+#  --junitxml="${RAPIDS_TESTS_DIR}/junit-cuvs.xml" \
+#  --cov-config=../.coveragerc \
+#  --cov=cuvs \
+#  --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cuvs-coverage.xml" \
+#  --cov-report=term \
+#  test
+#popd
 
 rapids-logger "Test script exiting with value: $EXITCODE"
 exit ${EXITCODE}

ci/test_wheel_cuvs.sh

@@ -1,18 +1,18 @@
 #!/bin/bash
-# Copyright (c) 2023, NVIDIA CORPORATION.
+# Copyright (c) 2023-2024, NVIDIA CORPORATION.
 
 set -euo pipefail
 
 mkdir -p ./dist
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 RAPIDS_PY_WHEEL_NAME="cuvs_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist
 
-# echo to expand wildcard before adding `[extra]` requires for pip
-python -m pip install $(echo ./dist/cuvs*.whl)[test]
-
-# Run smoke tests for aarch64 pull requests
-if [[ "$(arch)" == "aarch64" && "${RAPIDS_BUILD_TYPE}" == "pull-request" ]]; then
-    python ./ci/wheel_smoke_test_cuvs.py
-else
-    python -m pytest ./python/cuvs/cuvs/test
-fi
+## echo to expand wildcard before adding `[extra]` requires for pip
+#python -m pip install $(echo ./dist/cuvs*.whl)[test]
+#
+## Run smoke tests for aarch64 pull requests
+#if [[ "$(arch)" == "aarch64" && "${RAPIDS_BUILD_TYPE}" == "pull-request" ]]; then
+#    python ./ci/wheel_smoke_test_cuvs.py
+#else
+#    python -m pytest ./python/cuvs/cuvs/test
+#fi

docs/source/index.rst

@@ -1,9 +1,5 @@
-cuVS: GPU-accelerated Vector Search
-===================================
-
-.. image:: ../../img/raft-tech-stack-vss.png
-  :width: 800
-  :alt: cuVS Tech Stack
+cuVS: Vector Search and Clustering on the GPU
+=============================================
 
 Useful Resources
 ################
@@ -19,7 +15,7 @@ Useful Resources
 What is cuVS?
 #############
 
-cuVS is a library for vector search on the GPU.
+cuVS is a library for vector search and clustering on the GPU.
 
 .. toctree::
    :maxdepth: 1