Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7e37218
FEA Add cuvs-bench to dependencies and conda environments
dantegd Aug 5, 2024
b2aef6d
FIX add missing deps
dantegd Aug 5, 2024
bf75242
FIX version and other improvements
dantegd Aug 6, 2024
a8bcdef
FEA Add cuvs_bench.run
dantegd Aug 6, 2024
ec6d70c
FIX some cuvs_bench python build dependencies
dantegd Aug 6, 2024
585ad53
FIX add missing algorithms.yaml
dantegd Aug 6, 2024
bb9dc28
Merge branch 'branch-24.10' into cuvsbench-run
cjnolet Aug 12, 2024
a400e4c
ENH refactor run code and add prompts to CLI
dantegd Aug 21, 2024
0e36e21
FEA Add first version of pytests
dantegd Aug 21, 2024
f652172
Merge branch 'cuvsbench-run' of github.com:dantegd/cuvs into cuvsbenc…
dantegd Aug 21, 2024
a8652e0
Merge branch 'branch-24.10' into cuvsbench-run
cjnolet Sep 4, 2024
17264f1
Merge branch 'branch-24.10' into cuvsbench-run
cjnolet Sep 6, 2024
5e36a13
Merge dev branch and branch-24.10
dantegd Sep 17, 2024
f4cbdf5
FIX more merge conflicts
dantegd Sep 17, 2024
20886a0
Merge branch 'branch-24.10' into cuvsbench-run
dantegd Sep 17, 2024
742e7c5
fix runners
divyegala Sep 18, 2024
c342662
Merge branch 'branch-24.10' into cuvsbench-run
divyegala Sep 18, 2024
1ef9a6e
Merge branch 'branch-24.10' into cuvsbench-run
rhdong Sep 19, 2024
9b69460
pre-commit
divyegala Sep 24, 2024
bce9d22
Merge remote-tracking branch 'upstream/branch-24.10' into cuvsbench-run
divyegala Sep 24, 2024
6deb9ca
Merge branch 'branch-24.10' into cuvsbench-run
divyegala Sep 25, 2024
2b4cf8c
remove bench-ann build from cpp conda recipe
divyegala Sep 25, 2024
611f190
address review
divyegala Sep 25, 2024
2f868bb
Manage rapids-build-backend dependencies with dependencies.yaml.
bdice Sep 26, 2024
f460b3b
Remove extraneous file listing.
bdice Sep 26, 2024
8a82802
Fixes discussed with Divye.
bdice Sep 26, 2024
ac81e2f
Apply suggestions from code review
divyegala Sep 26, 2024
b2e5c48
json ignore only in root
divyegala Sep 26, 2024
0606697
Merge branch 'branch-24.10' into cuvsbench-run
cjnolet Sep 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions conda/environments/bench_ann_cuda-118_arch-aarch64.yaml
Original file line number Diff line number Diff line change
@@ -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.7.0
- 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
47 changes: 47 additions & 0 deletions conda/environments/bench_ann_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
@@ -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.7.0
- 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
43 changes: 43 additions & 0 deletions conda/environments/bench_ann_cuda-125_arch-aarch64.yaml
Original file line number Diff line number Diff line change
@@ -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.7.0
- 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
43 changes: 43 additions & 0 deletions conda/environments/bench_ann_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
@@ -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.7.0
- 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
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ option(BUILD_SHARED_LIBS "Build cuvs shared libraries" ON)
option(BUILD_TESTS "Build cuvs unit-tests" ON)
option(BUILD_C_LIBRARY "Build raft C API library" OFF)
option(BUILD_C_TESTS "Build raft C API tests" OFF)
option(BUILD_ANN_BENCH "Build cuVS ann benchmarks" OFF)
option(BUILD_ANN_BENCH "Build cuVS ann benchmarks" ON)
Comment thread
divyegala marked this conversation as resolved.
Outdated
option(BUILD_CAGRA_HNSWLIB "Build CAGRA+hnswlib interface" ON)
option(CUDA_ENABLE_KERNELINFO "Enable kernel resource usage info" OFF)
option(CUDA_ENABLE_LINEINFO
Expand Down
55 changes: 55 additions & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -89,6 +102,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
Expand Down Expand Up @@ -153,6 +180,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]
Expand Down Expand Up @@ -429,3 +464,23 @@ dependencies:
- output_types: [conda, requirements, pyproject]
packages:
- scikit-learn
bench:
common:
- output_types: [conda, pyproject, requirements]
packages:
- hnswlib=0.7.0
- 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
Loading