Skip to content

Commit 098bf35

Browse files
cxiecxie
committed
rename some compile virables
Former-commit-id: 885d2246e9547e78acbf9eb4f6d74d3e7720cacb
1 parent 78a601c commit 098bf35

12 files changed

Lines changed: 69 additions & 72 deletions

File tree

‎.clang-tidy-ignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717
#
18-
# ipc-adapter-test.cc
19-
# memory-pool-test.cc

‎core/.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ base.info
77
output.info
88
output_new.info
99
server.info
10-
thirdparty/knowhere/
1110
*.pyc

‎core/src/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ include_directories(${CUDA_TOOLKIT_ROOT_DIR}/include)
2424
include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-status)
2525
include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-milvus)
2626

27-
#this statement must put here, since the CORE_INCLUDE_DIRS is defined in code/CMakeList.txt
27+
#this statement must put here, since the INDEX_INCLUDE_DIRS is defined in code/CMakeList.txt
2828
add_subdirectory(index)
2929

30-
set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)
31-
foreach (dir ${CORE_INCLUDE_DIRS})
30+
set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE)
31+
foreach (dir ${INDEX_INCLUDE_DIRS})
3232
include_directories(${dir})
3333
endforeach ()
3434

‎core/src/index/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ else()
7575
endif()
7676
message(STATUS "Build type = ${BUILD_TYPE}")
7777

78-
set(CORE_SOURCE_DIR ${PROJECT_SOURCE_DIR})
79-
set(CORE_BINARY_DIR ${PROJECT_BINARY_DIR})
78+
set(INDEX_SOURCE_DIR ${PROJECT_SOURCE_DIR})
79+
set(INDEX_BINARY_DIR ${PROJECT_BINARY_DIR})
8080
message(STATUS "Core source dir: ${PROJECT_SOURCE_DIR}")
8181
message(STATUS "Core binary dir: ${PROJECT_BINARY_DIR}")
82-
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CORE_SOURCE_DIR}/cmake")
82+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${INDEX_SOURCE_DIR}/cmake")
8383

8484
include(ExternalProject)
8585
include(DefineOptionsCore)
@@ -92,7 +92,7 @@ if (BUILD_COVERAGE STREQUAL "ON")
9292
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
9393
endif()
9494

95-
set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)
95+
set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE)
9696

9797
if(BUILD_UNIT_TEST STREQUAL "ON")
9898
add_subdirectory(unittest)

‎core/src/index/cmake/BuildUtilsCore.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function(ExternalProject_Use_Cache project_name package_file install_path)
7575
"Extracting ${package_file} to ${install_path}"
7676
COMMAND
7777
${CMAKE_COMMAND} -E tar xzvf ${package_file} ${install_path}
78-
WORKING_DIRECTORY ${CORE_BINARY_DIR}
78+
WORKING_DIRECTORY ${INDEX_BINARY_DIR}
7979
)
8080

8181
ExternalProject_Add_StepTargets(${project_name} extract)

‎core/src/index/cmake/DefineOptionsCore.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ macro(config_summary)
104104
message(STATUS " Source directory: ${CMAKE_CURRENT_SOURCE_DIR}")
105105
if(${CMAKE_EXPORT_COMPILE_COMMANDS})
106106
message(
107-
STATUS " Compile commands: ${CORE_BINARY_DIR}/compile_commands.json")
107+
STATUS " Compile commands: ${INDEX_BINARY_DIR}/compile_commands.json")
108108
endif()
109109

110110
foreach(category ${KNOWHERE_OPTION_CATEGORIES})

‎core/src/index/cmake/ThirdPartyPackagesCore.cmake‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ endif (UNIX)
115115

116116
# ----------------------------------------------------------------------
117117
# thirdparty directory
118-
set(THIRDPARTY_DIR "${CORE_SOURCE_DIR}/thirdparty")
118+
set(THIRDPARTY_DIR "${INDEX_SOURCE_DIR}/thirdparty")
119119

120120
# ----------------------------------------------------------------------
121121
# JFrog
@@ -283,7 +283,7 @@ set(OPENBLAS_MD5 "8a110a25b819a4b94e8a9580702b6495")
283283

