Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
0bac06a5
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,发现更多精彩内容 >>
未验证
提交
0bac06a5
编写于
3月 10, 2020
作者:
J
Jin Hai
提交者:
GitHub
3月 10, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1589 from tinkerlin/fix_1517
fix 1517
上级
8f127498
ff0aad81
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
17 deletion
+10
-17
CHANGELOG.md
CHANGELOG.md
+5
-0
core/src/index/knowhere/knowhere/index/vector_index/nsg/NSG.cpp
...rc/index/knowhere/knowhere/index/vector_index/nsg/NSG.cpp
+1
-15
core/src/index/unittest/test_nsg/test_nsg.cpp
core/src/index/unittest/test_nsg/test_nsg.cpp
+1
-1
core/src/wrapper/ConfAdapter.cpp
core/src/wrapper/ConfAdapter.cpp
+3
-1
未找到文件。
CHANGELOG.md
浏览文件 @
0bac06a5
...
...
@@ -14,6 +14,10 @@ Please mark all change in change log and use the issue from GitHub
-
\#
990 Check gpu resources setting when assign repeated value
-
\#
995 Table count set to 0 if no tables found
-
\#
1010 Improve error message when offset or page_size is equal 0
-
\#
1022 Check if partition name is valid
-
\#
1028 check if table exists when show partitions
-
\#
1029 check if table exists when try to delete partition
-
\#
1066 optimize http insert and search speed
-
\#
1022 Check if partition name is legal
-
\#
1028 Check if table exists when show partitions
-
\#
1029 Check if table exists when try to delete partition
...
...
@@ -36,6 +40,7 @@ Please mark all change in change log and use the issue from GitHub
-
\#
1507 set_config for insert_buffer_size is wrong
-
\#
1510 Add set interfaces for WAL configurations
-
\#
1511 Fix big integer cannot pass to server correctly
-
\#
1517 result is not correct when search vectors in multi partition, index type is RNSG
-
\#
1518 Table count did not match after deleting vectors and compact
-
\#
1521 Make cache_insert_data take effect in-service
-
\#
1525 Add setter API for config preload_table
...
...
core/src/index/knowhere/knowhere/index/vector_index/nsg/NSG.cpp
浏览文件 @
0bac06a5
...
...
@@ -698,13 +698,8 @@ NsgIndex::Search(const float* query, const unsigned& nq, const unsigned& dim, co
int64_t
*
ids
,
SearchParams
&
params
)
{
std
::
vector
<
std
::
vector
<
Neighbor
>>
resset
(
nq
);
if
(
k
>=
45
)
{
params
.
search_length
=
k
;
}
TimeRecorder
rc
(
"NsgIndex::search"
,
1
);
// TODO(linxj): when to use openmp
if
(
nq
<=
4
)
{
if
(
nq
==
1
)
{
GetNeighbors
(
query
,
resset
[
0
],
nsg
,
&
params
);
}
else
{
#pragma omp parallel for
...
...
@@ -733,15 +728,6 @@ NsgIndex::Search(const float* query, const unsigned& nq, const unsigned& dim, co
}
}
rc
.
RecordSection
(
"merge"
);
// ProfilerStart("xx.prof");
// std::vector<Neighbor> resset;
// GetNeighbors(query, resset, nsg, ¶ms);
// for (int i = 0; i < k; ++i) {
// ids[i] = resset[i].id;
// dist[i] = resset[i].distance;
//}
// ProfilerStop();
}
void
...
...
core/src/index/unittest/test_nsg/test_nsg.cpp
浏览文件 @
0bac06a5
...
...
@@ -233,7 +233,7 @@ TEST_F(NSGInterfaceTest, comparetest) {
// }
// }
// }
// printf("R@1 = %.4f\n", n_1 / float(nq));
// printf("R@1 = %.4f\n", n_1 / float(nq));
;
// printf("R@10 = %.4f\n", n_10 / float(nq));
// printf("R@100 = %.4f\n", n_100 / float(nq));
//}
...
...
core/src/wrapper/ConfAdapter.cpp
浏览文件 @
0bac06a5
...
...
@@ -225,7 +225,9 @@ NSGConfAdapter::CheckTrain(milvus::json& oricfg) {
// auto tune params
oricfg
[
knowhere
::
IndexParams
::
nlist
]
=
MatchNlist
(
oricfg
[
knowhere
::
meta
::
ROWS
].
get
<
int64_t
>
(),
8192
,
8192
);
oricfg
[
knowhere
::
IndexParams
::
nprobe
]
=
int
(
oricfg
[
knowhere
::
IndexParams
::
nlist
].
get
<
int64_t
>
()
*
0.01
);
int64_t
nprobe
=
int
(
oricfg
[
knowhere
::
IndexParams
::
nlist
].
get
<
int64_t
>
()
*
0.1
);
oricfg
[
knowhere
::
IndexParams
::
nprobe
]
=
nprobe
<
1
?
1
:
nprobe
;
return
true
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录