Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion c/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ endif()

ConfigureTest(NAME cuvs_c_headers PATH core/headers.c)
ConfigureTest(NAME cuvs_c_test PATH core/c_api.c)
target_link_libraries(cuvs_c_test PRIVATE CUDA::cudart)
target_link_libraries(cuvs_c_test PRIVATE CUDA::cudart_static)
ConfigureTest(NAME cuvs_c_neighbors_test PATH neighbors/c_api.c)

# ##################################################################################################
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies:
- clang-tools==20.1.4
- clang==20.1.4
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies:
- clang-tools==20.1.4
- clang==20.1.4
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-130_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies:
- clang-tools==20.1.4
- clang==20.1.4
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-130_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies:
- clang-tools==20.1.4
- clang==20.1.4
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/bench_ann_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- clang==20.1.4
- click
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/bench_ann_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- clang==20.1.4
- click
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/bench_ann_cuda-130_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- clang==20.1.4
- click
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/bench_ann_cuda-130_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- clang==20.1.4
- click
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/go_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- clang-tools==20.1.4
- clang==20.1.4
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/go_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- clang-tools==20.1.4
- clang==20.1.4
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/go_cuda-130_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- clang-tools==20.1.4
- clang==20.1.4
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/go_cuda-130_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- clang-tools==20.1.4
- clang==20.1.4
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/rust_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- clang-tools==20.1.4
- clang==20.1.4
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/rust_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- clang-tools==20.1.4
- clang==20.1.4
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/rust_cuda-130_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- clang-tools==20.1.4
- clang==20.1.4
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
1 change: 0 additions & 1 deletion conda/environments/rust_cuda-130_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- clang-tools==20.1.4
- clang==20.1.4
- cmake>=3.30.4
- cuda-cudart-dev
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
Expand Down
3 changes: 0 additions & 3 deletions conda/recipes/cuvs/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ requirements:
- if: cuda_major == "12"
then: cuda-python >=12.9.2,<13.0
else: cuda-python >=13.0.1,<14.0
- cuda-cudart-dev
run:
- ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
- libcuvs =${{ version }}
Expand All @@ -72,11 +71,9 @@ requirements:
- if: cuda_major == "12"
then: cuda-python >=12.9.2,<13.0
else: cuda-python >=13.0.1,<14.0
- cuda-cudart
ignore_run_exports:
by_name:
- cuda-version
- cuda-cudart

