Merge branch 'branch-24.10' into python-3.12

rapidsai · Sep 10, 2024 · 3297b3c · 3297b3c
2 parents 40c8460 + bdea78e
commit 3297b3c
Show file tree

Hide file tree

Showing 8 changed files with 307 additions and 0 deletions.
diff --git a/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml
@@ -0,0 +1,47 @@
+# This file is generated by `rapids-dependency-file-generator`.
+# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
+channels:
+- rapidsai
+- rapidsai-nightly
+- dask/label/dev
+- conda-forge
+- nvidia
+dependencies:
+- benchmark>=1.8.2
+- c-compiler
+- clang-tools=16.0.6
+- clang==16.0.6
+- click
+- cmake>=3.26.4,!=3.30.0
+- cuda-nvtx=11.8
+- cuda-profiler-api=11.8.86
+- cuda-python>=11.7.1,<12.0a0
+- cuda-version=11.8
+- cudatoolkit
+- cxx-compiler
+- cython>=3.0.0
+- dlpack>=0.8,<1.0
+- gcc_linux-aarch64=11.*
+- glog>=0.6.0
+- h5py>=3.8.0
+- hnswlib=0.6.2
+- libcublas-dev=11.11.3.6
+- libcublas=11.11.3.6
+- libcurand-dev=10.3.0.86
+- libcurand=10.3.0.86
+- libcusolver-dev=11.4.1.48
+- libcusolver=11.4.1.48
+- libcusparse-dev=11.7.5.86
+- libcusparse=11.7.5.86
+- matplotlib
+- nccl>=2.9.9
+- ninja
+- nlohmann_json>=3.11.2
+- nvcc_linux-aarch64=11.8
+- openblas
+- pandas
+- pylibraft==24.10.*,>=0.0.0a0
+- pyyaml
+- rmm==24.10.*,>=0.0.0a0
+- sysroot_linux-aarch64==2.17
+name: bench_ann_cuda-118_arch-aarch64
diff --git a/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml
@@ -0,0 +1,47 @@
+# This file is generated by `rapids-dependency-file-generator`.
+# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
+channels:
+- rapidsai
+- rapidsai-nightly
+- dask/label/dev
+- conda-forge
+- nvidia
+dependencies:
+- benchmark>=1.8.2
+- c-compiler
+- clang-tools=16.0.6
+- clang==16.0.6
+- click
+- cmake>=3.26.4,!=3.30.0
+- cuda-nvtx=11.8
+- cuda-profiler-api=11.8.86
+- cuda-python>=11.7.1,<12.0a0
+- cuda-version=11.8
+- cudatoolkit
+- cxx-compiler
+- cython>=3.0.0
+- dlpack>=0.8,<1.0
+- gcc_linux-64=11.*
+- glog>=0.6.0
+- h5py>=3.8.0
+- hnswlib=0.6.2
+- libcublas-dev=11.11.3.6
+- libcublas=11.11.3.6
+- libcurand-dev=10.3.0.86
+- libcurand=10.3.0.86
+- libcusolver-dev=11.4.1.48
+- libcusolver=11.4.1.48
+- libcusparse-dev=11.7.5.86
+- libcusparse=11.7.5.86
+- matplotlib
+- nccl>=2.9.9
+- ninja
+- nlohmann_json>=3.11.2
+- nvcc_linux-64=11.8
+- openblas
+- pandas
+- pylibraft==24.10.*,>=0.0.0a0
+- pyyaml
+- rmm==24.10.*,>=0.0.0a0
+- sysroot_linux-64==2.17
+name: bench_ann_cuda-118_arch-x86_64
diff --git a/conda/environments/bench_ann_cuda-125_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-125_arch-aarch64.yaml
@@ -0,0 +1,43 @@
+# This file is generated by `rapids-dependency-file-generator`.
+# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
+channels:
+- rapidsai
+- rapidsai-nightly
+- dask/label/dev
+- conda-forge
+- nvidia
+dependencies:
+- benchmark>=1.8.2
+- c-compiler
+- clang-tools=16.0.6
+- clang==16.0.6
+- click
+- cmake>=3.26.4,!=3.30.0
+- cuda-cudart-dev
+- cuda-nvcc
+- cuda-nvtx-dev
+- cuda-profiler-api
+- cuda-python>=12.0,<13.0a0
+- cuda-version=12.5
+- cxx-compiler
+- cython>=3.0.0
+- dlpack>=0.8,<1.0
+- gcc_linux-aarch64=11.*
+- glog>=0.6.0
+- h5py>=3.8.0
+- hnswlib=0.6.2
+- libcublas-dev
+- libcurand-dev
+- libcusolver-dev
+- libcusparse-dev
+- matplotlib
+- nccl>=2.9.9
+- ninja
+- nlohmann_json>=3.11.2
+- openblas
+- pandas
+- pylibraft==24.10.*,>=0.0.0a0
+- pyyaml
+- rmm==24.10.*,>=0.0.0a0
+- sysroot_linux-aarch64==2.17
+name: bench_ann_cuda-125_arch-aarch64
diff --git a/conda/environments/bench_ann_cuda-125_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-125_arch-x86_64.yaml
@@ -0,0 +1,43 @@
+# This file is generated by `rapids-dependency-file-generator`.
+# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
+channels:
+- rapidsai
+- rapidsai-nightly
+- dask/label/dev
+- conda-forge
+- nvidia
+dependencies:
+- benchmark>=1.8.2
+- c-compiler
+- clang-tools=16.0.6
+- clang==16.0.6
+- click
+- cmake>=3.26.4,!=3.30.0
+- cuda-cudart-dev
+- cuda-nvcc
+- cuda-nvtx-dev
+- cuda-profiler-api
+- cuda-python>=12.0,<13.0a0
+- cuda-version=12.5
+- cxx-compiler
+- cython>=3.0.0
+- dlpack>=0.8,<1.0
+- gcc_linux-64=11.*
+- glog>=0.6.0
+- h5py>=3.8.0
+- hnswlib=0.6.2
+- libcublas-dev
+- libcurand-dev
+- libcusolver-dev
+- libcusparse-dev
+- matplotlib
+- nccl>=2.9.9
+- ninja
+- nlohmann_json>=3.11.2
+- openblas
+- pandas
+- pylibraft==24.10.*,>=0.0.0a0
+- pyyaml
+- rmm==24.10.*,>=0.0.0a0
+- sysroot_linux-64==2.17
+name: bench_ann_cuda-125_arch-x86_64
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -21,6 +21,19 @@ files:
       - test_py_cuvs
       - cupy
       - rust
