Merge branch 'branch-0.5.0' into 'branch-0.5.0'

rename some compile virables

See merge request megasearch/milvus!740

Former-commit-id: 6be44cfb94ebf6e295d20b9997b9fe3b2d32fa5f

.clang-tidy-ignore

@@ -15,5 +15,3 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-# ipc-adapter-test.cc
-# memory-pool-test.cc

core/.gitignore

@@ -7,5 +7,4 @@ base.info
 output.info
 output_new.info
 server.info
-thirdparty/knowhere/
 *.pyc

core/src/CMakeLists.txt

@@ -24,11 +24,11 @@ include_directories(${CUDA_TOOLKIT_ROOT_DIR}/include)
 include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-status)
 include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-milvus)
 
-#this statement must put here, since the CORE_INCLUDE_DIRS is defined in code/CMakeList.txt
+#this statement must put here, since the INDEX_INCLUDE_DIRS is defined in code/CMakeList.txt
 add_subdirectory(index)
 
-set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)
-foreach (dir ${CORE_INCLUDE_DIRS})
+set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE)
+foreach (dir ${INDEX_INCLUDE_DIRS})
     include_directories(${dir})
 endforeach ()
 

core/src/index/CMakeLists.txt

@@ -75,11 +75,11 @@ else()
 endif()
 message(STATUS "Build type = ${BUILD_TYPE}")
 
-set(CORE_SOURCE_DIR ${PROJECT_SOURCE_DIR})
-set(CORE_BINARY_DIR ${PROJECT_BINARY_DIR})
+set(INDEX_SOURCE_DIR ${PROJECT_SOURCE_DIR})
+set(INDEX_BINARY_DIR ${PROJECT_BINARY_DIR})
 message(STATUS "Core source dir: ${PROJECT_SOURCE_DIR}")
 message(STATUS "Core binary dir: ${PROJECT_BINARY_DIR}")
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CORE_SOURCE_DIR}/cmake")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${INDEX_SOURCE_DIR}/cmake")
 
 include(ExternalProject)
 include(DefineOptionsCore)
@@ -92,7 +92,7 @@ if (BUILD_COVERAGE STREQUAL "ON")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
 endif()
 
-set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)
+set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE)
 
 if(BUILD_UNIT_TEST STREQUAL "ON")
     add_subdirectory(unittest)

core/src/index/cmake/BuildUtilsCore.cmake

@@ -75,7 +75,7 @@ function(ExternalProject_Use_Cache project_name package_file install_path)
             "Extracting ${package_file} to ${install_path}"
             COMMAND
             ${CMAKE_COMMAND} -E tar xzvf ${package_file} ${install_path}
-            WORKING_DIRECTORY ${CORE_BINARY_DIR}
+            WORKING_DIRECTORY ${INDEX_BINARY_DIR}
             )
 
     ExternalProject_Add_StepTargets(${project_name} extract)

core/src/index/cmake/DefineOptionsCore.cmake

@@ -104,7 +104,7 @@ macro(config_summary)
     message(STATUS "  Source directory: ${CMAKE_CURRENT_SOURCE_DIR}")
     if(${CMAKE_EXPORT_COMPILE_COMMANDS})
         message(
-                STATUS "  Compile commands: ${CORE_BINARY_DIR}/compile_commands.json")
+                STATUS "  Compile commands: ${INDEX_BINARY_DIR}/compile_commands.json")
     endif()
 
     foreach(category ${KNOWHERE_OPTION_CATEGORIES})

core/src/index/cmake/ThirdPartyPackagesCore.cmake

@@ -115,7 +115,7 @@ endif (UNIX)
 
 # ----------------------------------------------------------------------
 # thirdparty directory
-set(THIRDPARTY_DIR "${CORE_SOURCE_DIR}/thirdparty")
+set(THIRDPARTY_DIR "${INDEX_SOURCE_DIR}/thirdparty")
 
 # ----------------------------------------------------------------------
 # JFrog