284284
# ----------------------------------------------------------------------
285285
# ARROW
286-
set(ARROW_PREFIX "${CORE_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep/cpp")
286+
set(ARROW_PREFIX "${INDEX_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep/cpp")
287287

288288
macro(build_arrow)
289289
message(STATUS "Building Apache ARROW-${ARROW_VERSION} from source")
@@ -337,13 +337,13 @@ macro(build_arrow)
337337
"${ARROW_STATIC_LIB}"
338338
)
339339

340-
ExternalProject_Create_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} "${CORE_BINARY_DIR}/arrow_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${ARROW_CACHE_URL})
340+
ExternalProject_Create_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} "${INDEX_BINARY_DIR}/arrow_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${ARROW_CACHE_URL})
341341
else()
342342
file(DOWNLOAD ${ARROW_CACHE_URL} ${ARROW_CACHE_PACKAGE_PATH} STATUS status)
343343
list(GET status 0 status_code)
344344
message(STATUS "DOWNLOADING FROM ${ARROW_CACHE_URL} TO ${ARROW_CACHE_PACKAGE_PATH}. STATUS = ${status_code}")
345345
if (status_code EQUAL 0)
346-
ExternalProject_Use_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} ${CORE_BINARY_DIR})
346+
ExternalProject_Use_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} ${INDEX_BINARY_DIR})
347347
endif()
348348
endif()
349349
else()
@@ -379,7 +379,7 @@ macro(build_arrow)
379379
INTERFACE_INCLUDE_DIRECTORIES "${ARROW_INCLUDE_DIR}")
380380
add_dependencies(arrow arrow_ep)
381381

382-
set(JEMALLOC_PREFIX "${CORE_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep-build/jemalloc_ep-prefix/src/jemalloc_ep")
382+
set(JEMALLOC_PREFIX "${INDEX_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep-build/jemalloc_ep-prefix/src/jemalloc_ep")
383383

384384
add_custom_command(TARGET arrow_ep POST_BUILD
385385
COMMAND ${CMAKE_COMMAND} -E make_directory ${ARROW_PREFIX}/lib/
@@ -401,7 +401,7 @@ endif()
401401

402402
macro(build_openblas)
403403
message(STATUS "Building OpenBLAS-${OPENBLAS_VERSION} from source")
404-
set(OPENBLAS_PREFIX "${CORE_BINARY_DIR}/openblas_ep-prefix/src/openblas_ep")
404+
set(OPENBLAS_PREFIX "${INDEX_BINARY_DIR}/openblas_ep-prefix/src/openblas_ep")
405405
set(OPENBLAS_INCLUDE_DIR "${OPENBLAS_PREFIX}/include")
406406
set(OPENBLAS_STATIC_LIB
407407
"${OPENBLAS_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}openblas${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -434,13 +434,13 @@ macro(build_openblas)
434434
BUILD_BYPRODUCTS
435435
${OPENBLAS_STATIC_LIB})
436436

437-
ExternalProject_Create_Cache(openblas_ep ${OPENBLAS_CACHE_PACKAGE_PATH} "${CORE_BINARY_DIR}/openblas_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${OPENBLAS_CACHE_URL})
437+
ExternalProject_Create_Cache(openblas_ep ${OPENBLAS_CACHE_PACKAGE_PATH} "${INDEX_BINARY_DIR}/openblas_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${OPENBLAS_CACHE_URL})
438438
else()
439439
file(DOWNLOAD ${OPENBLAS_CACHE_URL} ${OPENBLAS_CACHE_PACKAGE_PATH} STATUS status)
440440
list(GET status 0 status_code)
441441
message(STATUS "DOWNLOADING FROM ${OPENBLAS_CACHE_URL} TO ${OPENBLAS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}")
442442
if (status_code EQUAL 0)
443-
ExternalProject_Use_Cache(openblas_ep ${OPENBLAS_CACHE_PACKAGE_PATH} ${CORE_BINARY_DIR})
443+
ExternalProject_Use_Cache(openblas_ep ${OPENBLAS_CACHE_PACKAGE_PATH} ${INDEX_BINARY_DIR})
444444
endif()
445445
endif()
446446
else()
@@ -478,7 +478,7 @@ endmacro()
478478

479479
macro(build_lapack)
480480
message(STATUS "Building LAPACK-${LAPACK_VERSION} from source")
481-
set(LAPACK_PREFIX "${CORE_BINARY_DIR}/lapack_ep-prefix/src/lapack_ep")
481+
set(LAPACK_PREFIX "${INDEX_BINARY_DIR}/lapack_ep-prefix/src/lapack_ep")
482482
set(LAPACK_INCLUDE_DIR "${LAPACK_PREFIX}/include")
483483
set(LAPACK_STATIC_LIB
484484
"${LAPACK_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}lapack${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -510,13 +510,13 @@ macro(build_lapack)
510510
BUILD_BYPRODUCTS
511511
${LAPACK_STATIC_LIB})
512512

513-
ExternalProject_Create_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} "${CORE_BINARY_DIR}/lapack_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${LAPACK_CACHE_URL})
513+
ExternalProject_Create_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} "${INDEX_BINARY_DIR}/lapack_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${LAPACK_CACHE_URL})
514514
else()
515515
file(DOWNLOAD ${LAPACK_CACHE_URL} ${LAPACK_CACHE_PACKAGE_PATH} STATUS status)
516516
list(GET status 0 status_code)
517517
message(STATUS "DOWNLOADING FROM ${LAPACK_CACHE_URL} TO ${LAPACK_CACHE_PACKAGE_PATH}. STATUS = ${status_code}")
518518
if (status_code EQUAL 0)
519-
ExternalProject_Use_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} ${CORE_BINARY_DIR})
519+
ExternalProject_Use_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} ${INDEX_BINARY_DIR})
520520
endif()
521521
endif()
522522
else()
@@ -559,7 +559,7 @@ macro(build_gtest)
559559
-Wno-ignored-attributes)
560560
endif()
561561

