Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
3 changes: 0 additions & 3 deletions conda/recipes/cuvs-bench-cpu/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ requirements:
- ninja
- ${{ stdlib("c") }}
host:
- benchmark
- glog ${{ glog_version }}
- nlohmann_json ${{ nlohmann_json_version }}
- openblas
Expand All @@ -72,7 +71,6 @@ requirements:
- libboost-devel=1.87
- mkl-devel=2023
run:
- benchmark
- click
- glog ${{ glog_version }}
- h5py ${{ h5py_version }}
Expand All @@ -89,7 +87,6 @@ requirements:
ignore_run_exports:
by_name:
- glog
- libaio
- libboost
- libcublas
- mkl # relaxes pin from host `mkl-devel`
Expand Down
12 changes: 0 additions & 12 deletions conda/recipes/cuvs-bench/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,10 @@ requirements:
- setuptools >=64.0.0
run:
- ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
- benchmark
- click
- cuda-cudart
- cupy >=13.6.0
- cuvs =${{ version }}
- glog ${{ glog_version }}
- h5py ${{ h5py_version }}
- libcublas
- libcuvs-bench-ann =${{ version }}
- matplotlib-base>=3.9
- pandas
Expand All @@ -56,17 +52,9 @@ requirements:
# rmm is needed to determine if package is gpu-enabled
- rmm =${{ minor_version }}
- scikit-learn>=1.5
- if: linux64
then: mkl =2023
ignore_run_exports:
by_name:
- cuda-version
- cuda-cudart
- glog
- libaio
- libboost
- libcublas
- mkl

tests:
- package_contents:
Expand Down
6 changes: 3 additions & 3 deletions cpp/cmake/thirdparty/get_nlohmann_json.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ function(find_and_configure_nlohmann_json)
EXCLUDE_FROM_ALL ${PKG_EXCLUDE_FROM_ALL}
)

if(glog_ADDED)
message(VERBOSE "cuVS: Using glog located in ${glog_SOURCE_DIR}")
if(nlohmann_json_ADDED)
message(VERBOSE "cuVS: Using nlohmann_json located in ${nlohmann_json_SOURCE_DIR}")
else()
message(VERBOSE "cuVS: Using glog located in ${glog_DIR}")
message(VERBOSE "cuVS: Using nlohmann_json located in ${nlohmann_json_DIR}")
endif()

endfunction()
Expand Down
Loading