tests:
- python:
Expand Down
13 changes: 0 additions & 13 deletions conda/recipes/libcuvs/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ cache:
- libraft-headers =${{ minor_version }}
- nccl ${{ nccl_version }}
- cuda-version =${{ cuda_version }}
- cuda-cudart-dev
- cuda-profiler-api
- libcublas-dev
- libcurand-dev
Expand Down Expand Up @@ -101,7 +100,6 @@ outputs:
- libraft-headers =${{ minor_version }}
- nccl ${{ nccl_version }}
- cuda-version =${{ cuda_version }}
- cuda-cudart-dev
- cuda-profiler-api
- libcublas-dev
- libcurand-dev
Expand All @@ -111,14 +109,12 @@ outputs:
- ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
- libraft-headers =${{ minor_version }}
- nccl
- cuda-cudart
- libcublas
- libcurand
- libcusolver
- libcusparse
ignore_run_exports:
by_name:
- cuda-cudart
- cuda-version
- libaio
- libboost
Expand Down Expand Up @@ -155,7 +151,6 @@ outputs:
- ${{ pin_subpackage("libcuvs", exact=True) }}
- cuda-version =${{ cuda_version }}
- openblas # required by some CPU algos in benchmarks
- cuda-cudart-dev
- cuda-profiler-api
- libcublas-dev
- libcurand-dev
Expand All @@ -166,14 +161,12 @@ outputs:
- ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
- libraft-headers =${{ minor_version }}
- nccl
- cuda-cudart
- libcublas
- libcurand
- libcusolver
- libcusparse
ignore_run_exports:
by_name:
- cuda-cudart
- cuda-version
- libaio
- libboost
Expand Down Expand Up @@ -242,7 +235,6 @@ outputs:
- libraft-headers =${{ minor_version }}
- librmm =${{ minor_version }}
- nccl ${{ nccl_version }}
- cuda-cudart-dev
- cuda-profiler-api
- libcublas-dev
- libcurand-dev
Expand All @@ -252,14 +244,12 @@ outputs:
- ${{ pin_subpackage("libcuvs", exact=True) }}
- ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
- nccl
- cuda-cudart
- libcublas
- libcurand
- libcusolver
- libcusparse
ignore_run_exports:
by_name:
- cuda-cudart
- cuda-version
- libaio
- libboost
Expand Down Expand Up @@ -299,7 +289,6 @@ outputs:
- ${{ stdlib("c") }}
host:
- ${{ pin_subpackage("libcuvs", exact=True) }}
- cuda-cudart-dev
- cuda-profiler-api
- cuda-version =${{ cuda_version }}
- libcublas-dev
Expand All @@ -319,7 +308,6 @@ outputs:
run:
- ${{ pin_subpackage("libcuvs", exact=True) }}
- ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
- cuda-cudart
- libcublas
- libcurand
- libcusolver
Expand All @@ -330,7 +318,6 @@ outputs:
then: mkl =2023
ignore_run_exports:
by_name:
- cuda-cudart
- cuda-version
- libcublas
- libcurand
Expand Down
4 changes: 1 addition & 3 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ option(CUDA_ENABLE_KERNELINFO "Enable kernel resource usage info" OFF)
option(CUDA_ENABLE_LINEINFO
"Enable the -lineinfo option for nvcc (useful for cuda-memcheck / profiler)" OFF
)
option(CUDA_STATIC_RUNTIME "Statically link the CUDA runtime" OFF)
option(CUDA_STATIC_MATH_LIBRARIES "Statically link the CUDA math libraries" OFF)
option(CUVS_STATIC_RAPIDS_LIBRARIES "Build and statically link RAPIDS libraries" OFF)
option(CUDA_LOG_COMPILE_TIME "Write a log of compilation times to nvcc_compile_log.csv" OFF)
Expand Down Expand Up @@ -112,7 +111,6 @@ message(VERBOSE "cuVS: Disable OpenMP: ${DISABLE_OPENMP}")
message(VERBOSE "cuVS: Enable kernel resource usage info: ${CUDA_ENABLE_KERNELINFO}")
message(VERBOSE "cuVS: Enable lineinfo in nvcc: ${CUDA_ENABLE_LINEINFO}")
message(VERBOSE "cuVS: Enable nvtx markers: ${CUVS_NVTX}")
message(VERBOSE "cuVS: Statically link the CUDA runtime: ${CUDA_STATIC_RUNTIME}")
message(VERBOSE "cuVS: Statically link the CUDA math libraries: ${CUDA_STATIC_MATH_LIBRARIES}")
message(VERBOSE "cuVS: Build and statically link RAPIDS libraries: ${CUVS_STATIC_RAPIDS_LIBRARIES}")

Expand Down Expand Up @@ -149,7 +147,7 @@ endif()

if(NOT BUILD_CPU_ONLY)
# CUDA runtime
rapids_cuda_init_runtime(USE_STATIC ${CUDA_STATIC_RUNTIME})
rapids_cuda_init_runtime(USE_STATIC ON)
# * find CUDAToolkit package
# * determine GPU architectures
# * enable the CMake CUDA language
Expand Down
4 changes: 1 addition & 3 deletions cpp/cmake/thirdparty/get_cutlass.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ function(find_and_configure_cutlass)
CACHE BOOL "Disable CUTLASS to build with cuBLAS library."
)

if (CUDA_STATIC_RUNTIME)
set(CUDART_LIBRARY "${CUDA_cudart_static_LIBRARY}" CACHE FILEPATH "fixing cutlass cmake code" FORCE)
endif()
set(CUDART_LIBRARY "${CUDA_cudart_static_LIBRARY}" CACHE FILEPATH "fixing cutlass cmake code" FORCE)