562-
set(GTEST_PREFIX "${CORE_BINARY_DIR}/googletest_ep-prefix/src/googletest_ep")
562+
set(GTEST_PREFIX "${INDEX_BINARY_DIR}/googletest_ep-prefix/src/googletest_ep")
563563
set(GTEST_INCLUDE_DIR "${GTEST_PREFIX}/include")
564564
set(GTEST_STATIC_LIB
565565
"${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -601,13 +601,13 @@ macro(build_gtest)
601601
${GTEST_CMAKE_ARGS}
602602
${EP_LOG_OPTIONS})
603603

604-
ExternalProject_Create_Cache(googletest_ep ${GTEST_CACHE_PACKAGE_PATH} "${CORE_BINARY_DIR}/googletest_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${GTEST_CACHE_URL})
604+
ExternalProject_Create_Cache(googletest_ep ${GTEST_CACHE_PACKAGE_PATH} "${INDEX_BINARY_DIR}/googletest_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${GTEST_CACHE_URL})
605605
else()
606606
file(DOWNLOAD ${GTEST_CACHE_URL} ${GTEST_CACHE_PACKAGE_PATH} STATUS status)
607607
list(GET status 0 status_code)
608608
message(STATUS "DOWNLOADING FROM ${GTEST_CACHE_URL} TO ${GTEST_CACHE_PACKAGE_PATH}. STATUS = ${status_code}")
609609
if (status_code EQUAL 0)
610-
ExternalProject_Use_Cache(googletest_ep ${GTEST_CACHE_PACKAGE_PATH} ${CORE_BINARY_DIR})
610+
ExternalProject_Use_Cache(googletest_ep ${GTEST_CACHE_PACKAGE_PATH} ${INDEX_BINARY_DIR})
611611
endif()
612612
endif()
613613
else()
@@ -667,7 +667,7 @@ endif()
667667

668668
macro(build_faiss)
669669
message(STATUS "Building FAISS-${FAISS_VERSION} from source")
670-
set(FAISS_PREFIX "${CORE_BINARY_DIR}/faiss_ep-prefix/src/faiss_ep")
670+
set(FAISS_PREFIX "${INDEX_BINARY_DIR}/faiss_ep-prefix/src/faiss_ep")
671671
set(FAISS_INCLUDE_DIR "${FAISS_PREFIX}/include")
672672
set(FAISS_STATIC_LIB
673673
"${FAISS_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}faiss${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -717,13 +717,13 @@ macro(build_faiss)
717717

718718
ExternalProject_Add_StepDependencies(faiss_ep build openblas_ep lapack_ep)
719719

720-
ExternalProject_Create_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} "${CORE_BINARY_DIR}/faiss_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${FAISS_CACHE_URL})
720+
ExternalProject_Create_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} "${INDEX_BINARY_DIR}/faiss_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${FAISS_CACHE_URL})
721721
else()
722722
file(DOWNLOAD ${FAISS_CACHE_URL} ${FAISS_CACHE_PACKAGE_PATH} STATUS status)
723723
list(GET status 0 status_code)
724724
message(STATUS "DOWNLOADING FROM ${FAISS_CACHE_URL} TO ${FAISS_CACHE_PACKAGE_PATH}. STATUS = ${status_code}")
725725
if (status_code EQUAL 0)
726-
ExternalProject_Use_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} ${CORE_BINARY_DIR})
726+
ExternalProject_Use_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} ${INDEX_BINARY_DIR})
727727
endif()
728728
endif()
729729
else()

