Skip to content

Commit

Permalink
Merge branch 'cagra-c-api' of github.com:divyegala/cuvs into cagra-c-api
Browse files Browse the repository at this point in the history
  • Loading branch information
cjnolet committed Jan 26, 2024
2 parents 0d4333c + 79ae7f5 commit 832b93c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
8 changes: 4 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,10 @@ if hasArg --allgpuarch; then
fi


#if hasArg --compile-static-lib || (( ${NUMARGS} == 0 )); then
# COMPILE_LIBRARY=ON
# CMAKE_TARGET="${CMAKE_TARGET};cuvs_lib_static"
#fi
# Append `-DFIND_CUVS_CPP=ON` to EXTRA_CMAKE_ARGS unless a user specified the option.
if [[ "${EXTRA_CMAKE_ARGS}" != *"DFIND_CUVS_CPP"* ]]; then
EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -DFIND_CUVS_CPP=ON"
fi

if hasArg tests || (( ${NUMARGS} == 0 )); then
BUILD_TESTS=ON
Expand Down
9 changes: 1 addition & 8 deletions python/cuvs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,14 @@ project(
)

option(FIND_CUVS_CPP "Search for existing CUVS C++ installations before defaulting to local files"
ON
OFF
)

option(CUVS_BUILD_WHEELS "Whether this build is generating a Python wheel." OFF)

# If the user requested it we attempt to find CUVS.
if(FIND_CUVS_CPP)
find_package(cuvs ${cuvs_version})
if(NOT TARGET cuvs::cuvs)
message(
FATAL_ERROR
"Building against a preexisting libcuvs library requires the compiled libcuvs to have been built!"
)

endif()
else()
set(cuvs_FOUND OFF)
endif()
Expand Down

0 comments on commit 832b93c

Please sign in to comment.