Port remaining scripts to cuvs_bench

build.sh

@@ -18,7 +18,7 @@ ARGS=$*
 # scripts, and that this script resides in the repo dir!
 REPODIR=$(cd $(dirname $0); pwd)
 
-VALIDARGS="clean libcuvs python rust docs tests bench-ann examples --uninstall  -v -g -n --compile-static-lib --allgpuarch  --cpu-only --no-nvtx --show_depr_warn --incl-cache-stats --time -h"
+VALIDARGS="clean libcuvs python rust docs tests bench-ann examples --uninstall  -v -g -n --compile-static-lib --allgpuarch --cpu-only --no-shared-libs --no-nvtx --show_depr_warn --incl-cache-stats --time -h"
 HELP="$0 [<target> ...] [<flag> ...] [--cmake-args=\"<args>\"] [--cache-tool=<tool>] [--limit-tests=<targets>] [--limit-bench-ann=<targets>] [--build-metrics=<filename>]
  where <target> is:
    clean            - remove all existing build artifacts and configuration (start over)
@@ -37,11 +37,12 @@ HELP="$0 [<target> ...] [<flag> ...] [--cmake-args=\"<args>\"] [--cache-tool=<to
    -n                          - no install step
    --uninstall                 - uninstall files for specified targets which were built and installed prior
    --compile-static-lib        - compile static library for all components
-   --cpu-only                  - build CPU only components without CUDA. Applies to bench-ann only currently.
+   --cpu-only                  - build CPU only components without CUDA. Currently only applies to bench-ann.
    --limit-tests               - semicolon-separated list of test executables to compile (e.g. NEIGHBORS_TEST;CLUSTER_TEST)
    --limit-bench-ann           - semicolon-separated list of ann benchmark executables to compute (e.g. HNSWLIB_ANN_BENCH;RAFT_IVF_PQ_ANN_BENCH)
    --allgpuarch                - build for all supported GPU architectures
    --no-nvtx                   - disable nvtx (profiling markers), but allow enabling it in downstream projects
+   --no-shared-libs            - build without shared libraries
    --show_depr_warn            - show cmake deprecation warnings
    --build-metrics             - filename for generating build metrics report for libcuvs
    --incl-cache-stats          - include cache statistics in build metrics report
@@ -71,6 +72,7 @@ COMPILE_LIBRARY=OFF
 INSTALL_TARGET=install
 BUILD_REPORT_METRICS=""
 BUILD_REPORT_INCL_CACHE_STATS=OFF
+BUILD_SHARED_LIBS=ON
 
 TEST_TARGETS="NEIGHBORS_ANN_CAGRA_TEST"
 ANN_BENCH_TARGETS="CUVS_ANN_BENCH_ALL"
@@ -277,16 +279,21 @@ fi
 
 if hasArg bench-ann || (( ${NUMARGS} == 0 )); then
     BUILD_CUVS_BENCH=ON
+    if ! hasArg tests; then
+        BUILD_TESTS=OFF
+    fi
+    COMPILE_LIBRARY=OFF
     CMAKE_TARGET="${CMAKE_TARGET};${ANN_BENCH_TARGETS}"
     if hasArg --cpu-only; then
-        COMPILE_LIBRARY=OFF
         BUILD_CPU_ONLY=ON
         NVTX=OFF
-    else
-        COMPILE_LIBRARY=ON
     fi
 fi
 
+if hasArg --no-shared-libs; then
+    BUILD_SHARED_LIBS=OFF
+fi
+
 if hasArg --no-nvtx; then
     NVTX=OFF
 fi
@@ -331,7 +338,11 @@ fi
 # Configure for building all C++ targets
 if (( ${NUMARGS} == 0 )) || hasArg libcuvs || hasArg docs || hasArg tests || hasArg bench-prims || hasArg bench-ann; then
     COMPILE_LIBRARY=ON
-    CMAKE_TARGET="${CMAKE_TARGET};cuvs"
+    if hasArg --no-shared-libs; then
+        CMAKE_TARGET="${CMAKE_TARGET};"
+    else
+        CMAKE_TARGET="${CMAKE_TARGET};cuvs"
+    fi
 
     if (( ${BUILD_ALL_GPU_ARCH} == 0 )); then
         CUVS_CMAKE_CUDA_ARCHITECTURES="NATIVE"
@@ -362,6 +373,7 @@ if (( ${NUMARGS} == 0 )) || hasArg libcuvs || hasArg docs || hasArg tests || has
           -DBUILD_CUVS_BENCH=${BUILD_CUVS_BENCH} \
           -DBUILD_CPU_ONLY=${BUILD_CPU_ONLY} \
           -DCMAKE_MESSAGE_LOG_LEVEL=${CMAKE_LOG_LEVEL} \
+          -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \
           ${CACHE_ARGS} \
           ${EXTRA_CMAKE_ARGS}
 

ci/build_python.sh

@@ -38,10 +38,10 @@ rapids-conda-retry mambabuild \
   --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
   conda/recipes/cuvs_bench
 
-# Build cuvs_bench_cpu only in CUDA 11 jobs since it only depends on python
+# Build cuvs_bench_cpu only in CUDA 12 jobs since it only depends on python
 # version
 RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}"
-if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then
+if [[ ${RAPIDS_CUDA_MAJOR} == "12" ]]; then
   rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \

conda/recipes/cuvs_bench/meta.yaml

@@ -1,7 +1,7 @@
-# Copyright (c) 2022-2024, NVIDIA CORPORATION.
+# Copyright (c) 2024, NVIDIA CORPORATION.
 
 # Usage:
