Skip to content

Commit 0062e2f

Browse files
authored
Always add faiss library alias if it's missing (rapidsai#287)
Always add the `FAISS::FAISS` library target alias if it doesn't exist. This can happen if cuML is built and installs FAISS before cuGraph or vice-versa. Related PRs: rapidsai/cuml#4028 rapidsai/cugraph#1694 Note: We can probably remove the `get_faiss.cmake` file in cuML and cuGraph since they both should get it from RAFT. Authors: - Paul Taylor (https://github.com/trxcllnt) Approvers: - Corey J. Nolet (https://github.com/cjnolet) - Dante Gama Dessavre (https://github.com/dantegd) URL: rapidsai#287
1 parent dbaf923 commit 0062e2f

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

cpp/cmake/thirdparty/get_faiss.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ function(find_and_configure_faiss)
4040

4141
if(FAISS_ADDED)
4242
set(FAISS_GPU_HEADERS ${FAISS_SOURCE_DIR} PARENT_SCOPE)
43-
add_library(FAISS::FAISS ALIAS faiss)
43+
endif()
44+
45+
if(TARGET faiss AND NOT TARGET FAISS::FAISS)
46+
add_library(FAISS::FAISS ALIAS faiss)
4447
endif()
4548

4649
endfunction()

cpp/include/raft/sparse/cusparse_wrappers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ namespace detail {
5555
inline const char* cusparse_error_to_string(cusparseStatus_t err) {
5656
#if defined(CUDART_VERSION) && CUDART_VERSION >= 10100
5757
return cusparseGetErrorString(err);
58-
#else // CUDART_VERSION
58+
#else // CUDART_VERSION
5959
switch (err) {
6060
_CUSPARSE_ERR_TO_STR(CUSPARSE_STATUS_SUCCESS);
6161
_CUSPARSE_ERR_TO_STR(CUSPARSE_STATUS_NOT_INITIALIZED);

cpp/scripts/run-clang-format.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import tempfile
2323

2424

25-
EXPECTED_VERSION = "8.0.1"
25+
EXPECTED_VERSION = "11.0.0"
2626
VERSION_REGEX = re.compile(r"clang-format version ([0-9.]+)")
2727
# NOTE: populate this list with more top-level dirs as we add more of them to
2828
# to the cuml repo

0 commit comments

Comments
 (0)