‎core/src/index/knowhere/CMakeLists.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
22
link_directories(${CUDA_TOOLKIT_ROOT_DIR}/lib64)
33

4-
include_directories(${CORE_SOURCE_DIR}/knowhere)
5-
include_directories(${CORE_SOURCE_DIR}/thirdparty)
6-
include_directories(${CORE_SOURCE_DIR}/thirdparty/SPTAG/AnnService)
4+
include_directories(${INDEX_SOURCE_DIR}/knowhere)
5+
include_directories(${INDEX_SOURCE_DIR}/thirdparty)
6+
include_directories(${INDEX_SOURCE_DIR}/thirdparty/SPTAG/AnnService)
77

8-
set(SPTAG_SOURCE_DIR ${CORE_SOURCE_DIR}/thirdparty/SPTAG)
8+
set(SPTAG_SOURCE_DIR ${INDEX_SOURCE_DIR}/thirdparty/SPTAG)
99
file(GLOB HDR_FILES
1010
${SPTAG_SOURCE_DIR}/AnnService/inc/Core/*.h
1111
${SPTAG_SOURCE_DIR}/AnnService/inc/Core/Common/*.h
@@ -102,20 +102,20 @@ INSTALL(FILES ${OPENBLAS_REAL_STATIC_LIB}
102102
DESTINATION lib
103103
)
104104

105-
set(CORE_INCLUDE_DIRS
106-
${CORE_SOURCE_DIR}/knowhere
107-
${CORE_SOURCE_DIR}/thirdparty
108-
${CORE_SOURCE_DIR}/thirdparty/SPTAG/AnnService
105+
set(INDEX_INCLUDE_DIRS
106+
${INDEX_SOURCE_DIR}/knowhere
107+
${INDEX_SOURCE_DIR}/thirdparty
108+
${INDEX_SOURCE_DIR}/thirdparty/SPTAG/AnnService
109109
${ARROW_INCLUDE_DIR}
110110
${FAISS_INCLUDE_DIR}
111111
${OPENBLAS_INCLUDE_DIR}
112112
${LAPACK_INCLUDE_DIR}
113113
)
114114

115-
set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)
115+
set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE)
116116

117117
#INSTALL(DIRECTORY
118-
# ${CORE_SOURCE_DIR}/include/knowhere
118+
# ${INDEX_SOURCE_DIR}/include/knowhere
119119
# ${ARROW_INCLUDE_DIR}/arrow
120120
# ${FAISS_PREFIX}/include/faiss
121121
# ${OPENBLAS_INCLUDE_DIR}/

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
include_directories(${CORE_SOURCE_DIR}/thirdparty)
2-
include_directories(${CORE_SOURCE_DIR}/thirdparty/SPTAG/AnnService)
3-
include_directories(${CORE_SOURCE_DIR}/knowhere)
4-
include_directories(${CORE_SOURCE_DIR})
1+
include_directories(${INDEX_SOURCE_DIR}/thirdparty)
2+
include_directories(${INDEX_SOURCE_DIR}/thirdparty/SPTAG/AnnService)
3+
include_directories(${INDEX_SOURCE_DIR}/knowhere)
4+
include_directories(${INDEX_SOURCE_DIR})
55
include_directories(/usr/local/cuda/include)
66
link_directories(/usr/local/cuda/lib64)
77

@@ -21,28 +21,28 @@ set(basic_libs
2121

2222
set(util_srcs
2323
${MILVUS_ENGINE_SRC}/utils/easylogging++.cc
24-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/FaissGpuResourceMgr.cpp
25-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/FaissIO.cpp
26-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/IndexParameter.cpp
27-
${CORE_SOURCE_DIR}/knowhere/knowhere/adapter/Structure.cpp
28-
${CORE_SOURCE_DIR}/knowhere/knowhere/adapter/ArrowAdapter.cpp
29-
${CORE_SOURCE_DIR}/knowhere/knowhere/common/Exception.cpp
30-
${CORE_SOURCE_DIR}/knowhere/knowhere/common/Timer.cpp
31-
${CORE_SOURCE_DIR}/unittest/utils.cpp
24+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/FaissGpuResourceMgr.cpp
25+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/FaissIO.cpp
26+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/IndexParameter.cpp
27+
${INDEX_SOURCE_DIR}/knowhere/knowhere/adapter/Structure.cpp
28+
${INDEX_SOURCE_DIR}/knowhere/knowhere/adapter/ArrowAdapter.cpp
29+
${INDEX_SOURCE_DIR}/knowhere/knowhere/common/Exception.cpp
30+
${INDEX_SOURCE_DIR}/knowhere/knowhere/common/Timer.cpp
31+
${INDEX_SOURCE_DIR}/unittest/utils.cpp
3232
)
3333

3434
#<IVF-TEST>
3535
set(ivf_srcs
36-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/Cloner.cpp
37-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVF.cpp
38-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexGPUIVF.cpp
39-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVFSQ.cpp
40-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexGPUIVFSQ.cpp
41-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVFPQ.cpp
42-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexGPUIVFPQ.cpp
43-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp
44-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIDMAP.cpp
45-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/FaissBaseIndex.cpp
36+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/Cloner.cpp
37+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVF.cpp
38+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexGPUIVF.cpp
39+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVFSQ.cpp
40+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexGPUIVFSQ.cpp
41+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVFPQ.cpp
42+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexGPUIVFPQ.cpp
43+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp
44+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIDMAP.cpp
45+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/FaissBaseIndex.cpp
4646
)
4747
if(NOT TARGET test_ivf)
4848
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})
5252

5353
#<IDMAP-TEST>
5454
set(idmap_srcs
55-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIDMAP.cpp
55+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexIDMAP.cpp
5656
)
5757
if(NOT TARGET test_idmap)
5858
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})
6161

6262
#<KDT-TEST>
6363
set(kdt_srcs
64-
${CORE_SOURCE_DIR}/knowhere/knowhere/adapter/SptagAdapter.cpp
65-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/preprocessor/Normalize.cpp
66-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/KDTParameterMgr.cpp
67-
${CORE_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexKDT.cpp
64+
${INDEX_SOURCE_DIR}/knowhere/knowhere/adapter/SptagAdapter.cpp
65+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/preprocessor/Normalize.cpp
66+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/KDTParameterMgr.cpp
67+
${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/IndexKDT.cpp
6868
)
6969
if(NOT TARGET test_kdt)
7070
add_executable(test_kdt test_kdt.cpp ${kdt_srcs} ${util_srcs})

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
include_directories(${CORE_SOURCE_DIR}/thirdparty)
2-
include_directories(${CORE_SOURCE_DIR}/include)
1+
include_directories(${INDEX_SOURCE_DIR}/thirdparty)
2+
include_directories(${INDEX_SOURCE_DIR}/include)
33
include_directories(/usr/local/cuda/include)
44
link_directories(/usr/local/cuda/lib64)
55

0 commit comments

Comments
 (0)