Add tests for non-supported SVS cases.

Author: rfsaliev

cmake/svs.cmake

@@ -61,7 +61,6 @@ set(SVS_URL "https://github.com/intel/ScalableVectorSearch/releases/download/v0.
 
 if(USE_SVS)
     add_compile_definitions("HAVE_SVS=1")
-    set(svs_factory_file "index_factories/svs_factory.cpp")
     set(SVS_TARGET_NAME "svs::svs")
     if(SVS_SHARED_LIB)
         include(FetchContent)

src/VecSim/CMakeLists.txt

@@ -29,7 +29,7 @@ add_library(VectorSimilarity ${VECSIM_LIBTYPE}
     index_factories/brute_force_factory.cpp
     index_factories/hnsw_factory.cpp
     index_factories/tiered_factory.cpp
-    ${svs_factory_file}
+    index_factories/svs_factory.cpp
     index_factories/index_factory.cpp
     index_factories/components/components_factory.cpp
     algorithms/hnsw/visited_nodes_handler.cpp

src/VecSim/algorithms/svs/svs_utils.h

@@ -138,16 +138,18 @@ inline svs::lib::PowerOfTwo SVSBlockSize(size_t bs, size_t elem_size) {
     return svs_bs;
 }
 
-bool check_cpuid() {
+// clang-format off
+inline bool check_cpuid() {
     uint32_t eax, ebx, ecx, edx;
     __cpuid(0, eax, ebx, ecx, edx);
     std::string vendor_id = std::string((const char*)&ebx, 4) +
                             std::string((const char*)&edx, 4) +
                             std::string((const char*)&ecx, 4);
     return (vendor_id == "GenuineIntel");
 }
+//clang-format on
 
-bool isSVSLVQModeSupported(VecSimSvsQuantBits quant_bits) {
+inline bool isSVSLVQModeSupported(VecSimSvsQuantBits quant_bits) {
 #if HAVE_SVS_LVQ
     // Check if the CPU supports SVS LVQ
     return check_cpuid();

src/VecSim/index_factories/index_factory.cpp

@@ -9,9 +9,7 @@
 #include "hnsw_factory.h"
 #include "brute_force_factory.h"
 #include "tiered_factory.h"
-#if HAVE_SVS
 #include "svs_factory.h"
-#endif
 
 namespace VecSimFactory {
 VecSimIndex *NewIndex(const VecSimParams *params) {
@@ -33,9 +31,7 @@ VecSimIndex *NewIndex(const VecSimParams *params) {
             break;
         }
         case VecSimAlgo_SVS: {
-#if HAVE_SVS
             index = SVSFactory::NewIndex(params);
-#endif
             break;
         }
         }
@@ -54,9 +50,7 @@ size_t EstimateInitialSize(const VecSimParams *params) {
     case VecSimAlgo_TIERED:
         return TieredFactory::EstimateInitialSize(&params->algoParams.tieredParams);
     case VecSimAlgo_SVS:; // empty statement if svs not available
-#if HAVE_SVS
         return SVSFactory::EstimateInitialSize(&params->algoParams.svsParams);
-#endif
     }
     return -1;
 }
@@ -70,9 +64,7 @@ size_t EstimateElementSize(const VecSimParams *params) {
     case VecSimAlgo_TIERED:
         return TieredFactory::EstimateElementSize(&params->algoParams.tieredParams);
     case VecSimAlgo_SVS:; // empty statement if svs not available
-#if HAVE_SVS
         return SVSFactory::EstimateElementSize(&params->algoParams.svsParams);
-#endif
     }
     return -1;
 }

src/VecSim/index_factories/svs_factory.cpp

@@ -1,4 +1,6 @@
 #include "VecSim/index_factories/svs_factory.h"
+
+#if HAVE_SVS
 #include "VecSim/memory/vecsim_malloc.h"
 #include "VecSim/vec_sim_index.h"
 #include "VecSim/algorithms/svs/svs.h"
@@ -173,3 +175,11 @@ size_t EstimateInitialSize(const SVSParams *params, bool is_normalized) {
 }
 
 } // namespace SVSFactory
+
+#else  // HAVE_SVS
+namespace SVSFactory {
+VecSimIndex *NewIndex(const VecSimParams *params, bool is_normalized) { return NULL; }
+size_t EstimateInitialSize(const SVSParams *params, bool is_normalized) { return -1; }
+size_t EstimateElementSize(const SVSParams *params) { return -1; }
+}; // namespace SVSFactory
+#endif // HAVE_SVS

tests/unit/CMakeLists.txt

@@ -46,6 +46,7 @@ add_executable(test_bf16 ../utils/mock_thread_pool.cpp test_bf16.cpp unit_test_u
 add_executable(test_fp16 ../utils/mock_thread_pool.cpp test_fp16.cpp unit_test_utils.cpp)
 add_executable(test_int8 ../utils/mock_thread_pool.cpp test_int8.cpp unit_test_utils.cpp)
 add_executable(test_uint8 ../utils/mock_thread_pool.cpp test_uint8.cpp unit_test_utils.cpp)
+add_executable(test_svs ../utils/mock_thread_pool.cpp test_svs.cpp unit_test_utils.cpp)
 
 target_link_libraries(test_hnsw PUBLIC gtest_main VectorSimilarity)
 target_link_libraries(test_hnsw_parallel PUBLIC gtest_main VectorSimilarity)
@@ -59,11 +60,7 @@ target_link_libraries(test_bf16 PUBLIC gtest_main VectorSimilarity)
 target_link_libraries(test_fp16 PUBLIC gtest_main VectorSimilarity)
 target_link_libraries(test_int8 PUBLIC gtest_main VectorSimilarity)
 target_link_libraries(test_uint8 PUBLIC gtest_main VectorSimilarity)
-
-if(USE_SVS)
-	add_executable(test_svs ../utils/mock_thread_pool.cpp test_svs.cpp unit_test_utils.cpp)
-	target_link_libraries(test_svs PUBLIC gtest_main VectorSimilarity)
-endif()
+target_link_libraries(test_svs PUBLIC gtest_main VectorSimilarity)
 
 include(GoogleTest)
 
@@ -79,7 +76,4 @@ gtest_discover_tests(test_bf16 TEST_PREFIX BF16UNIT_)
 gtest_discover_tests(test_fp16 TEST_PREFIX FP16UNIT_)
 gtest_discover_tests(test_int8 TEST_PREFIX INT8UNIT_)
 gtest_discover_tests(test_uint8 TEST_PREFIX UINT8UNIT_)
-
-if(USE_SVS)
-	gtest_discover_tests(test_svs)
-endif()
+gtest_discover_tests(test_svs)