@@ -284,7 +284,7 @@ set(OPENBLAS_MD5 "8a110a25b819a4b94e8a9580702b6495")
 
 # ----------------------------------------------------------------------
 # ARROW
-set(ARROW_PREFIX "${CORE_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep/cpp")
+set(ARROW_PREFIX "${INDEX_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep/cpp")
 
 macro(build_arrow)
     message(STATUS "Building Apache ARROW-${ARROW_VERSION} from source")
@@ -338,13 +338,13 @@ macro(build_arrow)
                         "${ARROW_STATIC_LIB}"
                         )
 
-                ExternalProject_Create_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} "${CORE_BINARY_DIR}/arrow_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${ARROW_CACHE_URL})
+                ExternalProject_Create_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} "${INDEX_BINARY_DIR}/arrow_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${ARROW_CACHE_URL})
             else()
                 file(DOWNLOAD ${ARROW_CACHE_URL} ${ARROW_CACHE_PACKAGE_PATH} STATUS status)
                 list(GET status 0 status_code)
                 message(STATUS "DOWNLOADING FROM ${ARROW_CACHE_URL} TO ${ARROW_CACHE_PACKAGE_PATH}. STATUS = ${status_code}")
                 if (status_code EQUAL 0)
-                    ExternalProject_Use_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} ${CORE_BINARY_DIR})
+                    ExternalProject_Use_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} ${INDEX_BINARY_DIR})
                 endif()
             endif()
         else()
@@ -380,7 +380,7 @@ macro(build_arrow)
             INTERFACE_INCLUDE_DIRECTORIES "${ARROW_INCLUDE_DIR}")
         add_dependencies(arrow arrow_ep)
 
-    set(JEMALLOC_PREFIX "${CORE_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep-build/jemalloc_ep-prefix/src/jemalloc_ep")
+    set(JEMALLOC_PREFIX "${INDEX_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep-build/jemalloc_ep-prefix/src/jemalloc_ep")
 
     add_custom_command(TARGET arrow_ep POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E make_directory ${ARROW_PREFIX}/lib/
@@ -402,7 +402,7 @@ endif()
 
 macro(build_openblas)
     message(STATUS "Building OpenBLAS-${OPENBLAS_VERSION} from source")
-    set(OPENBLAS_PREFIX "${CORE_BINARY_DIR}/openblas_ep-prefix/src/openblas_ep")
+    set(OPENBLAS_PREFIX "${INDEX_BINARY_DIR}/openblas_ep-prefix/src/openblas_ep")
     set(OPENBLAS_INCLUDE_DIR "${OPENBLAS_PREFIX}/include")
     set(OPENBLAS_STATIC_LIB
             "${OPENBLAS_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}openblas${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -435,13 +435,13 @@ macro(build_openblas)
                     BUILD_BYPRODUCTS
                     ${OPENBLAS_STATIC_LIB})
 
-            ExternalProject_Create_Cache(openblas_ep ${OPENBLAS_CACHE_PACKAGE_PATH} "${CORE_BINARY_DIR}/openblas_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${OPENBLAS_CACHE_URL})
+            ExternalProject_Create_Cache(openblas_ep ${OPENBLAS_CACHE_PACKAGE_PATH} "${INDEX_BINARY_DIR}/openblas_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${OPENBLAS_CACHE_URL})
         else()
             file(DOWNLOAD ${OPENBLAS_CACHE_URL} ${OPENBLAS_CACHE_PACKAGE_PATH} STATUS status)
             list(GET status 0 status_code)
             message(STATUS "DOWNLOADING FROM ${OPENBLAS_CACHE_URL} TO ${OPENBLAS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}")
             if (status_code EQUAL 0)
-                ExternalProject_Use_Cache(openblas_ep ${OPENBLAS_CACHE_PACKAGE_PATH} ${CORE_BINARY_DIR})
+                ExternalProject_Use_Cache(openblas_ep ${OPENBLAS_CACHE_PACKAGE_PATH} ${INDEX_BINARY_DIR})
             endif()
         endif()
     else()
@@ -479,7 +479,7 @@ endmacro()
 
 macro(build_lapack)
     message(STATUS "Building LAPACK-${LAPACK_VERSION} from source")
-    set(LAPACK_PREFIX "${CORE_BINARY_DIR}/lapack_ep-prefix/src/lapack_ep")
+    set(LAPACK_PREFIX "${INDEX_BINARY_DIR}/lapack_ep-prefix/src/lapack_ep")
     set(LAPACK_INCLUDE_DIR "${LAPACK_PREFIX}/include")
     set(LAPACK_STATIC_LIB
             "${LAPACK_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}lapack${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -511,13 +511,13 @@ macro(build_lapack)
                     BUILD_BYPRODUCTS
                     ${LAPACK_STATIC_LIB})
 
-            ExternalProject_Create_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} "${CORE_BINARY_DIR}/lapack_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${LAPACK_CACHE_URL})
+            ExternalProject_Create_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} "${INDEX_BINARY_DIR}/lapack_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${LAPACK_CACHE_URL})
         else()
             file(DOWNLOAD ${LAPACK_CACHE_URL} ${LAPACK_CACHE_PACKAGE_PATH} STATUS status)
             list(GET status 0 status_code)
             message(STATUS "DOWNLOADING FROM ${LAPACK_CACHE_URL} TO ${LAPACK_CACHE_PACKAGE_PATH}. STATUS = ${status_code}")
             if (status_code EQUAL 0)
-                ExternalProject_Use_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} ${CORE_BINARY_DIR})
+                ExternalProject_Use_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} ${INDEX_BINARY_DIR})
             endif()
         endif()
     else()
