Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
ec9afe5c
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,发现更多精彩内容 >>
提交
ec9afe5c
编写于
6月 11, 2019
作者:
Z
zhiru
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake: change prometheus source to git
Former-commit-id: ee0b45452cd7a5d695cabc31ab833b86a05c87ce
上级
f5066e41
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
13 deletion
+23
-13
cpp/CHANGELOG.md
cpp/CHANGELOG.md
+1
-0
cpp/cmake/ThirdPartyPackages.cmake
cpp/cmake/ThirdPartyPackages.cmake
+14
-4
cpp/src/CMakeLists.txt
cpp/src/CMakeLists.txt
+6
-7
cpp/thirdparty/versions.txt
cpp/thirdparty/versions.txt
+2
-2
未找到文件。
cpp/CHANGELOG.md
浏览文件 @
ec9afe5c
...
@@ -15,6 +15,7 @@ Please mark all change in change log and use the ticket from JIRA.
...
@@ -15,6 +15,7 @@ Please mark all change in change log and use the ticket from JIRA.
-
MS-64 - Different table can have different index type
-
MS-64 - Different table can have different index type
-
MS-52 - Return search score
-
MS-52 - Return search score
-
MS-66 - Support time range query
-
MS-66 - Support time range query
-
MS-72 - cmake: change prometheus source to git
## Task
## Task
...
...
cpp/cmake/ThirdPartyPackages.cmake
浏览文件 @
ec9afe5c
...
@@ -253,7 +253,8 @@ if (DEFINED ENV{MEGASEARCH_PROMETHEUS_URL})
...
@@ -253,7 +253,8 @@ if (DEFINED ENV{MEGASEARCH_PROMETHEUS_URL})
set
(
PROMETHEUS_SOURCE_URL
"$ENV{PROMETHEUS_OPENBLAS_URL}"
)
set
(
PROMETHEUS_SOURCE_URL
"$ENV{PROMETHEUS_OPENBLAS_URL}"
)
else
()
else
()
set
(
PROMETHEUS_SOURCE_URL
set
(
PROMETHEUS_SOURCE_URL
"https://github.com/JinHai-CN/prometheus-cpp/archive/
${
PROMETHEUS_VERSION
}
.tar.gz"
)
#"https://github.com/JinHai-CN/prometheus-cpp/archive/${PROMETHEUS_VERSION}.tar.gz"
https://github.com/jupp0r/prometheus-cpp.git
)
endif
()
endif
()
if
(
DEFINED ENV{MEGASEARCH_ROCKSDB_URL}
)
if
(
DEFINED ENV{MEGASEARCH_ROCKSDB_URL}
)
...
@@ -929,11 +930,20 @@ macro(build_prometheus)
...
@@ -929,11 +930,20 @@ macro(build_prometheus)
${
EP_COMMON_CMAKE_ARGS
}
${
EP_COMMON_CMAKE_ARGS
}
-DCMAKE_INSTALL_LIBDIR=lib
-DCMAKE_INSTALL_LIBDIR=lib
-DBUILD_SHARED_LIBS=OFF
-DBUILD_SHARED_LIBS=OFF
"-DCMAKE_INSTALL_PREFIX=
${
PROMETHEUS_PREFIX
}
"
)
"-DCMAKE_INSTALL_PREFIX=
${
PROMETHEUS_PREFIX
}
"
-DCMAKE_BUILD_TYPE=Release
)
externalproject_add
(
prometheus_ep
externalproject_add
(
prometheus_ep
URL
GIT_REPOSITORY
${
PROMETHEUS_SOURCE_URL
}
${
PROMETHEUS_SOURCE_URL
}
GIT_TAG
${
PROMETHEUS_VERSION
}
GIT_SHALLOW
TRUE
# GIT_CONFIG
# recurse-submodules=true
# URL
# ${PROMETHEUS_SOURCE_URL}
${
EP_LOG_OPTIONS
}
${
EP_LOG_OPTIONS
}
CMAKE_ARGS
CMAKE_ARGS
${
PROMETHEUS_CMAKE_ARGS
}
${
PROMETHEUS_CMAKE_ARGS
}
...
@@ -991,7 +1001,7 @@ if(MEGASEARCH_WITH_PROMETHEUS)
...
@@ -991,7 +1001,7 @@ if(MEGASEARCH_WITH_PROMETHEUS)
link_directories
(
SYSTEM
${
PROMETHEUS_PREFIX
}
/core/
)
link_directories
(
SYSTEM
${
PROMETHEUS_PREFIX
}
/core/
)
include_directories
(
SYSTEM
${
PROMETHEUS_PREFIX
}
/core/include
)
include_directories
(
SYSTEM
${
PROMETHEUS_PREFIX
}
/core/include
)
link_directories
(
${
PROMETHEUS_PREFIX
}
/civetweb_ep-prefix/src/civetweb_ep
)
#
link_directories(${PROMETHEUS_PREFIX}/civetweb_ep-prefix/src/civetweb_ep)
endif
()
endif
()
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
...
...
cpp/src/CMakeLists.txt
浏览文件 @
ec9afe5c
...
@@ -84,7 +84,6 @@ set(third_party_libs
...
@@ -84,7 +84,6 @@ set(third_party_libs
prometheus-cpp-push
prometheus-cpp-push
prometheus-cpp-pull
prometheus-cpp-pull
prometheus-cpp-core
prometheus-cpp-core
civetweb
boost_system_static
boost_system_static
boost_filesystem_static
boost_filesystem_static
boost_serialization_static
boost_serialization_static
...
@@ -153,14 +152,14 @@ if (ENABLE_LICENSE STREQUAL "ON")
...
@@ -153,14 +152,14 @@ if (ENABLE_LICENSE STREQUAL "ON")
target_link_libraries
(
vecwise_license
${
license_libs
}
${
third_party_libs
}
)
target_link_libraries
(
vecwise_license
${
license_libs
}
${
third_party_libs
}
)
endif
()
endif
()
#
set(metrics_lib
set
(
metrics_lib
# libprometheus-cpp-push.a
prometheus-cpp-push
# libprometheus-cpp-pull.a
prometheus-cpp-pull
# libprometheus-cpp-core.a
prometheus-cpp-core
#
)
)
#add_library(vecwise_engine STATIC ${metrics_files} )
#add_library(vecwise_engine STATIC ${metrics_files} )
#
target_link_libraries(metrics ${metrics_lib})
target_link_libraries
(
metrics
${
metrics_lib
}
)
set
(
server_libs
set
(
server_libs
vecwise_engine
vecwise_engine
...
...
cpp/thirdparty/versions.txt
浏览文件 @
ec9afe5c
...
@@ -31,7 +31,7 @@ GTEST_VERSION=1.8.1
...
@@ -31,7 +31,7 @@ GTEST_VERSION=1.8.1
LAPACK_VERSION=v3.8.0
LAPACK_VERSION=v3.8.0
LZ4_VERSION=v1.9.1
LZ4_VERSION=v1.9.1
OPENBLAS_VERSION=v0.3.6
OPENBLAS_VERSION=v0.3.6
PROMETHEUS_VERSION=
master
PROMETHEUS_VERSION=
v0.7.0
ROCKSDB_VERSION=v6.0.2
ROCKSDB_VERSION=v6.0.2
SNAPPY_VERSION=1.1.7
SNAPPY_VERSION=1.1.7
SQLITE_VERSION=3280000
SQLITE_VERSION=3280000
...
@@ -54,7 +54,7 @@ DEPENDENCIES=(
...
@@ -54,7 +54,7 @@ DEPENDENCIES=(
"MEGASEARCH_LAPACK_URL lapack-${LAPACK_VERSION}.tar.gz https://github.com/Reference-LAPACK/lapack/archive/${LAPACK_VERSION}.tar.gz
"MEGASEARCH_LAPACK_URL lapack-${LAPACK_VERSION}.tar.gz https://github.com/Reference-LAPACK/lapack/archive/${LAPACK_VERSION}.tar.gz
"MEGASEARCH_LZ4_URL lz4-${LZ4_VERSION}.tar.gz https://github.com/lz4/lz4/archive/${LZ4_VERSION}.tar.gz"
"MEGASEARCH_LZ4_URL lz4-${LZ4_VERSION}.tar.gz https://github.com/lz4/lz4/archive/${LZ4_VERSION}.tar.gz"
"MEGASEARCH_OPENBLAS_URL openblas-${OPENBLAS_VERSION}.tar.gz https://github.com/xianyi/OpenBLAS/archive/${OPENBLAS_VERSION}.tar.gz"
"MEGASEARCH_OPENBLAS_URL openblas-${OPENBLAS_VERSION}.tar.gz https://github.com/xianyi/OpenBLAS/archive/${OPENBLAS_VERSION}.tar.gz"
"MEGASEARCH_PROMETHEUS_URL
prometheus-${PROMETHEUS_VERSION}.tar.gz https://github.com/JinHai-CN/prometheus-cpp/archive/${PROMETHEUS_VERSION}.tar.gz
"
"MEGASEARCH_PROMETHEUS_URL
https://github.com/jupp0r/prometheus-cpp.git
"
"MEGASEARCH_ROCKSDB_URL rocksdb-${ROCKSDB_VERSION}.tar.gz https://github.com/facebook/rocksdb/archive/${ROCKSDB_VERSION}.tar.gz"
"MEGASEARCH_ROCKSDB_URL rocksdb-${ROCKSDB_VERSION}.tar.gz https://github.com/facebook/rocksdb/archive/${ROCKSDB_VERSION}.tar.gz"
"MEGASEARCH_SNAPPY_URL snappy-${SNAPPY_VERSION}.tar.gz https://github.com/google/snappy/archive/${SNAPPY_VERSION}.tar.gz"
"MEGASEARCH_SNAPPY_URL snappy-${SNAPPY_VERSION}.tar.gz https://github.com/google/snappy/archive/${SNAPPY_VERSION}.tar.gz"
"MEGASEARCH_SQLITE_URL sqlite-autoconf-${SQLITE_VERSION}.tar.gz https://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_VERSION}.tar.gz"
"MEGASEARCH_SQLITE_URL sqlite-autoconf-${SQLITE_VERSION}.tar.gz https://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_VERSION}.tar.gz"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录