include("${rapids-cmake-dir}/cpm/package_override.cmake")
rapids_cpm_package_override("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../patches/cutlass_override.json")
Expand Down
2 changes: 1 addition & 1 deletion cpp/cmake/thirdparty/get_faiss.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function(find_and_configure_faiss)
"FAISS_ENABLE_CUVS ${PKG_ENABLE_GPU}"
"FAISS_ENABLE_PYTHON OFF"
"FAISS_OPT_LEVEL ${CUVS_FAISS_OPT_LEVEL}"
"FAISS_USE_CUDA_TOOLKIT_STATIC ${CUDA_STATIC_RUNTIME}"
"FAISS_USE_CUDA_TOOLKIT_STATIC ON"
"BUILD_TESTING OFF"
"CMAKE_MESSAGE_LOG_LEVEL VERBOSE"
)
Expand Down
1 change: 0 additions & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@ dependencies:
- output_types: [conda]
packages:
- cuda-nvtx-dev
- cuda-cudart-dev
- cuda-profiler-api
- libcublas-dev
- libcurand-dev
Expand Down
5 changes: 0 additions & 5 deletions docs/source/build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,6 @@ cuVS has the following configurable cmake flags available:
- OFF
- Enable the `-lineinfo` option for nvcc

* - CUDA_STATIC_RUNTIME
- ON, OFF
- OFF
- Statically link the CUDA runtime

* - CUDA_STATIC_MATH_LIBRARIES
- ON, OFF
- OFF
Expand Down
10 changes: 5 additions & 5 deletions examples/c/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,29 +33,29 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
add_executable(CAGRA_C_EXAMPLE src/cagra_c_example.c)
target_include_directories(CAGRA_C_EXAMPLE PUBLIC "$<BUILD_INTERFACE:${DLPACK_INCLUDE_DIR}>")
target_link_libraries(
CAGRA_C_EXAMPLE PRIVATE cuvs::c_api CUDA::cudart $<TARGET_NAME_IF_EXISTS:conda_env>
CAGRA_C_EXAMPLE PRIVATE cuvs::c_api CUDA::cudart_static $<TARGET_NAME_IF_EXISTS:conda_env>
)

add_executable(L2_C_EXAMPLE src/L2_c_example.c)
target_include_directories(L2_C_EXAMPLE PUBLIC "$<BUILD_INTERFACE:${DLPACK_INCLUDE_DIR}>")
target_link_libraries(
L2_C_EXAMPLE PRIVATE cuvs::c_api CUDA::cudart $<TARGET_NAME_IF_EXISTS:conda_env>
L2_C_EXAMPLE PRIVATE cuvs::c_api CUDA::cudart_static $<TARGET_NAME_IF_EXISTS:conda_env>
)

add_executable(IVF_FLAT_C_EXAMPLE src/ivf_flat_c_example.c)
target_include_directories(IVF_FLAT_C_EXAMPLE PUBLIC "$<BUILD_INTERFACE:${DLPACK_INCLUDE_DIR}>")
target_link_libraries(
IVF_FLAT_C_EXAMPLE PRIVATE cuvs::c_api CUDA::cudart $<TARGET_NAME_IF_EXISTS:conda_env>
IVF_FLAT_C_EXAMPLE PRIVATE cuvs::c_api CUDA::cudart_static $<TARGET_NAME_IF_EXISTS:conda_env>
)

add_executable(IVF_PQ_C_EXAMPLE src/ivf_pq_c_example.c)
target_include_directories(IVF_PQ_C_EXAMPLE PUBLIC "$<BUILD_INTERFACE:${DLPACK_INCLUDE_DIR}>")
target_link_libraries(
IVF_PQ_C_EXAMPLE PRIVATE cuvs::c_api CUDA::cudart $<TARGET_NAME_IF_EXISTS:conda_env>
IVF_PQ_C_EXAMPLE PRIVATE cuvs::c_api CUDA::cudart_static $<TARGET_NAME_IF_EXISTS:conda_env>
)

add_executable(BRUTEFORCE_C_EXAMPLE src/bruteforce_c_example.c)
target_include_directories(BRUTEFORCE_C_EXAMPLE PUBLIC "$<BUILD_INTERFACE:${DLPACK_INCLUDE_DIR}>")
target_link_libraries(
BRUTEFORCE_C_EXAMPLE PRIVATE cuvs::c_api CUDA::cudart $<TARGET_NAME_IF_EXISTS:conda_env>
BRUTEFORCE_C_EXAMPLE PRIVATE cuvs::c_api CUDA::cudart_static $<TARGET_NAME_IF_EXISTS:conda_env>
)
1 change: 0 additions & 1 deletion python/libcuvs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ endif()
unset(cuvs_FOUND)

# --- CUDA --- #
set(CUDA_STATIC_RUNTIME ON)
set(CUDA_STATIC_MATH_LIBRARIES OFF)

# --- RAFT ---#
Expand Down
Loading