From 6a673845163b9127eebdac11274b36855d0de01a Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 7 Jul 2021 08:36:41 -0500 Subject: [PATCH 1/3] always add faiss library alias if it's missing --- cpp/cmake/thirdparty/get_faiss.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cpp/cmake/thirdparty/get_faiss.cmake b/cpp/cmake/thirdparty/get_faiss.cmake index 4991990e37..a65401579c 100644 --- a/cpp/cmake/thirdparty/get_faiss.cmake +++ b/cpp/cmake/thirdparty/get_faiss.cmake @@ -40,7 +40,10 @@ function(find_and_configure_faiss) if(FAISS_ADDED) set(FAISS_GPU_HEADERS ${FAISS_SOURCE_DIR} PARENT_SCOPE) - add_library(FAISS::FAISS ALIAS faiss) + endif() + + if(TARGET faiss AND NOT TARGET FAISS::FAISS) + add_library(FAISS::FAISS ALIAS faiss) endif() endfunction() From dc641550c835fed8c8bb48ad950569a40e7402db Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 8 Jul 2021 20:27:16 -0500 Subject: [PATCH 2/3] update expected version of clang-format --- cpp/scripts/run-clang-format.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/scripts/run-clang-format.py b/cpp/scripts/run-clang-format.py index aad20fb524..24306de3fc 100755 --- a/cpp/scripts/run-clang-format.py +++ b/cpp/scripts/run-clang-format.py @@ -22,7 +22,7 @@ import tempfile -EXPECTED_VERSION = "8.0.1" +EXPECTED_VERSION = "11.0.0" VERSION_REGEX = re.compile(r"clang-format version ([0-9.]+)") # NOTE: populate this list with more top-level dirs as we add more of them to # to the cuml repo From cf1c94ad6c1681546d6d02f4dd2f6f500bd8d7b8 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 8 Jul 2021 20:44:49 -0500 Subject: [PATCH 3/3] fix lint --- cpp/include/raft/sparse/cusparse_wrappers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/include/raft/sparse/cusparse_wrappers.h b/cpp/include/raft/sparse/cusparse_wrappers.h index d072100672..360832f557 100644 --- a/cpp/include/raft/sparse/cusparse_wrappers.h +++ b/cpp/include/raft/sparse/cusparse_wrappers.h @@ -55,7 +55,7 @@ namespace detail { inline const char* cusparse_error_to_string(cusparseStatus_t err) { #if defined(CUDART_VERSION) && CUDART_VERSION >= 10100 return cusparseGetErrorString(err); -#else // CUDART_VERSION +#else // CUDART_VERSION switch (err) { _CUSPARSE_ERR_TO_STR(CUSPARSE_STATUS_SUCCESS); _CUSPARSE_ERR_TO_STR(CUSPARSE_STATUS_NOT_INITIALIZED);