From 614ddb612cf01b08e15886440464106696d95adf Mon Sep 17 00:00:00 2001 From: Tarang Jain Date: Thu, 8 Jan 2026 15:51:01 -0800 Subject: [PATCH 1/2] remove WHOLE_ARCHIVE for gpu_obj --- cpp/cmake/thirdparty/get_faiss.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/cmake/thirdparty/get_faiss.cmake b/cpp/cmake/thirdparty/get_faiss.cmake index 9f3aa0f36f..619c3b2520 100644 --- a/cpp/cmake/thirdparty/get_faiss.cmake +++ b/cpp/cmake/thirdparty/get_faiss.cmake @@ -82,7 +82,7 @@ function(find_and_configure_faiss) NAMESPACE faiss::) endif() - # Need to tell CMake to rescan the link group of faiss::faiss_gpu_objs and faiss + # Need to tell CMake to rescan the link group of faiss and include faiss_gpu_objs # so that we get proper link order when they are static # # We don't look at the existence of `faiss_avx2` as it will always exist @@ -91,9 +91,9 @@ function(find_and_configure_faiss) # a dependency to it. Adding a dependency will cause it to compile, # and fail due to invalid compiler flags. if(PKG_ENABLE_GPU AND PKG_BUILD_STATIC_LIBS AND CXX_AVX2_FOUND) - set(CUVS_FAISS_TARGETS "$,faiss::faiss_avx2>" PARENT_SCOPE) + set(CUVS_FAISS_TARGETS "$;$>" PARENT_SCOPE) elseif(PKG_ENABLE_GPU AND PKG_BUILD_STATIC_LIBS) - set(CUVS_FAISS_TARGETS "$,faiss::faiss>" PARENT_SCOPE) + set(CUVS_FAISS_TARGETS "$;$>" PARENT_SCOPE) elseif(CXX_AVX2_FOUND) set(CUVS_FAISS_TARGETS faiss::faiss_avx2 PARENT_SCOPE) else() From 71f51080cc11f3fe9fad97b0536f8052c58edf0b Mon Sep 17 00:00:00 2001 From: Tarang Jain Date: Thu, 8 Jan 2026 16:02:59 -0800 Subject: [PATCH 2/2] fix style --- cpp/cmake/thirdparty/get_faiss.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/cmake/thirdparty/get_faiss.cmake b/cpp/cmake/thirdparty/get_faiss.cmake index 619c3b2520..c7783881b5 100644 --- a/cpp/cmake/thirdparty/get_faiss.cmake +++ b/cpp/cmake/thirdparty/get_faiss.cmake @@ -1,6 +1,6 @@ #============================================================================= # cmake-format: off -# SPDX-FileCopyrightText: Copyright (c) 2024-2025, NVIDIA CORPORATION. +# SPDX-FileCopyrightText: Copyright (c) 2024-2026, NVIDIA CORPORATION. # SPDX-License-Identifier: Apache-2.0 # cmake-format: on #=============================================================================