-#   conda build . -c conda-forge -c nvidia -c rapidsai
+#   conda build . -c rapidsai -c conda-forge -c nvidia
 {% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
 {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
 {% set py_version = environ['CONDA_PY'] %}
@@ -31,8 +31,8 @@ build:
     - SCCACHE_BUCKET
     - SCCACHE_IDLE_TIMEOUT
     - SCCACHE_REGION
-    - SCCACHE_S3_KEY_PREFIX=libraft-aarch64 # [aarch64]
-    - SCCACHE_S3_KEY_PREFIX=libraft-linux64 # [linux64]
+    - SCCACHE_S3_KEY_PREFIX=cuvs-bench-aarch64 # [aarch64]
+    - SCCACHE_S3_KEY_PREFIX=cuvs-bench-linux64 # [linux64]
     - SCCACHE_S3_USE_SSL
   number: {{ GIT_DESCRIBE_NUMBER }}
   string: cuda{{ cuda_major }}_py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
@@ -60,8 +60,7 @@ requirements:
     - {{ stdlib("c") }}
 
   host:
-    - python
-    - libcuvs {{ version }}
+    - benchmark
     - cuda-version ={{ cuda_version }}
     {% if cuda_major == "11" %}
     - cuda-profiler-api {{ cuda11_cuda_profiler_api_run_version }}
@@ -73,17 +72,15 @@ requirements:
     - libcublas-dev
     {% endif %}
     - glog {{ glog_version }}
+    - libcuvs {{ version }}
     - nlohmann_json {{ nlohmann_json_version }}
-    - benchmark
     # rmm is needed to determine if package is gpu-enabled
-    - rmm ={{ minor_version }}
+    - python
     - rapids-build-backend>=0.3.0,<0.4.0.dev0
+    - rmm ={{ minor_version }}
 
   run:
-    - python
-    - libcuvs {{ version }}
-    - pylibraft {{ version }}
-    - cuvs {{ version }}
+    - benchmark
     - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
     {% if cuda_major == "11" %}
     - cudatoolkit
@@ -92,16 +89,16 @@ requirements:
     - libcublas
     {% endif %}
     - glog {{ glog_version }}
+    - libcuvs {{ version }}
     - h5py {{ h5py_version }}
-    - benchmark
-    - glog {{ glog_version }}
     - matplotlib
-    - python
     - pandas
     - pyyaml
     # rmm is needed to determine if package is gpu-enabled
+    - pylibraft ={{ minor_version }}
+    - python
     - rmm ={{ minor_version }}
 about:
   home: https://rapids.ai/
   license: Apache-2.0
-  summary: cuVS ANN GPU and CPU benchmarks
+  summary: cuVS GPU and CPU benchmarks

conda/recipes/cuvs_bench_cpu/build.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2023, NVIDIA CORPORATION.
+# Copyright (c) 2024, NVIDIA CORPORATION.
 
 ./build.sh bench-ann --cpu-only --no-nvtx --build-metrics=bench_ann_cpu --incl-cache-stats
 cmake --install cpp/build --component ann_bench

conda/recipes/cuvs_bench_cpu/meta.yaml

@@ -1,11 +1,10 @@
-# Copyright (c) 2022-2024, NVIDIA CORPORATION.
+# Copyright (c) 2024, NVIDIA CORPORATION.
 
 # Usage:
-#   conda build . -c conda-forge -c nvidia -c rapidsai
+#   conda build .  -c rapidsai -c conda-forge -c nvidia
 {% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
 {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
 {% set py_version = environ['CONDA_PY'] %}
-{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
 {% set date_string = environ['RAPIDS_DATE_STRING'] %}
 
 package:
@@ -30,8 +29,8 @@ build:
     - SCCACHE_BUCKET
     - SCCACHE_IDLE_TIMEOUT
     - SCCACHE_REGION
-    - SCCACHE_S3_KEY_PREFIX=libraft-aarch64 # [aarch64]
-    - SCCACHE_S3_KEY_PREFIX=libraft-linux64 # [linux64]
+    - SCCACHE_S3_KEY_PREFIX=cuvs-bench-cpu-aarch64 # [aarch64]
+    - SCCACHE_S3_KEY_PREFIX=cuvs-bench-cpu-linux64 # [linux64]
     - SCCACHE_S3_USE_SSL
   number: {{ GIT_DESCRIBE_NUMBER }}
   string: py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
@@ -45,24 +44,23 @@ requirements:
     - {{ stdlib("c") }}
 
   host:
+    - benchmark
+    - fmt {{ fmt_version }}
     - glog {{ glog_version }}
-    - matplotlib
     - nlohmann_json {{ nlohmann_json_version }}
-    - spdlog {{ spdlog_version }}
-    - fmt {{ fmt_version }}
     - python
     - rapids-build-backend>=0.3.0,<0.4.0.dev0
-    - benchmark
+    - spdlog {{ spdlog_version }}
 
   run:
+    - benchmark
     - glog {{ glog_version }}
     - h5py {{ h5py_version }}
     - matplotlib
-    - python
-    - pyyaml
     - pandas
-    - benchmark
+    - pyyaml
+    - python
 about:
   home: https://rapids.ai/
   license: Apache-2.0
-  summary: cuVS ANN CPU benchmarks
+  summary: cuVS CPU benchmarks

conda/recipes/libcuvs/meta.yaml

@@ -159,6 +159,7 @@ outputs:
         - libcusolver
         - libcusparse
         {% endif %}
+        - libraft-headers ={{ minor_version }}
     about:
       home: https://rapids.ai/
       license: Apache-2.0