@@ -560,7 +560,7 @@ macro(build_gtest)
                 -Wno-ignored-attributes)
     endif()
 
-    set(GTEST_PREFIX "${CORE_BINARY_DIR}/googletest_ep-prefix/src/googletest_ep")
+    set(GTEST_PREFIX "${INDEX_BINARY_DIR}/googletest_ep-prefix/src/googletest_ep")
     set(GTEST_INCLUDE_DIR "${GTEST_PREFIX}/include")
     set(GTEST_STATIC_LIB
             "${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -602,13 +602,13 @@ macro(build_gtest)
                     ${GTEST_CMAKE_ARGS}
                     ${EP_LOG_OPTIONS})
 
-            ExternalProject_Create_Cache(googletest_ep ${GTEST_CACHE_PACKAGE_PATH} "${CORE_BINARY_DIR}/googletest_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${GTEST_CACHE_URL})
+            ExternalProject_Create_Cache(googletest_ep ${GTEST_CACHE_PACKAGE_PATH} "${INDEX_BINARY_DIR}/googletest_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${GTEST_CACHE_URL})
         else()
             file(DOWNLOAD ${GTEST_CACHE_URL} ${GTEST_CACHE_PACKAGE_PATH} STATUS status)
             list(GET status 0 status_code)
             message(STATUS "DOWNLOADING FROM ${GTEST_CACHE_URL} TO ${GTEST_CACHE_PACKAGE_PATH}. STATUS = ${status_code}")
             if (status_code EQUAL 0)
-                ExternalProject_Use_Cache(googletest_ep ${GTEST_CACHE_PACKAGE_PATH} ${CORE_BINARY_DIR})
+                ExternalProject_Use_Cache(googletest_ep ${GTEST_CACHE_PACKAGE_PATH} ${INDEX_BINARY_DIR})
             endif()
         endif()
     else()
@@ -668,7 +668,7 @@ endif()
 
 macro(build_faiss)
     message(STATUS "Building FAISS-${FAISS_VERSION} from source")
-    set(FAISS_PREFIX "${CORE_BINARY_DIR}/faiss_ep-prefix/src/faiss_ep")
+    set(FAISS_PREFIX "${INDEX_BINARY_DIR}/faiss_ep-prefix/src/faiss_ep")
     set(FAISS_INCLUDE_DIR "${FAISS_PREFIX}/include")
     set(FAISS_STATIC_LIB
             "${FAISS_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}faiss${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -718,13 +718,13 @@ macro(build_faiss)
 
             ExternalProject_Add_StepDependencies(faiss_ep build openblas_ep lapack_ep)
 
-            ExternalProject_Create_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} "${CORE_BINARY_DIR}/faiss_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${FAISS_CACHE_URL})
+            ExternalProject_Create_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} "${INDEX_BINARY_DIR}/faiss_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${FAISS_CACHE_URL})
         else()
             file(DOWNLOAD ${FAISS_CACHE_URL} ${FAISS_CACHE_PACKAGE_PATH} STATUS status)
             list(GET status 0 status_code)
             message(STATUS "DOWNLOADING FROM ${FAISS_CACHE_URL} TO ${FAISS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}")
             if (status_code EQUAL 0)
-                ExternalProject_Use_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} ${CORE_BINARY_DIR})
+                ExternalProject_Use_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} ${INDEX_BINARY_DIR})
             endif()
         endif()
     else()

