merging upstream

.gitignore

@@ -61,6 +61,7 @@ _xml
 # sphinx
 _html
 _text
+docs/source/_static/rust
 
 # clang tooling
 compile_commands.json

README.md

@@ -11,10 +11,10 @@
 
 ## 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
+- [Code Examples](https://github.com/rapidsai/cuvs/tree/HEAD/examples): Self-contained Code Examples.
+- [API Reference Documentation](https://docs.rapids.ai/api/cuvs/nightly/api_docs): API Documentation.
+- [Getting Started Guide](https://docs.rapids.ai/api/cuvs/nightly/getting_started): Getting started with RAFT.
+- [Build and Install Guide](https://docs.rapids.ai/api/cuvs/nightly/build): Instructions for installing and building cuVS.
 - [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.

conda/environments/all_cuda-118_arch-aarch64.yaml

@@ -9,6 +9,7 @@ channels:
 dependencies:
 - breathe
 - c-compiler
+- clang
 - clang-tools=16.0.6
 - clang==16.0.6
 - cmake>=3.26.4
@@ -27,6 +28,7 @@ dependencies:
 - graphviz
 - gtest>=1.13.0
 - ipython
+- libclang
 - libcublas-dev=11.11.3.6
 - libcublas=11.11.3.6
 - libcurand-dev=10.3.0.86
@@ -35,9 +37,10 @@ dependencies:
 - libcusolver=11.4.1.48
 - libcusparse-dev=11.7.5.86
 - libcusparse=11.7.5.86
+- make
 - nccl>=2.9.9
 - ninja
-- numpy>=1.23
+- numpy>=1.23,<2.0a0
 - numpydoc
 - nvcc_linux-aarch64=11.8
 - pre-commit
@@ -47,6 +50,7 @@ dependencies:
 - pytest==7.*
 - recommonmark
 - rmm==24.4.*
+- rust
 - scikit-build-core>=0.7.0
 - scikit-learn
 - sphinx-copybutton

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -9,6 +9,7 @@ channels:
 dependencies:
 - breathe
 - c-compiler
+- clang
 - clang-tools=16.0.6
 - clang==16.0.6
 - cmake>=3.26.4
@@ -27,6 +28,7 @@ dependencies:
 - graphviz
 - gtest>=1.13.0
 - ipython
+- libclang
 - libcublas-dev=11.11.3.6
 - libcublas=11.11.3.6
 - libcurand-dev=10.3.0.86
@@ -35,9 +37,10 @@ dependencies:
 - libcusolver=11.4.1.48
 - libcusparse-dev=11.7.5.86
 - libcusparse=11.7.5.86
+- make
 - nccl>=2.9.9
 - ninja
-- numpy>=1.23
+- numpy>=1.23,<2.0a0
 - numpydoc
 - nvcc_linux-64=11.8
 - pre-commit
@@ -47,6 +50,7 @@ dependencies:
 - pytest==7.*
 - recommonmark
 - rmm==24.4.*
+- rust
 - scikit-build-core>=0.7.0
 - scikit-learn
 - sphinx-copybutton

conda/environments/all_cuda-122_arch-aarch64.yaml

@@ -9,6 +9,7 @@ channels:
 dependencies:
 - breathe
 - c-compiler
+- clang
 - clang-tools=16.0.6
 - clang==16.0.6
 - cmake>=3.26.4
@@ -28,13 +29,15 @@ dependencies:
 - graphviz
 - gtest>=1.13.0
 - ipython
+- libclang
 - libcublas-dev
 - libcurand-dev
 - libcusolver-dev
 - libcusparse-dev
+- make
 - nccl>=2.9.9
 - ninja
-- numpy>=1.23
+- numpy>=1.23,<2.0a0
 - numpydoc
 - pre-commit
 - pydata-sphinx-theme
@@ -43,6 +46,7 @@ dependencies:
 - pytest==7.*
 - recommonmark
 - rmm==24.4.*
+- rust
 - scikit-build-core>=0.7.0
 - scikit-learn
 - sphinx-copybutton

conda/environments/all_cuda-122_arch-x86_64.yaml

@@ -9,6 +9,7 @@ channels:
 dependencies:
 - breathe
 - c-compiler
+- clang
 - clang-tools=16.0.6
 - clang==16.0.6
 - cmake>=3.26.4
@@ -28,13 +29,15 @@ dependencies:
 - graphviz
 - gtest>=1.13.0
 - ipython
+- libclang
 - libcublas-dev
 - libcurand-dev
 - libcusolver-dev
 - libcusparse-dev
+- make
 - nccl>=2.9.9
 - ninja
-- numpy>=1.23
+- numpy>=1.23,<2.0a0
 - numpydoc
 - pre-commit
 - pydata-sphinx-theme
@@ -43,6 +46,7 @@ dependencies:
 - pytest==7.*
 - recommonmark
 - rmm==24.4.*
+- rust
 - scikit-build-core>=0.7.0
 - scikit-learn
 - sphinx-copybutton

dependencies.yaml

@@ -19,6 +19,7 @@ files:
       - test_python_common
       - test_py_cuvs
       - cupy
+      - rust
   test_cpp:
     output: none
     includes:
@@ -355,7 +356,7 @@ dependencies:
     common:
       - output_types: [conda, pyproject]
         packages:
-          - &numpy numpy>=1.23
+          - &numpy numpy>=1.23,<2.0a0
       - output_types: [conda]
         packages:
           - *rmm_conda

docs/source/basics.rst

@@ -1,12 +1,17 @@
 cuVS API Basics
 ===============
 
+<<<<<<< HEAD
 .. toctree::
    :maxdepth: 1
    :caption: Contents:
 
    `Memory management`_
    `Resource management`_
+=======
+- `Memory management`_
+- `Resource management`_
+>>>>>>> upstream/branch-24.04
 
 Memory management
 -----------------
@@ -18,7 +23,11 @@ RMM currently has APIs for C++ and Python.
 C++
 ^^^
 
+<<<<<<< HEAD
 Here's an example of configuring RMM to use a pool allocator in C++ (derived from the RMM example [here](https://github.com/rapidsai/rmm?tab=readme-ov-file#example)):
+=======
+Here's an example of configuring RMM to use a pool allocator in C++ (derived from the RMM example `here <https://github.com/rapidsai/rmm?tab=readme-ov-file#example>`_):
+>>>>>>> upstream/branch-24.04
 
 .. code-block:: c++
 
@@ -33,7 +42,11 @@ Here's an example of configuring RMM to use a pool allocator in C++ (derived fro
 Python
 ^^^^^^
 
+<<<<<<< HEAD
 And the corresponding code in Python (derived from the RMM example [here](https://github.com/rapidsai/rmm?tab=readme-ov-file#memoryresource-objects)):
+=======
+And the corresponding code in Python (derived from the RMM example `here <https://github.com/rapidsai/rmm?tab=readme-ov-file#memoryresource-objects>`_):
+>>>>>>> upstream/branch-24.04
 
 .. code-block:: python
 
@@ -48,9 +61,9 @@ And the corresponding code in Python (derived from the RMM example [here](https:
 Resource management
 -------------------
 
-cuVS uses an API from the [RAFT](https://github.com/rapidsai/raft) library of ML and data mining primitives to centralize and reuse expensive resources, such as memory management. The below code examples demonstrate how to create these resources for use throughout this guide.
+cuVS uses an API from the `RAFT <https://github.com/rapidsai/raft>`_ library of ML and data mining primitives to centralize and reuse expensive resources, such as memory management. The below code examples demonstrate how to create these resources for use throughout this guide.
 
-See RAFT's [resource API documentation](https://docs.rapids.ai/api/raft/nightly/cpp_api/core_resources/) for more information.
+See RAFT's `resource API documentation <https://docs.rapids.ai/api/raft/nightly/cpp_api/core_resources/>`_ for more information.
 
 C
 ^
@@ -89,3 +102,6 @@ Python
 Rust
 ^^^^
 
+.. code-block:: rust
+
+    let res = cuvs::Resources::new()?;