Align main with latest code changes

CMakeLists.txt

@@ -12,18 +12,6 @@ set(Torch_USE_CUDA OFF CACHE BOOL "Force disable CUDA in Torch")
 set(Torch_NO_CUDA ON CACHE BOOL "Force disable CUDA in Torch")
 set(USE_CUDA OFF CACHE BOOL "Force disable CUDA globally")
 
-# QUAKE_ENABLE_GPU: Enable GPU support for Faiss
-# Default: OFF
-if(QUAKE_ENABLE_GPU)
-    set(FAISS_ENABLE_GPU ON)
-else()
-    set(FAISS_ENABLE_GPU OFF)
-endif()
-
-if(QUAKE_ENABLE_GPU)
-    add_compile_definitions(FAISS_ENABLE_GPU)
-endif()
-
 if(QUAKE_USE_NUMA)
     add_compile_definitions(QUAKE_USE_NUMA)
 endif()
@@ -33,7 +21,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Compiler flags
-set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_DEBUG "-O3 -g")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 if(NOT DEFINED QUAKE_SET_ABI_MODE)
     set(QUAKE_SET_ABI_MODE ON)
@@ -64,6 +52,25 @@ set(project_BINDINGS_DIR ${CPP_SOURCE}/bindings)
 set(project_THIRD_PARTY_DIR ${CPP_SOURCE}/third_party)
 set(project_TEST_DIR test/cpp)
 
+if(QUAKE_ENABLE_GPU)
+    find_package(CuVS REQUIRED)
+    include(${project_THIRD_PARTY_DIR}/cmake/fetch_rapids.cmake)
+    include(rapids-cmake)
+    include(rapids-cpm)
+    include(rapids-cuda)
+    include(rapids-export)
+    include(rapids-find)
+
+    rapids_cuda_init_architectures(quake_c)
+
+    rapids_cpm_init()
+    set(BUILD_CUVS_C_LIBRARY OFF)
+    include(${project_THIRD_PARTY_DIR}/cmake/get_cuvs.cmake)
+
+    add_compile_definitions(QUAKE_ENABLE_GPU)
+endif()
+
+set(FAISS_ENABLE_GPU OFF)
 # ---------------------------------------------------------------
 # Print out Compiler and Path Information
 # ---------------------------------------------------------------
@@ -81,15 +88,14 @@ message(STATUS "QUAKE_USE_NUMA: ${QUAKE_USE_NUMA}")
 # Apple-specific adjustments
 if(APPLE)
     include_directories("/opt/homebrew/opt/openblas/include")
-    set(FAISS_ENABLE_GPU OFF)
 endif()
 
 # Compiler options and definitions
 add_compile_options(-march=native)
 
 # Switch ABI mode
 if(QUAKE_SET_ABI_MODE)
-    add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0)
+    add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=1)
 endif()
 
 
@@ -149,24 +155,34 @@ elseif(UNIX)
     if(QUAKE_USE_NUMA)
         list(APPEND LINK_LIBS -lnuma)
     endif()
+
+    if (QUAKE_ENABLE_GPU)
+        list(APPEND LINK_LIBS cuvs::cuvs)
+    endif()
 else()
     # unsupported platform
     message(FATAL_ERROR "Unsupported platform")
 endif()
 
 target_link_libraries(${PROJECT_NAME} PUBLIC ${LINK_LIBS})
 
-IF(CMAKE_BUILD_TYPE MATCHES Debug AND QUAKE_USE_TSAN)
+IF(QUAKE_USE_TSAN)
     message("Using thread sanitizer")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread")
     set(CMAKE_MODULE_LINKER_FLAGS "{$CMAKE_MODULE_LINKER_FLAGS} -fsanitize=thread")
-ENDIF(CMAKE_BUILD_TYPE MATCHES Debug AND QUAKE_USE_TSAN)
+ENDIF(QUAKE_USE_TSAN)
 
-IF(CMAKE_BUILD_TYPE MATCHES Debug AND QUAKE_USE_ASAN)
+IF(QUAKE_USE_ASAN)
     message("Using address sanitizer")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize-recover=address")
     set(CMAKE_MODULE_LINKER_FLAGS "{$CMAKE_MODULE_LINKER_FLAGS} -fsanitize=address")
-ENDIF(CMAKE_BUILD_TYPE MATCHES Debug AND QUAKE_USE_ASAN)
+ENDIF(QUAKE_USE_ASAN)
+
+IF(QUAKE_USE_LSAN)
+    message("Using leak sanitizer")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=leak")
+    set(CMAKE_MODULE_LINKER_FLAGS "{$CMAKE_MODULE_LINKER_FLAGS} -fsanitize=leak")
+ENDIF(QUAKE_USE_LSAN)
 
 # ---------------------------------------------------------------
 # Python Bindings
@@ -182,7 +198,7 @@ add_dependencies(bindings _bindings)
 # ---------------------------------------------------------------
 # Benchmarks
 # ---------------------------------------------------------------
-file(GLOB BENCHMARK_SOURCES "src/cpp/test/benchmark/*.cpp")
+file(GLOB BENCHMARK_SOURCES "scripts/cpp/benchmark/*.cpp")
 
 foreach(SOURCE ${BENCHMARK_SOURCES})
     get_filename_component(EXECUTABLE_NAME ${SOURCE} NAME_WE)
@@ -211,7 +227,7 @@ endif()
 # ---------------------------------------------------------------
 message(STATUS "--------- Final Configuration Summary ---------")
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
-message(STATUS "GPU Enabled: ${FAISS_ENABLE_GPU}")
+message(STATUS "GPU Enabled: ${QUAKE_ENABLE_GPU}")
 message(STATUS "NUMA Enabled: ${QUAKE_USE_NUMA}")
 message(STATUS "Python used: ${Python3_EXECUTABLE}")
 message(STATUS "Torch Path: ${TorchPath}")
@@ -221,4 +237,4 @@ message(STATUS "MKL_LINK: ${MKL_LINK}")
 message(STATUS "MKL_INTERFACE_FULL: ${MKL_INTERFACE_FULL}")
 message(STATUS "MKL_THREADING: ${MKL_THREADING}")
 message(STATUS "MKL_MPI: ${MKL_MPI}")
-message(STATUS "------------------------------------------------")
+message(STATUS "------------------------------------------------")

README.md

@@ -129,6 +129,14 @@ Quake’s Python API provides a set of core operations. The following sections d
 
 ---
 
+
+### Devesh Notes
+Running Big ANN debug script:
+```
+cmake -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DQUAKE_USE_NUMA=OFF -DQUAKE_USE_ASAN=OFF -DQUAKE_USE_AVX512=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DQUAKE_SET_ABI_MODE=ON ..
+make big_ann_debug -j$(nproc) && ./big_ann_debug &> batch_query_debug.out
+```
+
 ## Further Documentation
 
 For detailed instructions and advanced usage, please see the documentation: http://marius-project.org/quake/