+  bench_ann:
+    output: conda
+    matrix:
+      cuda: ["11.8", "12.5"]
+      arch: [x86_64, aarch64]
+    includes:
+      - rapids_build
+      - build_py_cuvs
+      - cuda
+      - cuda_version
+      - develop
+      - bench
+      - bench_python
   test_cpp:
     output: none
     includes:
@@ -90,6 +103,20 @@ files:
       - test_python_common
       - test_py_cuvs
       - cupy
+  py_build_cuvs_bench:
+    output: pyproject
+    pyproject_dir: python/cuvs_bench
+    extras:
+      table: build-system
+    includes:
+      - rapids_build_setuptools
+  py_run_cuvs_bench:
+    output: pyproject
+    pyproject_dir: python/cuvs_bench
+    extras:
+      table: project
+    includes:
+      - bench_python
 channels:
   - rapidsai
   - rapidsai-nightly
@@ -154,6 +181,14 @@ dependencies:
           - matrix: {cuda: "11.2", arch: aarch64}
             packages: [nvcc_linux-aarch64=11.2]
 
+  rapids_build_setuptools:
+    common:
+      - output_types: [requirements, pyproject]
+        packages:
+          - &rapids_build_backend rapids-build-backend>=0.3.0,<0.4.0.dev0
+          - setuptools
+          - wheel
+
   build_py_cuvs:
     common:
       - output_types: [conda]
@@ -460,3 +495,23 @@ dependencies:
       - output_types: [conda, requirements, pyproject]
         packages:
           - scikit-learn
+  bench:
+    common:
+      - output_types: [conda, pyproject, requirements]
+        packages:
+          - hnswlib=0.6.2
+          - nlohmann_json>=3.11.2
+          - glog>=0.6.0
+          - h5py>=3.8.0
+          - benchmark>=1.8.2
+          - openblas
+          - *rmm_unsuffixed
+  bench_python:
+    common:
+      - output_types: [conda]
+        packages:
+          - matplotlib
+          - pandas
+          - pyyaml
+          - pandas
+          - click
diff --git a/python/cuvs_bench/LICENSE b/python/cuvs_bench/LICENSE
@@ -0,0 +1 @@
+../../LICENSE
diff --git a/python/cuvs_bench/cuvs_bench/VERSION b/python/cuvs_bench/cuvs_bench/VERSION
@@ -0,0 +1 @@
+../../../VERSION
diff --git a/python/cuvs_bench/pyproject.toml b/python/cuvs_bench/pyproject.toml
@@ -0,0 +1,70 @@
+# Copyright (c) 2024, NVIDIA CORPORATION.
+
+[build-system]
+build-backend = "rapids_build_backend.build"
+requires = [
+    "rapids-build-backend>=0.3.0,<0.4.0.dev0",
+    "setuptools",
+    "wheel",
+] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
+
+[project]
+name = "cuvs-bench"
+dynamic = ["version"]
+description = "cuVS benchmarks"
+authors = [
+    { name = "NVIDIA Corporation" },
+]
+license = { text = "Apache 2.0" }
+requires-python = ">=3.9"
+dependencies = [
+] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
+classifiers = [
+    "Intended Audience :: Developers",
+    "Topic :: Database",
+    "Topic :: Scientific/Engineering",
+    "License :: OSI Approved :: Apache Software License",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+]
+
+[project.urls]
+Homepage = "https://github.com/rapidsai/raft"
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.setuptools.package-data]
+"*" = ["*.*", "VERSION"]
+
+[tool.isort]
+line_length = 79
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+combine_as_imports = true
+order_by_type = true
+skip = [
+    "thirdparty",
+    ".eggs",
+    ".git",
+    ".hg",
+    ".mypy_cache",
+    ".tox",
+    ".venv",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+]
+
+[tool.setuptools.dynamic]
+version = { file = "cuvs_bench/VERSION" }
+
+[tool.rapids-build-backend]
+build-backend = "scikit_build_core.build"
+requires = []
+dependencies-file = "../../dependencies.yaml"
+matrix-entry = "cuda_suffixed=true"