Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
ebb47ebb
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,发现更多精彩内容 >>
未验证
提交
ebb47ebb
编写于
11月 05, 2019
作者:
J
Jin Hai
提交者:
GitHub
11月 05, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #189 from JinHai-CN/0.5.2
Update default config and server version printout
上级
9afdc298
f2a64a12
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
18 addition
and
9 deletion
+18
-9
CHANGELOG.md
CHANGELOG.md
+1
-0
NOTICE.md
NOTICE.md
+0
-4
core/CMakeLists.txt
core/CMakeLists.txt
+2
-2
core/conf/server_config.template
core/conf/server_config.template
+1
-1
core/src/cache/Cache.h
core/src/cache/Cache.h
+11
-2
core/src/cache/CacheMgr.h
core/src/cache/CacheMgr.h
+3
-0
未找到文件。
CHANGELOG.md
浏览文件 @
ebb47ebb
...
...
@@ -9,6 +9,7 @@ Please mark all change in change log and use the ticket from JIRA.
## Feature
## Improvement
-
\#
190 - Update default config:use_blas_threshold to 1100 and server version printout to 0.52
## Task
...
...
NOTICE.md
浏览文件 @
ebb47ebb
...
...
@@ -8,20 +8,16 @@
| ------------- | ------------------------------------------------------------ |
| Apache Arrow |
[
Apache License 2.0
](
https://github.com/apache/arrow/blob/master/LICENSE.txt
)
|
| Boost |
[
Boost Software License
](
https://github.com/boostorg/boost/blob/master/LICENSE_1_0.txt
)
|
| BZip2 |
[
BZip2
](
http://www.bzip.org/
)
|
| FAISS |
[
MIT
](
https://github.com/facebookresearch/faiss/blob/master/LICENSE
)
|
| Gtest |
[
BSD 3-Clause
](
https://github.com/google/googletest/blob/master/LICENSE
)
|
| LAPACK |
[
LAPACK
](
https://github.com/Reference-LAPACK/lapack/blob/master/LICENSE
)
|
| LZ4 |
[
BSD 2-Clause
](
https://github.com/Blosc/c-blosc/blob/master/LICENSES/LZ4.txt
)
|
| MySQLPP |
[
LGPL 2.1
](
https://tangentsoft.com/mysqlpp/artifact/b128a66dab867923
)
|
| OpenBLAS |
[
BSD 3-Clause
](
https://github.com/xianyi/OpenBLAS/blob/develop/LICENSE
)
|
| Prometheus |
[
Apache License 2.0
](
https://github.com/prometheus/prometheus/blob/master/LICENSE
)
|
| Snappy |
[
BSD
](
https://github.com/google/snappy/blob/master/COPYING
)
|
| SQLite |
[
Public Domain
](
https://www.sqlite.org/copyright.html
)
|
| SQLite-ORM |
[
BSD 3-Clause
](
https://github.com/fnc12/sqlite_orm/blob/master/LICENSE
)
|
| yaml-cpp |
[
MIT
](
https://github.com/jbeder/yaml-cpp/blob/master/LICENSE
)
|
| ZLIB |
[
ZLIB
](
http://zlib.net/zlib_license.html
)
|
| ZSTD |
[
BSD
](
https://github.com/facebook/zstd/blob/dev/LICENSE
)
|
| libunwind |
[
MIT
](
https://github.com/libunwind/libunwind/blob/master/LICENSE
)
|
| gperftools |
[
BSD 3-Clause
](
https://github.com/gperftools/gperftools/blob/master/COPYING
)
|
| grpc |
[
Apache 2.0
](
https://github.com/grpc/grpc/blob/master/LICENSE
)
|
...
...
core/CMakeLists.txt
浏览文件 @
ebb47ebb
...
...
@@ -44,7 +44,7 @@ if(NOT GIT_BRANCH_NAME STREQUAL "")
string
(
REGEX REPLACE
"
\n
"
""
GIT_BRANCH_NAME
${
GIT_BRANCH_NAME
}
)
endif
()
set
(
MILVUS_VERSION
"
0.5.1
"
)
set
(
MILVUS_VERSION
"
${
GIT_BRANCH_NAME
}
"
)
string
(
REGEX MATCH
"[0-9]+
\\
.[0-9]+
\\
.[0-9]"
MILVUS_VERSION
"
${
MILVUS_VERSION
}
"
)
find_package
(
ClangTools
)
...
...
@@ -71,7 +71,7 @@ if(MILVUS_VERSION_MAJOR STREQUAL ""
OR MILVUS_VERSION_MINOR STREQUAL
""
OR MILVUS_VERSION_PATCH STREQUAL
""
)
message
(
WARNING
"Failed to determine Milvus version from git branch name"
)
set
(
MILVUS_VERSION
"0.5.
0
"
)
set
(
MILVUS_VERSION
"0.5.
2
"
)
endif
()
message
(
STATUS
"Build version =
${
MILVUS_VERSION
}
"
)
...
...
core/conf/server_config.template
浏览文件 @
ebb47ebb
...
...
@@ -34,7 +34,7 @@ cache_config:
cache_insert_data: false # whether to load inserted data into cache, must be a boolean
engine_config:
use_blas_threshold:
20
# if nq < use_blas_threshold, use SSE, faster with fluctuated response times
use_blas_threshold:
1100
# if nq < use_blas_threshold, use SSE, faster with fluctuated response times
# if nq >= use_blas_threshold, use OpenBlas, slower with stable response times
gpu_search_threshold: 1000 # threshold beyond which the search computation is executed on GPUs only
...
...
core/src/cache/Cache.h
浏览文件 @
ebb47ebb
...
...
@@ -40,12 +40,15 @@ class Cache {
return
usage_
;
}
// unit: BYTE
int64_t
capacity
()
const
{
return
capacity_
;
}
// unit: BYTE
}
// unit: BYTE
void
set_capacity
(
int64_t
capacity
);
// unit: BYTE
set_capacity
(
int64_t
capacity
);
double
freemem_percent
()
const
{
...
...
@@ -59,16 +62,22 @@ class Cache {
size_t
size
()
const
;
bool
exists
(
const
std
::
string
&
key
);
ItemObj
get
(
const
std
::
string
&
key
);
void
insert
(
const
std
::
string
&
key
,
const
ItemObj
&
item
);
void
erase
(
const
std
::
string
&
key
);
void
print
();
void
clear
();
...
...
core/src/cache/CacheMgr.h
浏览文件 @
ebb47ebb
...
...
@@ -53,13 +53,16 @@ class CacheMgr {
int64_t
CacheUsage
()
const
;
int64_t
CacheCapacity
()
const
;
void
SetCapacity
(
int64_t
capacity
);
protected:
CacheMgr
();
virtual
~
CacheMgr
();
protected:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录