Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
c6e88810
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,发现更多精彩内容 >>
提交
c6e88810
编写于
7月 27, 2019
作者:
X
xj.lin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MS-288 update build stage
Former-commit-id: 99c3abf0600f683eb70fe1de4ada7f11f9e65e3a
上级
e4931b78
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
20 addition
and
4 deletion
+20
-4
cpp/CHANGELOG.md
cpp/CHANGELOG.md
+1
-0
cpp/CMakeLists.txt
cpp/CMakeLists.txt
+8
-0
cpp/build.sh
cpp/build.sh
+7
-0
cpp/cmake/DefineOptions.cmake
cpp/cmake/DefineOptions.cmake
+1
-1
cpp/src/CMakeLists.txt
cpp/src/CMakeLists.txt
+2
-2
cpp/thirdparty/knowhere
cpp/thirdparty/knowhere
+1
-1
未找到文件。
cpp/CHANGELOG.md
浏览文件 @
c6e88810
...
...
@@ -21,6 +21,7 @@ Please mark all change in change log and use the ticket from JIRA.
-
MS-235 - Some test cases random fail
-
MS-236 - Add MySQLMetaImpl::HasNonIndexFiles
-
MS-257 - Update bzip2 download url
-
MS-288 - Update compile scripts
## Improvement
-
MS-156 - Add unittest for merge result functions
...
...
cpp/CMakeLists.txt
浏览文件 @
c6e88810
...
...
@@ -109,6 +109,14 @@ include(ThirdPartyPackages)
include_directories
(
${
MILVUS_SOURCE_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
set
(
MILVUS_ENGINE_INCLUDE
${
PROJECT_SOURCE_DIR
}
/include
)
...
...
cpp/build.sh
浏览文件 @
c6e88810
...
...
@@ -75,6 +75,12 @@ if [[ ! -d cmake_build ]]; then
MAKE_CLEAN
=
"ON"
fi
# Build Knowhere
KNOWHERE_BUILD_DIR
=
"
`
pwd
`
/thirdparty/knowhere_build"
pushd
`
pwd
`
/thirdparty/knowhere
./build.sh
-t
Release
-p
${
KNOWHERE_BUILD_DIR
}
popd
cd
cmake_build
CUDA_COMPILER
=
/usr/local/cuda/bin/nvcc
...
...
@@ -89,6 +95,7 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then
-DMILVUS_DB_PATH=
${
DB_PATH
}
\
-DMILVUS_ENABLE_PROFILING=
${
PROFILING
}
\
-DBUILD_FAISS_WITH_MKL=
${
BUILD_FAISS_WITH_MKL
}
\
-DKNOWHERE_BUILD_DIR=
${
KNOWHERE_BUILD_DIR
}
\
$@
../"
echo
${
CMAKE_CMD
}
...
...
cpp/cmake/DefineOptions.cmake
浏览文件 @
c6e88810
...
...
@@ -96,7 +96,7 @@ define_option(MILVUS_WITH_YAMLCPP "Build with yaml-cpp library" ON)
define_option
(
MILVUS_WITH_ZLIB
"Build with zlib compression"
ON
)
define_option
(
MILVUS_WITH_KNOWHERE
"Build with Knowhere"
O
N
)
define_option
(
MILVUS_WITH_KNOWHERE
"Build with Knowhere"
O
FF
)
if
(
CMAKE_VERSION VERSION_LESS 3.7
)
set
(
MILVUS_WITH_ZSTD_DEFAULT OFF
)
...
...
cpp/src/CMakeLists.txt
浏览文件 @
c6e88810
...
...
@@ -225,8 +225,8 @@ endif ()
install
(
TARGETS milvus_server DESTINATION bin
)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/knowhere_ep-prefix/src/knowhere_ep
/lib/
${
CMAKE_SHARED_LIBRARY_PREFIX
}
tbb
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
${
CMAKE_BINARY_DIR
}
/knowhere_ep-prefix/src/knowhere_ep
/lib/
${
CMAKE_SHARED_LIBRARY_PREFIX
}
tbb
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
.2
${
KNOWHERE_BUILD_DIR
}
/lib/
${
CMAKE_SHARED_LIBRARY_PREFIX
}
tbb
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
${
KNOWHERE_BUILD_DIR
}
/lib/
${
CMAKE_SHARED_LIBRARY_PREFIX
}
tbb
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
.2
${
CMAKE_BINARY_DIR
}
/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/
${
CMAKE_SHARED_LIBRARY_PREFIX
}
mysqlpp
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
${
CMAKE_BINARY_DIR
}
/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/
${
CMAKE_SHARED_LIBRARY_PREFIX
}
mysqlpp
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
.3
${
CMAKE_BINARY_DIR
}
/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/
${
CMAKE_SHARED_LIBRARY_PREFIX
}
mysqlpp
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
.3.2.4
...
...
knowhere
@
02550a43
Subproject commit
81b28a753fc47b46364afa7b9414e249c4b2cd75
Subproject commit
02550a43b5146bd7976b8b2b3fc37ca885d1e880
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录