core/src/index/knowhere/CMakeLists.txt

 include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
 link_directories(${CUDA_TOOLKIT_ROOT_DIR}/lib64)
 
-include_directories(${CORE_SOURCE_DIR}/knowhere)
-include_directories(${CORE_SOURCE_DIR}/thirdparty)
-include_directories(${CORE_SOURCE_DIR}/thirdparty/SPTAG/AnnService)
+include_directories(${INDEX_SOURCE_DIR}/knowhere)
+include_directories(${INDEX_SOURCE_DIR}/thirdparty)
+include_directories(${INDEX_SOURCE_DIR}/thirdparty/SPTAG/AnnService)
 
-set(SPTAG_SOURCE_DIR ${CORE_SOURCE_DIR}/thirdparty/SPTAG)
+set(SPTAG_SOURCE_DIR ${INDEX_SOURCE_DIR}/thirdparty/SPTAG)
 file(GLOB HDR_FILES
         ${SPTAG_SOURCE_DIR}/AnnService/inc/Core/*.h
         ${SPTAG_SOURCE_DIR}/AnnService/inc/Core/Common/*.h
@@ -102,20 +102,20 @@ INSTALL(FILES ${OPENBLAS_REAL_STATIC_LIB}
         DESTINATION lib
         )
 
-set(CORE_INCLUDE_DIRS
-        ${CORE_SOURCE_DIR}/knowhere
-        ${CORE_SOURCE_DIR}/thirdparty
-        ${CORE_SOURCE_DIR}/thirdparty/SPTAG/AnnService
+set(INDEX_INCLUDE_DIRS
+        ${INDEX_SOURCE_DIR}/knowhere
+        ${INDEX_SOURCE_DIR}/thirdparty
+        ${INDEX_SOURCE_DIR}/thirdparty/SPTAG/AnnService
         ${ARROW_INCLUDE_DIR}
         ${FAISS_INCLUDE_DIR}
         ${OPENBLAS_INCLUDE_DIR}
         ${LAPACK_INCLUDE_DIR}
         )
 
-set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)
+set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE)
 
 #INSTALL(DIRECTORY
-#        ${CORE_SOURCE_DIR}/include/knowhere
+#        ${INDEX_SOURCE_DIR}/include/knowhere
 #        ${ARROW_INCLUDE_DIR}/arrow
 #        ${FAISS_PREFIX}/include/faiss
 #        ${OPENBLAS_INCLUDE_DIR}/

core/src/index/unittest/CMakeLists.txt

-include_directories(${CORE_SOURCE_DIR}/thirdparty)
-include_directories(${CORE_SOURCE_DIR}/thirdparty/SPTAG/AnnService)
-include_directories(${CORE_SOURCE_DIR}/knowhere)
-include_directories(${CORE_SOURCE_DIR})
+include_directories(${INDEX_SOURCE_DIR}/thirdparty)
+include_directories(${INDEX_SOURCE_DIR}/thirdparty/SPTAG/AnnService)
+include_directories(${INDEX_SOURCE_DIR}/knowhere)
+include_directories(${INDEX_SOURCE_DIR})
 include_directories(/usr/local/cuda/include)
 link_directories(/usr/local/cuda/lib64)
 
@@ -21,28 +21,28 @@ set(basic_libs
 
 set(util_srcs
         ${MILVUS_ENGINE_SRC}/utils/easylogging++.cc
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/FaissGpuResourceMgr.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/FaissIO.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/IndexParameter.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/adapter/Structure.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/adapter/ArrowAdapter.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/common/Exception.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/common/Timer.cpp
-        ${CORE_SOURCE_DIR}/unittest/utils.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/FaissGpuResourceMgr.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/FaissIO.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/IndexParameter.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/adapter/Structure.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/adapter/ArrowAdapter.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/common/Exception.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/common/Timer.cpp
+        ${INDEX_SOURCE_DIR}/unittest/utils.cpp
         )
 
 #<IVF-TEST>
 set(ivf_srcs
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/Cloner.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVF.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexGPUIVF.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVFSQ.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexGPUIVFSQ.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVFPQ.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexGPUIVFPQ.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIDMAP.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/FaissBaseIndex.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/Cloner.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVF.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexGPUIVF.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVFSQ.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexGPUIVFSQ.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVFPQ.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexGPUIVFPQ.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIDMAP.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/FaissBaseIndex.cpp
         )
 if(NOT TARGET test_ivf)
     add_executable(test_ivf test_ivf.cpp ${ivf_srcs} ${util_srcs})
@@ -52,7 +52,7 @@ target_link_libraries(test_ivf ${depend_libs} ${unittest_libs} ${basic_libs})
 
 #<IDMAP-TEST>
 set(idmap_srcs
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIDMAP.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIDMAP.cpp
         )
 if(NOT TARGET test_idmap)
     add_executable(test_idmap test_idmap.cpp ${idmap_srcs} ${ivf_srcs} ${util_srcs})
@@ -61,10 +61,10 @@ target_link_libraries(test_idmap ${depend_libs} ${unittest_libs} ${basic_libs})
 
 #<KDT-TEST>
 set(kdt_srcs
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/adapter/SptagAdapter.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/preprocessor/Normalize.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/KDTParameterMgr.cpp
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexKDT.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/adapter/SptagAdapter.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/preprocessor/Normalize.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/KDTParameterMgr.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexKDT.cpp
         )
 if(NOT TARGET test_kdt)
     add_executable(test_kdt test_kdt.cpp ${kdt_srcs} ${util_srcs})

core/src/index/unittest/faiss_ori/CMakeLists.txt

-include_directories(${CORE_SOURCE_DIR}/thirdparty)
-include_directories(${CORE_SOURCE_DIR}/include)
+include_directories(${INDEX_SOURCE_DIR}/thirdparty)
+include_directories(${INDEX_SOURCE_DIR}/include)
 include_directories(/usr/local/cuda/include)
 link_directories(/usr/local/cuda/lib64)
 

core/src/index/unittest/test_nsg/CMakeLists.txt

@@ -13,11 +13,11 @@ else ()
 endif ()
 message(${OpenMP_CXX_FLAGS})
 
-include_directories(${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/nsg)
-aux_source_directory(${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/nsg nsg_src)
+include_directories(${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/nsg)
+aux_source_directory(${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/nsg nsg_src)
 
 set(interface_src
-        ${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexNSG.cpp
+        ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexNSG.cpp
         )
 
 if(NOT TARGET test_nsg)

core/unittest/CMakeLists.txt

@@ -18,7 +18,7 @@
 #-------------------------------------------------------------------------------
 include_directories("${CUDA_TOOLKIT_ROOT_DIR}/include")
 
-foreach(dir ${CORE_INCLUDE_DIRS})
+foreach(dir ${INDEX_INCLUDE_DIRS})
     include_directories(${dir})
 endforeach()