Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
ea830ebc
milvus
项目概览
BaiXuePrincess
/
milvus
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
4
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ea830ebc
编写于
9月 06, 2019
作者:
Z
zhiru
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake: integrated knowhere
Former-commit-id: 81afb501886848d478c7046f04b933e2a3f34ac0
上级
8d2b16a6
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
11 addition
and
423 deletion
+11
-423
cpp/CHANGELOG.md
cpp/CHANGELOG.md
+1
-0
cpp/CMakeLists.txt
cpp/CMakeLists.txt
+0
-8
cpp/src/CMakeLists.txt
cpp/src/CMakeLists.txt
+0
-24
cpp/src/core/CMakeLists.txt
cpp/src/core/CMakeLists.txt
+0
-2
cpp/src/core/cmake/ThirdPartyPackagesCore.cmake
cpp/src/core/cmake/ThirdPartyPackagesCore.cmake
+6
-259
cpp/src/core/src/CMakeLists.txt
cpp/src/core/src/CMakeLists.txt
+0
-24
cpp/src/core/test/CMakeLists.txt
cpp/src/core/test/CMakeLists.txt
+0
-8
cpp/src/core/test/faiss_ori/CMakeLists.txt
cpp/src/core/test/faiss_ori/CMakeLists.txt
+0
-2
cpp/src/core/test/test_nsg/CMakeLists.txt
cpp/src/core/test/test_nsg/CMakeLists.txt
+1
-12
cpp/unittest/CMakeLists.txt
cpp/unittest/CMakeLists.txt
+3
-8
cpp/unittest/db/CMakeLists.txt
cpp/unittest/db/CMakeLists.txt
+0
-17
cpp/unittest/knowhere/CMakeLists.txt
cpp/unittest/knowhere/CMakeLists.txt
+0
-7
cpp/unittest/metrics/CMakeLists.txt
cpp/unittest/metrics/CMakeLists.txt
+0
-24
cpp/unittest/scheduler/CMakeLists.txt
cpp/unittest/scheduler/CMakeLists.txt
+0
-17
cpp/unittest/server/CMakeLists.txt
cpp/unittest/server/CMakeLists.txt
+0
-11
未找到文件。
cpp/CHANGELOG.md
浏览文件 @
ea830ebc
...
@@ -94,6 +94,7 @@ Please mark all change in change log and use the ticket from JIRA.
...
@@ -94,6 +94,7 @@ Please mark all change in change log and use the ticket from JIRA.
-
MS-338 - NewAPI: refine code to support CreateIndex
-
MS-338 - NewAPI: refine code to support CreateIndex
-
MS-339 - NewAPI: refine code to support DropIndex
-
MS-339 - NewAPI: refine code to support DropIndex
-
MS-340 - NewAPI: implement DescribeIndex
-
MS-340 - NewAPI: implement DescribeIndex
-
MS-495 - cmake: integrated knowhere
## Task
## Task
-
MS-297 - disable mysql unit test
-
MS-297 - disable mysql unit test
...
...
cpp/CMakeLists.txt
浏览文件 @
ea830ebc
...
@@ -107,14 +107,6 @@ include(ThirdPartyPackages)
...
@@ -107,14 +107,6 @@ include(ThirdPartyPackages)
include_directories
(
${
MILVUS_SOURCE_DIR
}
)
include_directories
(
${
MILVUS_SOURCE_DIR
}
)
link_directories
(
${
MILVUS_BINARY_DIR
}
)
link_directories
(
${
MILVUS_BINARY_DIR
}
)
#if (NOT DEFINED KNOWHERE_BUILD_DIR)
# message(FATAL_ERROR "You must set environment variable KNOWHERE_BUILD_DIR")
#endif()
#message(STATUS "Build with ${KNOWHERE_BUILD_DIR}")
#include_directories(${KNOWHERE_BUILD_DIR}/include)
#include_directories(${KNOWHERE_BUILD_DIR}/include/SPTAG/AnnService)
#link_directories(${KNOWHERE_BUILD_DIR}/lib)
## Following should be check
## Following should be check
set
(
MILVUS_ENGINE_INCLUDE
${
PROJECT_SOURCE_DIR
}
/include
)
set
(
MILVUS_ENGINE_INCLUDE
${
PROJECT_SOURCE_DIR
}
/include
)
...
...
cpp/src/CMakeLists.txt
浏览文件 @
ea830ebc
...
@@ -8,10 +8,8 @@ add_subdirectory(core)
...
@@ -8,10 +8,8 @@ add_subdirectory(core)
set
(
CORE_INCLUDE_DIRS
${
CORE_INCLUDE_DIRS
}
PARENT_SCOPE
)
set
(
CORE_INCLUDE_DIRS
${
CORE_INCLUDE_DIRS
}
PARENT_SCOPE
)
foreach
(
dir
${
CORE_INCLUDE_DIRS
}
)
foreach
(
dir
${
CORE_INCLUDE_DIRS
}
)
message
(
"dir =
${
dir
}
"
)
include_directories
(
${
dir
}
)
include_directories
(
${
dir
}
)
endforeach
()
endforeach
()
#include_directories(${CMAKE_SOURCE_DIR}/src/core/thirdparty/SPTAG/AnnService)
aux_source_directory
(
cache cache_files
)
aux_source_directory
(
cache cache_files
)
aux_source_directory
(
config config_files
)
aux_source_directory
(
config config_files
)
...
@@ -96,12 +94,6 @@ set(client_grpc_lib
...
@@ -96,12 +94,6 @@ set(client_grpc_lib
set
(
third_party_libs
set
(
third_party_libs
knowhere
knowhere
# SPTAGLibStatic
# arrow
# jemalloc_pic
# faiss
# openblas
# lapack
easyloggingpp
easyloggingpp
sqlite
sqlite
${
client_grpc_lib
}
${
client_grpc_lib
}
...
@@ -124,15 +116,6 @@ set(third_party_libs
...
@@ -124,15 +116,6 @@ set(third_party_libs
cudart
cudart
)
)
#if(${BUILD_FAISS_WITH_MKL} STREQUAL "ON")
# set(third_party_libs ${third_party_libs}
# ${MKL_LIBS})
#else()
# set(third_party_libs ${third_party_libs}
# lapack
# openblas)
#endif()
if
(
MILVUS_ENABLE_PROFILING STREQUAL
"ON"
)
if
(
MILVUS_ENABLE_PROFILING STREQUAL
"ON"
)
set
(
third_party_libs
${
third_party_libs
}
set
(
third_party_libs
${
third_party_libs
}
gperftools
gperftools
...
@@ -180,13 +163,6 @@ set(server_libs
...
@@ -180,13 +163,6 @@ set(server_libs
set
(
knowhere_libs
set
(
knowhere_libs
knowhere
knowhere
# SPTAGLibStatic
# arrow
# jemalloc_pic
# faiss
# openblas
# lapack
# tbb
)
)
add_executable
(
milvus_server
add_executable
(
milvus_server
...
...
cpp/src/core/CMakeLists.txt
浏览文件 @
ea830ebc
...
@@ -39,8 +39,6 @@ endif()
...
@@ -39,8 +39,6 @@ endif()
MESSAGE
(
STATUS
"CMAKE_CXX_FLAGS"
${
CMAKE_CXX_FLAGS
}
)
MESSAGE
(
STATUS
"CMAKE_CXX_FLAGS"
${
CMAKE_CXX_FLAGS
}
)
find_package
(
CUDA
)
find_package
(
CUDA
)
#set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -Xcompiler -fPIC -std=c++11 -D_FORCE_INLINES --expt-extended-lambda")
#set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -O0 -g")
if
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"(x86)|(X86)|(amd64)|(AMD64)"
)
if
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"(x86)|(X86)|(amd64)|(AMD64)"
)
message
(
STATUS
"building milvus_engine on x86 architecture"
)
message
(
STATUS
"building milvus_engine on x86 architecture"
)
...
...
cpp/src/core/cmake/ThirdPartyPackagesCore.cmake
浏览文件 @
ea830ebc
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
# "License"); you may not use this file except in compliance
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing,
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# software distributed under the License is distributed on an
...
@@ -18,7 +17,6 @@
...
@@ -18,7 +17,6 @@
set
(
KNOWHERE_THIRDPARTY_DEPENDENCIES
set
(
KNOWHERE_THIRDPARTY_DEPENDENCIES
ARROW
ARROW
# BOOST
FAISS
FAISS
GTest
GTest
LAPACK
LAPACK
...
@@ -53,11 +51,8 @@ endmacro()
...
@@ -53,11 +51,8 @@ endmacro()
macro
(
resolve_dependency DEPENDENCY_NAME
)
macro
(
resolve_dependency DEPENDENCY_NAME
)
if
(
${
DEPENDENCY_NAME
}
_SOURCE STREQUAL
"AUTO"
)
if
(
${
DEPENDENCY_NAME
}
_SOURCE STREQUAL
"AUTO"
)
#message(STATUS "Finding ${DEPENDENCY_NAME} package")
#message(STATUS "Finding ${DEPENDENCY_NAME} package")
# find_package(${DEPENDENCY_NAME} QUIET)
# if (NOT ${DEPENDENCY_NAME}_FOUND)
#message(STATUS "${DEPENDENCY_NAME} package not found")
#message(STATUS "${DEPENDENCY_NAME} package not found")
build_dependency
(
${
DEPENDENCY_NAME
}
)
build_dependency
(
${
DEPENDENCY_NAME
}
)
# endif ()
elseif
(
${
DEPENDENCY_NAME
}
_SOURCE STREQUAL
"BUNDLED"
)
elseif
(
${
DEPENDENCY_NAME
}
_SOURCE STREQUAL
"BUNDLED"
)
build_dependency
(
${
DEPENDENCY_NAME
}
)
build_dependency
(
${
DEPENDENCY_NAME
}
)
elseif
(
${
DEPENDENCY_NAME
}
_SOURCE STREQUAL
"SYSTEM"
)
elseif
(
${
DEPENDENCY_NAME
}
_SOURCE STREQUAL
"SYSTEM"
)
...
@@ -202,14 +197,6 @@ endif()
...
@@ -202,14 +197,6 @@ endif()
set
(
MAKE_BUILD_ARGS
"-j8"
)
set
(
MAKE_BUILD_ARGS
"-j8"
)
## Using make -j in sub-make is fragile
## see discussion https://github.com/apache/KNOWHERE/pull/2779
#if(${CMAKE_GENERATOR} MATCHES "Makefiles")
# set(MAKE_BUILD_ARGS "")
#else()
# # limit the maximum number of jobs for ninja
# set(MAKE_BUILD_ARGS "-j4")
#endif()
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
# Find pthreads
# Find pthreads
...
@@ -243,21 +230,10 @@ foreach(_VERSION_ENTRY ${TOOLCHAIN_VERSIONS_TXT})
...
@@ -243,21 +230,10 @@ foreach(_VERSION_ENTRY ${TOOLCHAIN_VERSIONS_TXT})
set
(
${
_LIB_NAME
}
"
${
_LIB_VERSION
}
"
)
set
(
${
_LIB_NAME
}
"
${
_LIB_VERSION
}
"
)
endforeach
()
endforeach
()
#if(DEFINED ENV{KNOWHERE_BOOST_URL})
# set(BOOST_SOURCE_URL "$ENV{KNOWHERE_BOOST_URL}")
#else()
# string(REPLACE "." "_" BOOST_VERSION_UNDERSCORES ${BOOST_VERSION})
# set(BOOST_SOURCE_URL
# "https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_UNDERSCORES}.tar.gz"
# )
#endif()
if
(
DEFINED ENV{KNOWHERE_FAISS_URL}
)
if
(
DEFINED ENV{KNOWHERE_FAISS_URL}
)
set
(
FAISS_SOURCE_URL
"$ENV{KNOWHERE_FAISS_URL}"
)
set
(
FAISS_SOURCE_URL
"$ENV{KNOWHERE_FAISS_URL}"
)
else
()
else
()
set
(
FAISS_SOURCE_URL
"http://192.168.1.105:6060/jinhai/faiss/-/archive/
${
FAISS_VERSION
}
/faiss-
${
FAISS_VERSION
}
.tar.gz"
)
set
(
FAISS_SOURCE_URL
"http://192.168.1.105:6060/jinhai/faiss/-/archive/
${
FAISS_VERSION
}
/faiss-
${
FAISS_VERSION
}
.tar.gz"
)
# set(FAISS_SOURCE_URL "https://github.com/facebookresearch/faiss/archive/${FAISS_VERSION}.tar.gz")
# set(FAISS_SOURCE_URL "${CMAKE_SOURCE_DIR}/thirdparty/faiss-1.5.3")
message
(
STATUS
"FAISS URL =
${
FAISS_SOURCE_URL
}
"
)
message
(
STATUS
"FAISS URL =
${
FAISS_SOURCE_URL
}
"
)
endif
()
endif
()
# set(FAISS_MD5 "a589663865a8558205533c8ac414278c")
# set(FAISS_MD5 "a589663865a8558205533c8ac414278c")
...
@@ -301,25 +277,14 @@ set(ARROW_PREFIX "${CORE_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep/cpp")
...
@@ -301,25 +277,14 @@ set(ARROW_PREFIX "${CORE_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep/cpp")
macro
(
build_arrow
)
macro
(
build_arrow
)
message
(
STATUS
"Building Apache ARROW-
${
ARROW_VERSION
}
from source"
)
message
(
STATUS
"Building Apache ARROW-
${
ARROW_VERSION
}
from source"
)
# set(ARROW_PREFIX "${CORE_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep/cpp")
set
(
ARROW_STATIC_LIB_NAME arrow
)
set
(
ARROW_STATIC_LIB_NAME arrow
)
# set(PARQUET_STATIC_LIB_NAME parquet)
set
(
ARROW_STATIC_LIB
# set(ARROW_CUDA_STATIC_LIB_NAME arrow_cuda)
set
(
ARROW_STATIC_LIB
"
${
ARROW_PREFIX
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}${
ARROW_STATIC_LIB_NAME
}${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
"
${
ARROW_PREFIX
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}${
ARROW_STATIC_LIB_NAME
}${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
)
)
# set(PARQUET_STATIC_LIB
set
(
ARROW_INCLUDE_DIR
"
${
ARROW_PREFIX
}
/include"
)
# "${ARROW_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${PARQUET_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
# )
# set(ARROW_CUDA_STATIC_LIB
# "${ARROW_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${ARROW_CUDA_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
# )
set
(
ARROW_INCLUDE_DIR
"
${
ARROW_PREFIX
}
/include"
)
set
(
ARROW_CMAKE_ARGS
set
(
ARROW_CMAKE_ARGS
${
EP_COMMON_CMAKE_ARGS
}
${
EP_COMMON_CMAKE_ARGS
}
# "-DARROW_THRIFT_URL=${THRIFT_SOURCE_URL}"
#"env ARROW_THRIFT_URL=${THRIFT_SOURCE_URL}"
-DARROW_BUILD_STATIC=ON
-DARROW_BUILD_STATIC=ON
-DARROW_BUILD_SHARED=OFF
-DARROW_BUILD_SHARED=OFF
-DARROW_PARQUET=OFF
-DARROW_PARQUET=OFF
...
@@ -329,8 +294,7 @@ macro(build_arrow)
...
@@ -329,8 +294,7 @@ macro(build_arrow)
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_BUILD_TYPE=Release
-DARROW_DEPENDENCY_SOURCE=BUNDLED
)
#Build all arrow dependencies from source instead of calling find_package first
-DARROW_DEPENDENCY_SOURCE=BUNDLED
)
#Build all arrow dependencies from source instead of calling find_package first
# set($ENV{ARROW_THRIFT_URL} ${THRIFT_SOURCE_URL})
if
(
USE_JFROG_CACHE STREQUAL
"ON"
)
if
(
USE_JFROG_CACHE STREQUAL
"ON"
)
execute_process
(
COMMAND sh -c
"git ls-remote --heads --tags
${
ARROW_SOURCE_URL
}
${
ARROW_VERSION
}
| cut -f 1"
OUTPUT_VARIABLE ARROW_LAST_COMMIT_ID
)
execute_process
(
COMMAND sh -c
"git ls-remote --heads --tags
${
ARROW_SOURCE_URL
}
${
ARROW_VERSION
}
| cut -f 1"
OUTPUT_VARIABLE ARROW_LAST_COMMIT_ID
)
if
(
${
ARROW_LAST_COMMIT_ID
}
MATCHES
"^[^#][a-z0-9]+"
)
if
(
${
ARROW_LAST_COMMIT_ID
}
MATCHES
"^[^#][a-z0-9]+"
)
...
@@ -403,8 +367,7 @@ macro(build_arrow)
...
@@ -403,8 +367,7 @@ macro(build_arrow)
set_target_properties
(
arrow
set_target_properties
(
arrow
PROPERTIES IMPORTED_LOCATION
"
${
ARROW_STATIC_LIB
}
"
PROPERTIES IMPORTED_LOCATION
"
${
ARROW_STATIC_LIB
}
"
INTERFACE_INCLUDE_DIRECTORIES
"
${
ARROW_INCLUDE_DIR
}
"
)
INTERFACE_INCLUDE_DIRECTORIES
"
${
ARROW_INCLUDE_DIR
}
"
)
# INTERFACE_LINK_LIBRARIES thrift)
add_dependencies
(
arrow arrow_ep
)
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
"
${
CORE_BINARY_DIR
}
/arrow_ep-prefix/src/arrow_ep-build/jemalloc_ep-prefix/src/jemalloc_ep"
)
...
@@ -423,185 +386,6 @@ if(KNOWHERE_WITH_ARROW AND NOT TARGET arrow_ep)
...
@@ -423,185 +386,6 @@ if(KNOWHERE_WITH_ARROW AND NOT TARGET arrow_ep)
include_directories
(
SYSTEM
${
ARROW_INCLUDE_DIR
}
)
include_directories
(
SYSTEM
${
ARROW_INCLUDE_DIR
}
)
endif
()
endif
()
# ----------------------------------------------------------------------
# Add Boost dependencies (code adapted from Apache Kudu (incubating))
#set(Boost_USE_MULTITHREADED ON)
#if(MSVC AND KNOWHERE_USE_STATIC_CRT)
# set(Boost_USE_STATIC_RUNTIME ON)
#endif()
#set(Boost_ADDITIONAL_VERSIONS
# "1.70.0"
# "1.70"
# "1.69.0"
# "1.69"
# "1.68.0"
# "1.68"
# "1.67.0"
# "1.67"
# "1.66.0"
# "1.66"
# "1.65.0"
# "1.65"
# "1.64.0"
# "1.64"
# "1.63.0"
# "1.63"
# "1.62.0"
# "1.61"
# "1.61.0"
# "1.62"
# "1.60.0"
# "1.60")
#
## TODO
#if(KNOWHERE_BOOST_VENDORED)
## system thread serialization wserialization regex
# set(BOOST_PREFIX "${CORE_BINARY_DIR}/boost_ep-prefix/src/boost_ep")
# set(BOOST_LIB_DIR "${BOOST_PREFIX}/stage/lib")
# set(BOOST_BUILD_LINK "static")
# set(BOOST_STATIC_SYSTEM_LIBRARY
# "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_system${CMAKE_STATIC_LIBRARY_SUFFIX}"
# )
# set(BOOST_STATIC_FILESYSTEM_LIBRARY
# "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_filesystem${CMAKE_STATIC_LIBRARY_SUFFIX}"
# )
# set(BOOST_STATIC_SERIALIZATION_LIBRARY
# "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_serialization${CMAKE_STATIC_LIBRARY_SUFFIX}"
# )
# set(BOOST_STATIC_WSERIALIZATION_LIBRARY
# "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_wserialization${CMAKE_STATIC_LIBRARY_SUFFIX}"
# )
# set(BOOST_STATIC_REGEX_LIBRARY
# "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_regex${CMAKE_STATIC_LIBRARY_SUFFIX}"
# )
# set(BOOST_STATIC_THREAD_LIBRARY
# "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_thread${CMAKE_STATIC_LIBRARY_SUFFIX}"
# )
# set(BOOST_SYSTEM_LIBRARY boost_system_static)
# set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_static)
# set(BOOST_SERIALIZATION_LIBRARY boost_serialization_static)
# set(BOOST_WSERIALIZATION_LIBRARY boost_wserialization_static)
# set(BOOST_REGEX_LIBRARY boost_regex_static)
# set(BOOST_THREAD_LIBRARY boost_thread_static)
#
# if(KNOWHERE_BOOST_HEADER_ONLY)
# set(BOOST_BUILD_PRODUCTS)
# set(BOOST_CONFIGURE_COMMAND "")
# set(BOOST_BUILD_COMMAND "")
# else()
# set(BOOST_BUILD_PRODUCTS ${BOOST_STATIC_SYSTEM_LIBRARY}
# ${BOOST_STATIC_FILESYSTEM_LIBRARY} ${BOOST_STATIC_SERIALIZATION_LIBRARY}
# ${BOOST_STATIC_WSERIALIZATION_LIBRARY} ${BOOST_STATIC_REGEX_LIBRARY}
# ${BOOST_STATIC_THREAD_LIBRARY})
# set(BOOST_CONFIGURE_COMMAND "./bootstrap.sh" "--prefix=${BOOST_PREFIX}"
# "--with-libraries=filesystem,serialization,wserialization,system,thread,regex")
# if("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
# set(BOOST_BUILD_VARIANT "debug")
# else()
# set(BOOST_BUILD_VARIANT "release")
# endif()
# set(BOOST_BUILD_COMMAND
# "./b2"
# "link=${BOOST_BUILD_LINK}"
# "variant=${BOOST_BUILD_VARIANT}"
# "cxxflags=-fPIC")
#
# add_thirdparty_lib(boost_system STATIC_LIB "${BOOST_STATIC_SYSTEM_LIBRARY}")
#
# add_thirdparty_lib(boost_filesystem STATIC_LIB "${BOOST_STATIC_FILESYSTEM_LIBRARY}")
#
# add_thirdparty_lib(boost_serialization STATIC_LIB "${BOOST_STATIC_SERIALIZATION_LIBRARY}")
#
# add_thirdparty_lib(boost_wserialization STATIC_LIB "${BOOST_STATIC_WSERIALIZATION_LIBRARY}")
#
# add_thirdparty_lib(boost_regex STATIC_LIB "${BOOST_STATIC_REGEX_LIBRARY}")
#
# add_thirdparty_lib(boost_thread STATIC_LIB "${BOOST_STATIC_THREAD_LIBRARY}")
#
# set(KNOWHERE_BOOST_LIBS ${BOOST_SYSTEM_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY} ${BOOST_SERIALIZATION_LIBRARY}
# ${BOOST_WSERIALIZATION_LIBRARY} ${BOOST_REGEX_LIBRARY} ${BOOST_THREAD_LIBRARY})
# endif()
# externalproject_add(boost_ep
# URL
# ${BOOST_SOURCE_URL}
# BUILD_BYPRODUCTS
# ${BOOST_BUILD_PRODUCTS}
# BUILD_IN_SOURCE
# 1
# CONFIGURE_COMMAND
# ${BOOST_CONFIGURE_COMMAND}
# BUILD_COMMAND
# ${BOOST_BUILD_COMMAND}
# INSTALL_COMMAND
# ""
# ${EP_LOG_OPTIONS})
# set(Boost_INCLUDE_DIR "${BOOST_PREFIX}")
# set(Boost_INCLUDE_DIRS "${BOOST_INCLUDE_DIR}")
# add_dependencies(boost_system_static boost_ep)
# add_dependencies(boost_filesystem_static boost_ep)
# add_dependencies(boost_serialization_static boost_ep)
# add_dependencies(boost_wserialization_static boost_ep)
# add_dependencies(boost_regex_static boost_ep)
# add_dependencies(boost_thread_static boost_ep)
#
##else()
## if(MSVC)
## # disable autolinking in boost
## add_definitions(-DBOOST_ALL_NO_LIB)
## endif()
#
## if(DEFINED ENV{BOOST_ROOT} OR DEFINED BOOST_ROOT)
## # In older versions of CMake (such as 3.2), the system paths for Boost will
## # In older versions of CMake (such as 3.2), the system paths for Boost will
## # be looked in first even if we set $BOOST_ROOT or pass -DBOOST_ROOT
## set(Boost_NO_SYSTEM_PATHS ON)
## endif()
#
## if(KNOWHERE_BOOST_USE_SHARED)
## # Find shared Boost libraries.
## set(Boost_USE_STATIC_LIBS OFF)
## set(BUILD_SHARED_LIBS_KEEP ${BUILD_SHARED_LIBS})
## set(BUILD_SHARED_LIBS ON)
##
## if(MSVC)
## # force all boost libraries to dynamic link
## add_definitions(-DBOOST_ALL_DYN_LINK)
## endif()
##
## if(KNOWHERE_BOOST_HEADER_ONLY)
## find_package(Boost REQUIRED)
## else()
## find_package(Boost COMPONENTS serialization system filesystem REQUIRED)
## set(BOOST_SYSTEM_LIBRARY Boost::system)
## set(BOOST_FILESYSTEM_LIBRARY Boost::filesystem)
## set(BOOST_SERIALIZATION_LIBRARY Boost::serialization)
## set(KNOWHERE_BOOST_LIBS ${BOOST_SYSTEM_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY})
## endif()
## set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_KEEP})
## unset(BUILD_SHARED_LIBS_KEEP)
## else()
## # Find static boost headers and libs
## # TODO Differentiate here between release and debug builds
## set(Boost_USE_STATIC_LIBS ON)
## if(KNOWHERE_BOOST_HEADER_ONLY)
## find_package(Boost REQUIRED)
## else()
## find_package(Boost COMPONENTS serialization system filesystem REQUIRED)
## set(BOOST_SYSTEM_LIBRARY Boost::system)
## set(BOOST_FILESYSTEM_LIBRARY Boost::filesystem)
## set(BOOST_SERIALIZATION_LIBRARY Boost::serialization)
## set(KNOWHERE_BOOST_LIBS ${BOOST_SYSTEM_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY})
## endif()
## endif()
#endif()
#
##message(STATUS "Boost include dir: " ${Boost_INCLUDE_DIR})
##message(STATUS "Boost libraries: " ${Boost_LIBRARIES})
#
#include_directories(SYSTEM ${Boost_INCLUDE_DIR})
#link_directories(SYSTEM ${BOOST_LIB_DIR})
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
# OpenBLAS
# OpenBLAS
...
@@ -679,14 +463,6 @@ macro(build_openblas)
...
@@ -679,14 +463,6 @@ macro(build_openblas)
add_dependencies
(
openblas openblas_ep
)
add_dependencies
(
openblas openblas_ep
)
endmacro
()
endmacro
()
#if(KNOWHERE_WITH_OPENBLAS)
# resolve_dependency(OpenBLAS)
#
# get_target_property(OPENBLAS_INCLUDE_DIR openblas INTERFACE_INCLUDE_DIRECTORIES)
# include_directories(SYSTEM "${OPENBLAS_INCLUDE_DIR}")
# link_directories(SYSTEM ${OPENBLAS_PREFIX}/lib)
#endif()
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
# LAPACK
# LAPACK
...
@@ -757,14 +533,6 @@ macro(build_lapack)
...
@@ -757,14 +533,6 @@ macro(build_lapack)
add_dependencies
(
lapack lapack_ep
)
add_dependencies
(
lapack lapack_ep
)
endmacro
()
endmacro
()
#if(KNOWHERE_WITH_LAPACK)
# resolve_dependency(LAPACK)
#
# get_target_property(LAPACK_INCLUDE_DIR lapack INTERFACE_INCLUDE_DIRECTORIES)
# include_directories(SYSTEM "${LAPACK_INCLUDE_DIR}")
# link_directories(SYSTEM ${LAPACK_PREFIX}/lib)
#endif()
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
# Google gtest
# Google gtest
...
@@ -873,7 +641,6 @@ macro(build_gtest)
...
@@ -873,7 +641,6 @@ macro(build_gtest)
endmacro
()
endmacro
()
if
(
KNOWHERE_BUILD_TESTS AND NOT TARGET googletest_ep
)
if
(
KNOWHERE_BUILD_TESTS AND NOT TARGET googletest_ep
)
#message(STATUS "Resolving gtest dependency")
resolve_dependency
(
GTest
)
resolve_dependency
(
GTest
)
if
(
NOT GTEST_VENDORED
)
if
(
NOT GTEST_VENDORED
)
...
@@ -895,12 +662,7 @@ macro(build_faiss)
...
@@ -895,12 +662,7 @@ macro(build_faiss)
set
(
FAISS_STATIC_LIB
set
(
FAISS_STATIC_LIB
"
${
FAISS_PREFIX
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}
faiss
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
)
"
${
FAISS_PREFIX
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}
faiss
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
)
# add_custom_target(faiss_dependencies)
# add_dependencies(faiss_dependencies openblas_ep)
# add_dependencies(faiss_dependencies openblas)
# get_target_property(FAISS_OPENBLAS_LIB_DIR openblas IMPORTED_LOCATION)
# get_filename_component(FAISS_OPENBLAS_LIB "${FAISS_OPENBLAS_LIB_DIR}" DIRECTORY)
set
(
FAISS_CONFIGURE_ARGS
set
(
FAISS_CONFIGURE_ARGS
"--prefix=
${
FAISS_PREFIX
}
"
"--prefix=
${
FAISS_PREFIX
}
"
"CFLAGS=
${
EP_C_FLAGS
}
"
"CFLAGS=
${
EP_C_FLAGS
}
"
...
@@ -908,13 +670,7 @@ macro(build_faiss)
...
@@ -908,13 +670,7 @@ macro(build_faiss)
"LDFLAGS=-L
${
OPENBLAS_PREFIX
}
/lib -L
${
LAPACK_PREFIX
}
/lib -lopenblas -llapack"
"LDFLAGS=-L
${
OPENBLAS_PREFIX
}
/lib -L
${
LAPACK_PREFIX
}
/lib -lopenblas -llapack"
--without-python
)
--without-python
)
# if(OPENBLAS_STATIC_LIB)
# set(OPENBLAS_LIBRARY ${OPENBLAS_STATIC_LIB})
# else()
# set(OPENBLAS_LIBRARY ${OPENBLAS_SHARED_LIB})
# endif()
# set(FAISS_DEPENDENCIES ${FAISS_DEPENDENCIES} ${OPENBLAS_LIBRARY})
if
(
${
KNOWHERE_WITH_FAISS_GPU_VERSION
}
STREQUAL
"ON"
)
if
(
${
KNOWHERE_WITH_FAISS_GPU_VERSION
}
STREQUAL
"ON"
)
set
(
FAISS_CONFIGURE_ARGS
${
FAISS_CONFIGURE_ARGS
}
set
(
FAISS_CONFIGURE_ARGS
${
FAISS_CONFIGURE_ARGS
}
"--with-cuda=
${
CUDA_TOOLKIT_ROOT_DIR
}
"
"--with-cuda=
${
CUDA_TOOLKIT_ROOT_DIR
}
"
...
@@ -925,9 +681,7 @@ macro(build_faiss)
...
@@ -925,9 +681,7 @@ macro(build_faiss)
endif
()
endif
()
if
(
USE_JFROG_CACHE STREQUAL
"ON"
)
if
(
USE_JFROG_CACHE STREQUAL
"ON"
)
# Check_Last_Modify("${CMAKE_SOURCE_DIR}/thirdparty/faiss_cache_check_lists.txt" "${CMAKE_SOURCE_DIR}" FAISS_LAST_MODIFIED_COMMIT_ID)
string
(
MD5 FAISS_COMBINE_MD5
"
${
FAISS_MD5
}${
LAPACK_MD5
}${
OPENBLAS_MD5
}
"
)
string
(
MD5 FAISS_COMBINE_MD5
"
${
FAISS_MD5
}${
LAPACK_MD5
}${
OPENBLAS_MD5
}
"
)
# string(MD5 FAISS_COMBINE_MD5 "${FAISS_LAST_MODIFIED_COMMIT_ID}${LAPACK_MD5}${OPENBLAS_MD5}")
set
(
FAISS_CACHE_PACKAGE_NAME
"faiss_
${
FAISS_COMBINE_MD5
}
.tar.gz"
)
set
(
FAISS_CACHE_PACKAGE_NAME
"faiss_
${
FAISS_COMBINE_MD5
}
.tar.gz"
)
set
(
FAISS_CACHE_URL
"
${
JFROG_ARTFACTORY_CACHE_URL
}
/
${
FAISS_CACHE_PACKAGE_NAME
}
"
)
set
(
FAISS_CACHE_URL
"
${
JFROG_ARTFACTORY_CACHE_URL
}
/
${
FAISS_CACHE_PACKAGE_NAME
}
"
)
set
(
FAISS_CACHE_PACKAGE_PATH
"
${
THIRDPARTY_PACKAGE_CACHE
}
/
${
FAISS_CACHE_PACKAGE_NAME
}
"
)
set
(
FAISS_CACHE_PACKAGE_PATH
"
${
THIRDPARTY_PACKAGE_CACHE
}
/
${
FAISS_CACHE_PACKAGE_NAME
}
"
)
...
@@ -991,10 +745,6 @@ macro(build_faiss)
...
@@ -991,10 +745,6 @@ macro(build_faiss)
INTERFACE_LINK_LIBRARIES
"openblas;lapack"
)
INTERFACE_LINK_LIBRARIES
"openblas;lapack"
)
add_dependencies
(
faiss faiss_ep
)
add_dependencies
(
faiss faiss_ep
)
#add_dependencies(faiss openblas_ep)
#add_dependencies(faiss lapack_ep)
#target_link_libraries(faiss ${OPENBLAS_PREFIX}/lib)
#target_link_libraries(faiss ${LAPACK_PREFIX}/lib)
endmacro
()
endmacro
()
...
@@ -1013,8 +763,5 @@ if(KNOWHERE_WITH_FAISS AND NOT TARGET faiss_ep)
...
@@ -1013,8 +763,5 @@ if(KNOWHERE_WITH_FAISS AND NOT TARGET faiss_ep)
resolve_dependency
(
FAISS
)
resolve_dependency
(
FAISS
)
get_target_property
(
FAISS_INCLUDE_DIR faiss INTERFACE_INCLUDE_DIRECTORIES
)
get_target_property
(
FAISS_INCLUDE_DIR faiss INTERFACE_INCLUDE_DIRECTORIES
)
include_directories
(
SYSTEM
"
${
FAISS_INCLUDE_DIR
}
"
)
include_directories
(
SYSTEM
"
${
FAISS_INCLUDE_DIR
}
"
)
# include_directories(SYSTEM "${CORE_BINARY_DIR}/faiss_ep-prefix/src/")
# link_directories(SYSTEM ${FAISS_PREFIX}/)
link_directories
(
SYSTEM
${
FAISS_PREFIX
}
/lib/
)
link_directories
(
SYSTEM
${
FAISS_PREFIX
}
/lib/
)
# link_directories(SYSTEM ${FAISS_PREFIX}/gpu/)
endif
()
endif
()
cpp/src/core/src/CMakeLists.txt
浏览文件 @
ea830ebc
...
@@ -24,8 +24,6 @@ file(GLOB SRC_FILES
...
@@ -24,8 +24,6 @@ file(GLOB SRC_FILES
${
SPTAG_SOURCE_DIR
}
/AnnService/src/Core/KDT/*.cpp
${
SPTAG_SOURCE_DIR
}
/AnnService/src/Core/KDT/*.cpp
${
SPTAG_SOURCE_DIR
}
/AnnService/src/Helper/*.cpp
)
${
SPTAG_SOURCE_DIR
}
/AnnService/src/Helper/*.cpp
)
#add_library(SPTAGLib SHARED ${SRC_FILES} ${HDR_FILES})
#target_link_libraries(SPTAGLib ${TBB_LIBRARIES})
if
(
NOT TARGET SPTAGLibStatic
)
if
(
NOT TARGET SPTAGLibStatic
)
add_library
(
SPTAGLibStatic STATIC
${
SRC_FILES
}
${
HDR_FILES
}
)
add_library
(
SPTAGLibStatic STATIC
${
SRC_FILES
}
${
HDR_FILES
}
)
endif
()
endif
()
...
@@ -53,7 +51,6 @@ set(index_srcs
...
@@ -53,7 +51,6 @@ set(index_srcs
)
)
set
(
depend_libs
set
(
depend_libs
# libtcmalloc.a
SPTAGLibStatic
SPTAGLibStatic
${
TBB_LIBRARIES
}
${
TBB_LIBRARIES
}
faiss
faiss
...
@@ -75,25 +72,12 @@ if(NOT TARGET knowhere)
...
@@ -75,25 +72,12 @@ if(NOT TARGET knowhere)
${
index_srcs
}
${
index_srcs
}
)
)
endif
()
endif
()
#target_compile_options(knowhere PUBLIC "-fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free")
target_link_libraries
(
target_link_libraries
(
knowhere
knowhere
${
depend_libs
}
${
depend_libs
}
)
)
#add_library(
# knowhereS SHARED
# ${external_srcs}
# ${index_srcs}
#)
#
#target_link_libraries(
# knowhereS
## ${TBB_LIBRARIES}
# ${depend_libs}
#)
INSTALL
(
TARGETS
INSTALL
(
TARGETS
knowhere
knowhere
SPTAGLibStatic
SPTAGLibStatic
...
@@ -102,7 +86,6 @@ INSTALL(TARGETS
...
@@ -102,7 +86,6 @@ INSTALL(TARGETS
INSTALL
(
FILES
INSTALL
(
FILES
${
ARROW_STATIC_LIB
}
${
ARROW_STATIC_LIB
}
# ${PARQUET_STATIC_LIB}
${
ARROW_PREFIX
}
/lib/libjemalloc_pic.a
${
ARROW_PREFIX
}
/lib/libjemalloc_pic.a
${
FAISS_STATIC_LIB
}
${
FAISS_STATIC_LIB
}
${
LAPACK_STATIC_LIB
}
${
LAPACK_STATIC_LIB
}
...
@@ -117,11 +100,9 @@ INSTALL(FILES ${OPENBLAS_REAL_STATIC_LIB}
...
@@ -117,11 +100,9 @@ INSTALL(FILES ${OPENBLAS_REAL_STATIC_LIB}
)
)
INSTALL
(
FILES
${
CORE_SOURCE_DIR
}
/thirdparty/tbb/libtbb.so.2
INSTALL
(
FILES
${
CORE_SOURCE_DIR
}
/thirdparty/tbb/libtbb.so.2
# RENAME "libtbb.so.2"
DESTINATION lib
DESTINATION lib
)
)
INSTALL
(
FILES
${
CORE_SOURCE_DIR
}
/thirdparty/tbb/libtbb.so
INSTALL
(
FILES
${
CORE_SOURCE_DIR
}
/thirdparty/tbb/libtbb.so
# RENAME "libtbb.so"
DESTINATION lib
DESTINATION lib
)
)
...
@@ -138,17 +119,12 @@ set(CORE_INCLUDE_DIRS
...
@@ -138,17 +119,12 @@ set(CORE_INCLUDE_DIRS
)
)
set
(
CORE_INCLUDE_DIRS
${
CORE_INCLUDE_DIRS
}
PARENT_SCOPE
)
set
(
CORE_INCLUDE_DIRS
${
CORE_INCLUDE_DIRS
}
PARENT_SCOPE
)
#include_directories(SYSTEM ${CORE_SOURCE_DIR}/include)
#include_directories(SYSTEM ${CORE_SOURCE_DIR}/thirdparty/jsoncons-0.126.0/include)
#include_directories(SYSTEM ${CORE_SOURCE_DIR}/thirdparty/tbb/include)
#include_directories(SYSTEM ${SPTAG_SOURCE_DIR}/AnnService/inc)
INSTALL
(
DIRECTORY
INSTALL
(
DIRECTORY
${
CORE_SOURCE_DIR
}
/include/knowhere
${
CORE_SOURCE_DIR
}
/include/knowhere
${
CORE_SOURCE_DIR
}
/thirdparty/jsoncons-0.126.0/include/jsoncons
${
CORE_SOURCE_DIR
}
/thirdparty/jsoncons-0.126.0/include/jsoncons
${
CORE_SOURCE_DIR
}
/thirdparty/jsoncons-0.126.0/include/jsoncons_ext
${
CORE_SOURCE_DIR
}
/thirdparty/jsoncons-0.126.0/include/jsoncons_ext
${
ARROW_INCLUDE_DIR
}
/arrow
${
ARROW_INCLUDE_DIR
}
/arrow
# ${ARROW_INCLUDE_DIR}/parquet
${
FAISS_PREFIX
}
/include/faiss
${
FAISS_PREFIX
}
/include/faiss
${
OPENBLAS_INCLUDE_DIR
}
/
${
OPENBLAS_INCLUDE_DIR
}
/
${
CORE_SOURCE_DIR
}
/thirdparty/tbb/include/tbb
${
CORE_SOURCE_DIR
}
/thirdparty/tbb/include/tbb
...
...
cpp/src/core/test/CMakeLists.txt
浏览文件 @
ea830ebc
...
@@ -24,7 +24,6 @@ set(basic_libs
...
@@ -24,7 +24,6 @@ set(basic_libs
#<IVF-TEST>
#<IVF-TEST>
#<<<<<<<<<<
set
(
ivf_srcs
set
(
ivf_srcs
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/ivf.cpp
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/ivf.cpp
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/gpu_ivf.cpp
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/gpu_ivf.cpp
...
@@ -39,10 +38,8 @@ if(NOT TARGET test_ivf)
...
@@ -39,10 +38,8 @@ if(NOT TARGET test_ivf)
add_executable
(
test_ivf test_ivf.cpp
${
ivf_srcs
}
)
add_executable
(
test_ivf test_ivf.cpp
${
ivf_srcs
}
)
endif
()
endif
()
target_link_libraries
(
test_ivf
${
depend_libs
}
${
unittest_libs
}
${
basic_libs
}
)
target_link_libraries
(
test_ivf
${
depend_libs
}
${
unittest_libs
}
${
basic_libs
}
)
#<<<<<<<<<<
#<IDMAP-TEST>
#<IDMAP-TEST>
#<<<<<<<<<<
set
(
idmap_srcs
set
(
idmap_srcs
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/idmap.cpp
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/idmap.cpp
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/ivf.cpp
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/ivf.cpp
...
@@ -57,11 +54,8 @@ if(NOT TARGET test_idmap)
...
@@ -57,11 +54,8 @@ if(NOT TARGET test_idmap)
add_executable
(
test_idmap test_idmap.cpp
${
idmap_srcs
}
)
add_executable
(
test_idmap test_idmap.cpp
${
idmap_srcs
}
)
endif
()
endif
()
target_link_libraries
(
test_idmap
${
depend_libs
}
${
unittest_libs
}
${
basic_libs
}
)
target_link_libraries
(
test_idmap
${
depend_libs
}
${
unittest_libs
}
${
basic_libs
}
)
#<<<<<<<<<<
#<KDT-TEST>
#<KDT-TEST>
#<<<<<<<<<<
set
(
kdt_srcs
set
(
kdt_srcs
${
CORE_SOURCE_DIR
}
/src/knowhere/index/preprocessor/normalize.cpp
${
CORE_SOURCE_DIR
}
/src/knowhere/index/preprocessor/normalize.cpp
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/kdt_parameters.cpp
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/kdt_parameters.cpp
...
@@ -79,8 +73,6 @@ endif()
...
@@ -79,8 +73,6 @@ endif()
target_link_libraries
(
test_kdt
target_link_libraries
(
test_kdt
SPTAGLibStatic
SPTAGLibStatic
${
depend_libs
}
${
unittest_libs
}
${
basic_libs
}
)
${
depend_libs
}
${
unittest_libs
}
${
basic_libs
}
)
#<<<<<<<<<<
add_subdirectory
(
faiss_ori
)
add_subdirectory
(
faiss_ori
)
add_subdirectory
(
test_nsg
)
add_subdirectory
(
test_nsg
)
...
...
cpp/src/core/test/faiss_ori/CMakeLists.txt
浏览文件 @
ea830ebc
...
@@ -20,9 +20,7 @@ set(basic_libs
...
@@ -20,9 +20,7 @@ set(basic_libs
#<GPU-TEST>
#<GPU-TEST>
#<<<<<<<<<<
if
(
NOT TARGET test_gpu
)
if
(
NOT TARGET test_gpu
)
add_executable
(
test_gpu gpuresource_test.cpp
)
add_executable
(
test_gpu gpuresource_test.cpp
)
endif
()
endif
()
target_link_libraries
(
test_gpu
${
depend_libs
}
${
unittest_libs
}
${
basic_libs
}
)
target_link_libraries
(
test_gpu
${
depend_libs
}
${
unittest_libs
}
${
basic_libs
}
)
#<<<<<<<<<<
cpp/src/core/test/test_nsg/CMakeLists.txt
浏览文件 @
ea830ebc
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
include_directories
(
/usr/local/include/gperftools
)
include_directories
(
/usr/local/include/gperftools
)
link_directories
(
/usr/local/lib
)
link_directories
(
/usr/local/lib
)
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free")
add_definitions
(
-std=c++11 -O3 -lboost -march=native -Wall -DINFO
)
add_definitions
(
-std=c++11 -O3 -lboost -march=native -Wall -DINFO
)
find_package
(
OpenMP
)
find_package
(
OpenMP
)
...
@@ -15,15 +14,9 @@ endif ()
...
@@ -15,15 +14,9 @@ endif ()
message
(
${
OpenMP_CXX_FLAGS
}
)
message
(
${
OpenMP_CXX_FLAGS
}
)
include_directories
(
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/nsg
)
include_directories
(
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/nsg
)
#include_directories(/home/zilliz/opt/app/pyenv/versions/3.6.8/include/python3.6m)
#include_directories(/home/zilliz/opt/app/pyenv/versions/3.6.8/envs/megasearch_testframework_dev/lib/python3.6/site-packages/numpy/core/include)
aux_source_directory
(
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/nsg nsg_src
)
aux_source_directory
(
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/nsg nsg_src
)
#add_library(nsg_raw SHARED ${nsg_src})
#target_link_libraries(nsg_raw
# gomp)
set
(
interface_src
set
(
interface_src
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/ivf.cpp
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/ivf.cpp
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/gpu_ivf.cpp
${
CORE_SOURCE_DIR
}
/src/knowhere/index/vector_index/gpu_ivf.cpp
...
@@ -43,10 +36,6 @@ if(NOT TARGET test_nsg)
...
@@ -43,10 +36,6 @@ if(NOT TARGET test_nsg)
${
nsg_src
}
${
nsg_src
}
)
)
endif
()
endif
()
#target_link_libraries(test_nsg
# # libprofiler.so
## -ltcmalloc
## gomp
# )
target_link_libraries
(
test_nsg
${
depend_libs
}
${
unittest_libs
}
${
basic_libs
}
)
target_link_libraries
(
test_nsg
${
depend_libs
}
${
unittest_libs
}
${
basic_libs
}
)
##############################
##############################
\ No newline at end of file
cpp/unittest/CMakeLists.txt
浏览文件 @
ea830ebc
...
@@ -6,8 +6,6 @@
...
@@ -6,8 +6,6 @@
link_directories
(
link_directories
(
"
${
CMAKE_BINARY_DIR
}
/lib"
"
${
CMAKE_BINARY_DIR
}
/lib"
)
)
#include_directories(${CMAKE_SOURCE_DIR}/src/core/include)
#include_directories(${CMAKE_SOURCE_DIR}/src/core/thirdparty/SPTAG/AnnService)
aux_source_directory
(
${
MILVUS_ENGINE_SRC
}
/db db_srcs
)
aux_source_directory
(
${
MILVUS_ENGINE_SRC
}
/db db_srcs
)
aux_source_directory
(
${
MILVUS_ENGINE_SRC
}
/config config_files
)
aux_source_directory
(
${
MILVUS_ENGINE_SRC
}
/config config_files
)
...
@@ -40,16 +38,13 @@ set(unittest_libs
...
@@ -40,16 +38,13 @@ set(unittest_libs
cudart
cudart
)
)
#message(STATUS "unittest core dir: ${CMAKE_CURRENT_BINARY_DIR}/core")
#add_subdirectory(${CMAKE_SOURCE_DIR}/src/core ${CMAKE_CURRENT_BINARY_DIR}/core)
foreach
(
dir
${
CORE_INCLUDE_DIRS
}
)
foreach
(
dir
${
CORE_INCLUDE_DIRS
}
)
message
(
"dir =
${
dir
}
"
)
include_directories
(
${
dir
}
)
include_directories
(
${
dir
}
)
endforeach
()
endforeach
()
add_subdirectory
(
server
)
add_subdirectory
(
server
)
add_subdirectory
(
db
)
add_subdirectory
(
db
)
#
add_subdirectory(knowhere)
add_subdirectory
(
knowhere
)
add_subdirectory
(
metrics
)
add_subdirectory
(
metrics
)
#add_subdirectory(scheduler)
add_subdirectory
(
scheduler
)
#add_subdirectory(storage)
add_subdirectory
(
storage
)
\ No newline at end of file
\ No newline at end of file
cpp/unittest/db/CMakeLists.txt
浏览文件 @
ea830ebc
...
@@ -35,8 +35,6 @@ link_directories("/usr/local/cuda/lib64")
...
@@ -35,8 +35,6 @@ link_directories("/usr/local/cuda/lib64")
include_directories
(
/usr/include/mysql
)
include_directories
(
/usr/include/mysql
)
#add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY)
set
(
db_test_src
set
(
db_test_src
${
config_files
}
${
config_files
}
${
cache_srcs
}
${
cache_srcs
}
...
@@ -69,25 +67,10 @@ set(db_libs
...
@@ -69,25 +67,10 @@ set(db_libs
set
(
knowhere_libs
set
(
knowhere_libs
knowhere
knowhere
# SPTAGLibStatic
# arrow
# jemalloc_pic
# faiss
# openblas
# lapack
# tbb
cudart
cudart
cublas
cublas
)
)
#if(${BUILD_FAISS_WITH_MKL} STREQUAL "ON")
# set(db_libs ${db_libs} ${MKL_LIBS} ${MKL_LIBS})
#else()
# set(db_libs ${db_libs}
# lapack
# openblas)
#endif()
target_link_libraries
(
db_test
${
db_libs
}
${
knowhere_libs
}
${
unittest_libs
}
)
target_link_libraries
(
db_test
${
db_libs
}
${
knowhere_libs
}
${
unittest_libs
}
)
install
(
TARGETS db_test DESTINATION unittest
)
install
(
TARGETS db_test DESTINATION unittest
)
...
...
cpp/unittest/knowhere/CMakeLists.txt
浏览文件 @
ea830ebc
...
@@ -8,13 +8,6 @@ set(helper
...
@@ -8,13 +8,6 @@ set(helper
set
(
knowhere_libs
set
(
knowhere_libs
knowhere
knowhere
# SPTAGLibStatic
# arrow
# jemalloc_pic
# faiss
# openblas
# lapack
# tbb
cudart
cudart
cublas
cublas
)
)
...
...
cpp/unittest/metrics/CMakeLists.txt
浏览文件 @
ea830ebc
#set(CURL_LIBRARY "-lcurl")
#find_package(CURL REQUIRED)
#INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR})
#
#INCLUDE_DIRECTORIES(~/development/lib/usr/local/include)
#LINK_DIRECTORIES(~/development/lib/usr/local/lib)
include_directories
(
../../src
)
include_directories
(
../../src
)
...
@@ -72,13 +62,6 @@ add_executable(metrics_test ${count_test_src} ${require_files} )
...
@@ -72,13 +62,6 @@ add_executable(metrics_test ${count_test_src} ${require_files} )
set
(
knowhere_libs
set
(
knowhere_libs
knowhere
knowhere
# SPTAGLibStatic
# arrow
# jemalloc_pic
# faiss
# openblas
# lapack
# tbb
)
)
target_link_libraries
(
metrics_test
target_link_libraries
(
metrics_test
...
@@ -96,12 +79,5 @@ target_link_libraries(metrics_test
...
@@ -96,12 +79,5 @@ target_link_libraries(metrics_test
mysqlpp
mysqlpp
${
unittest_libs
}
${
unittest_libs
}
)
)
#if(${BUILD_FAISS_WITH_MKL} STREQUAL "ON")
# target_link_libraries(metrics_test ${MKL_LIBS} ${MKL_LIBS})
#else()
# target_link_libraries(metrics_test
# lapack
# openblas)
#endif()
install
(
TARGETS metrics_test DESTINATION unittest
)
install
(
TARGETS metrics_test DESTINATION unittest
)
\ No newline at end of file
cpp/unittest/scheduler/CMakeLists.txt
浏览文件 @
ea830ebc
...
@@ -33,8 +33,6 @@ link_directories("/usr/local/cuda/lib64")
...
@@ -33,8 +33,6 @@ link_directories("/usr/local/cuda/lib64")
include_directories
(
/usr/include/mysql
)
include_directories
(
/usr/include/mysql
)
#add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY)
set
(
scheduler_test_src
set
(
scheduler_test_src
${
unittest_srcs
}
${
unittest_srcs
}
${
test_srcs
}
${
test_srcs
}
...
@@ -69,25 +67,10 @@ set(scheduler_libs
...
@@ -69,25 +67,10 @@ set(scheduler_libs
set
(
knowhere_libs
set
(
knowhere_libs
knowhere
knowhere
# SPTAGLibStatic
# arrow
# jemalloc_pic
# faiss
# openblas
# lapack
# tbb
cudart
cudart
cublas
cublas
)
)
#if (${BUILD_FAISS_WITH_MKL} STREQUAL "ON")
# set(db_libs ${db_libs} ${MKL_LIBS} ${MKL_LIBS})
#else ()
# set(db_libs ${db_libs}
# lapack
# openblas)
#endif ()
target_link_libraries
(
scheduler_test
${
scheduler_libs
}
${
knowhere_libs
}
${
unittest_libs
}
)
target_link_libraries
(
scheduler_test
${
scheduler_libs
}
${
knowhere_libs
}
${
unittest_libs
}
)
...
...
cpp/unittest/server/CMakeLists.txt
浏览文件 @
ea830ebc
...
@@ -34,9 +34,6 @@ cuda_add_executable(server_test
...
@@ -34,9 +34,6 @@ cuda_add_executable(server_test
set
(
require_libs
set
(
require_libs
knowhere
knowhere
# faiss
# openblas
# lapack
stdc++
stdc++
cudart
cudart
cublas
cublas
...
@@ -51,14 +48,6 @@ set(require_libs
...
@@ -51,14 +48,6 @@ set(require_libs
pthread
pthread
)
)
#if(${BUILD_FAISS_WITH_MKL} STREQUAL "ON")
# set(require_libs ${require_libs} ${MKL_LIBS} ${MKL_LIBS})
#else()
# set(require_libs ${require_libs}
# lapack
# openblas)
#endif()
target_link_libraries
(
server_test
target_link_libraries
(
server_test
${
require_libs
}
${
require_libs
}
${
cuda_library
}
${
cuda_library
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录