Fix handling of cmake USE_SVS=OFF and HAVE_SVS=false in Tiered SVS index

Author: rfsaliev

src/VecSim/index_factories/tiered_factory.cpp

@@ -11,8 +11,9 @@
 #include "VecSim/algorithms/hnsw/hnsw_tiered.h"
 #include "VecSim/types/bfloat16.h"
 #include "VecSim/types/float16.h"
-#if HAVE_SVS
 #include "VecSim/index_factories/svs_factory.h"
+
+#if HAVE_SVS
 #include "VecSim/algorithms/svs/svs_tiered.h"
 #endif
 
@@ -118,10 +119,8 @@ VecSimIndex *NewIndex(const TieredIndexParams *params) {
 }
 } // namespace TieredHNSWFactory
 
-#if HAVE_SVS
 namespace TieredSVSFactory {
-
-static inline BFParams NewBFParams(const TieredIndexParams *params) {
+BFParams NewBFParams(const TieredIndexParams *params) {
     auto &svs_params = params->primaryIndexParams->algoParams.svsParams;
     return BFParams{.type = svs_params.type,
                     .dim = svs_params.dim,
@@ -130,6 +129,7 @@ static inline BFParams NewBFParams(const TieredIndexParams *params) {
                     .blockSize = svs_params.blockSize};
 }
 
+#if HAVE_SVS
 template <typename DataType>
 inline VecSimIndex *NewIndex(const TieredIndexParams *params) {
 
@@ -191,7 +191,7 @@ inline size_t EstimateInitialSize(const TieredIndexParams *params) {
 }
 
 VecSimIndex *NewIndex(const TieredIndexParams *params) {
-    // Tiered index that contains HNSW index as primary index
+    // Tiered index that contains SVS index as primary index
     VecSimType type = params->primaryIndexParams->algoParams.svsParams.type;
     switch (type) {
     case VecSimType_FLOAT32:
@@ -204,19 +204,25 @@ VecSimIndex *NewIndex(const TieredIndexParams *params) {
     }
     return nullptr; // Invalid type.
 }
-} // namespace TieredSVSFactory
+
+// This is a temporary solution to avoid breaking the build when SVS is not available
+// and to allow the code to compile without SVS support.
+// TODO: remove HAVE_SVS when SVS will support all Redis platfoms and compilers
+#else // HAVE_SVS
+inline VecSimIndex *NewIndex(const TieredIndexParams *params) { return nullptr; }
+inline size_t EstimateInitialSize(const TieredIndexParams *params) { return 0; }
+inline size_t EstimateElementSize(const TieredIndexParams *params) { return 0; }
 #endif
+} // namespace TieredSVSFactory
 
 VecSimIndex *NewIndex(const TieredIndexParams *params) {
     switch (params->primaryIndexParams->algo) {
     // Tiered index that contains HNSW index as primary index
     case VecSimAlgo_HNSWLIB:
         return TieredHNSWFactory::NewIndex(params);
-#if HAVE_SVS
-        // Tiered index that contains SVS index as primary index
+    // Tiered index that contains SVS index as primary index
     case VecSimAlgo_SVS:
         return TieredSVSFactory::NewIndex(params);
-#endif
     default:
         return nullptr; // Invalid algorithm.
     }
@@ -232,12 +238,10 @@ size_t EstimateInitialSize(const TieredIndexParams *params) {
         est += TieredHNSWFactory::EstimateInitialSize(params);
         bf_params = TieredHNSWFactory::NewBFParams(params);
         break;
-#if HAVE_SVS
     case VecSimAlgo_SVS:
         est += TieredSVSFactory::EstimateInitialSize(params);
         bf_params = TieredSVSFactory::NewBFParams(params);
         break;
-#endif
     default:
         assert(false && "Invalid algorithm");
     }
@@ -252,11 +256,9 @@ size_t EstimateElementSize(const TieredIndexParams *params) {
     case VecSimAlgo_HNSWLIB:
         est = HNSWFactory::EstimateElementSize(&params->primaryIndexParams->algoParams.hnswParams);
         break;
-#if HAVE_SVS
     case VecSimAlgo_SVS:
         est = SVSFactory::EstimateElementSize(&params->primaryIndexParams->algoParams.svsParams);
         break;
-#endif
     default:
         assert(false && "Invalid algorithm");
     }

src/VecSim/index_factories/tiered_factory.h

@@ -55,6 +55,10 @@ VecSimIndex *NewIndex(const TieredIndexParams *params, HNSWIndex<DataType, DistT
         hnsw_index, frontendIndex, *params, management_layer_allocator);
 }
 } // namespace TieredHNSWFactory
+
+namespace TieredSVSFactory {
+BFParams NewBFParams(const TieredIndexParams *params);
+}
 #endif
 
 }; // namespace TieredFactory

tests/unit/test_svs.cpp

@@ -1453,21 +1453,23 @@ TYPED_TEST(SVSTest, svs_vector_search_test_cosine) {
 TYPED_TEST(SVSTest, testSizeEstimation) {
     size_t dim = 64;
 
+    auto quantBits = TypeParam::get_quant_bits();
+    // Get the fallback quantization mode
+    quantBits = std::get<0>(svs_details::isSVSQuantBitsSupported(quantBits));
+
+#if HAVE_SVS_LVQ
     // SVS block sizes always rounded to a power of 2
     // This why, in case of quantization, actual block size can be differ than requested
     // In addition, block size to be passed to graph and dataset counted in bytes,
     // converted then to a number of elements.
     // IMHO, would be better to always interpret block size to a number of elements
     // rather than conversion to-from number of bytes
-    auto quantBits = TypeParam::get_quant_bits();
-    // Get the fallback quantization mode
-    quantBits = std::get<0>(svs_details::isSVSQuantBitsSupported(quantBits));
     if (quantBits != VecSimSvsQuant_NONE) {
         // Extra data in LVQ vector
         const auto lvq_vector_extra = sizeof(svs::quantization::lvq::ScalarBundle);
         dim -= (lvq_vector_extra * 8) / TypeParam::get_quant_bits();
     }
-
+#endif
     size_t n = 0;
     size_t bs = DEFAULT_BLOCK_SIZE;