Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
bee37170
milvus
项目概览
BaiXuePrincess
/
milvus
与 Fork 源项目一致
Fork自
milvus / milvus
通知
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,发现更多精彩内容 >>
提交
bee37170
编写于
12月 02, 2019
作者:
Y
Yukikaze-CZR
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
IP search metric_type shouldn't be supported by IVF_PQ index on GPU version #616 #636
上级
41f3604e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
21 addition
and
0 deletion
+21
-0
CHANGELOG.md
CHANGELOG.md
+2
-0
core/src/index/knowhere/knowhere/index/vector_index/IndexGPUIVFPQ.cpp
...ex/knowhere/knowhere/index/vector_index/IndexGPUIVFPQ.cpp
+4
-0
core/src/wrapper/gpu/GPUVecImpl.cpp
core/src/wrapper/gpu/GPUVecImpl.cpp
+2
-0
core/unittest/db/test_db.cpp
core/unittest/db/test_db.cpp
+13
-0
未找到文件。
CHANGELOG.md
浏览文件 @
bee37170
...
...
@@ -43,7 +43,9 @@ Please mark all change in change log and use the ticket from JIRA.
-
\#
599 - Build index log is incorrect
-
\#
602 - Optimizer specify wrong gpu_id
-
\#
606 - No log generated during building index with CPU
-
\#
616 - IP search metric_type is not supported by IVF_PQ index
-
\#
631 - FAISS isn't compiled with O3 option
-
\#
636 - [CPU] Create index PQ should be failed if table metric type set Inner Product
## Feature
-
\#
12 - Pure CPU version for Milvus
...
...
core/src/index/knowhere/knowhere/index/vector_index/IndexGPUIVFPQ.cpp
浏览文件 @
bee37170
...
...
@@ -32,6 +32,10 @@ namespace knowhere {
IndexModelPtr
GPUIVFPQ
::
Train
(
const
DatasetPtr
&
dataset
,
const
Config
&
config
)
{
auto
build_cfg
=
std
::
dynamic_pointer_cast
<
IVFPQCfg
>
(
config
);
if
(
build_cfg
->
metric_type
==
knowhere
::
METRICTYPE
::
IP
)
{
KNOWHERE_LOG_ERROR
<<
"PQ not support IP in GPU version!"
;
throw
KnowhereException
(
"PQ not support IP in GPU version!"
);
}
if
(
build_cfg
!=
nullptr
)
{
build_cfg
->
CheckValid
();
// throw exception
}
...
...
core/src/wrapper/gpu/GPUVecImpl.cpp
浏览文件 @
bee37170
...
...
@@ -16,6 +16,7 @@
// under the License.
#include "wrapper/gpu/GPUVecImpl.h"
#include <src/wrapper/WrapperException.h>
#include "knowhere/common/Exception.h"
#include "knowhere/index/vector_index/IndexGPUIDMAP.h"
#include "knowhere/index/vector_index/IndexGPUIVF.h"
...
...
@@ -58,6 +59,7 @@ IVFMixIndex::BuildAll(const int64_t& nb, const float* xb, const int64_t* ids, co
}
}
catch
(
knowhere
::
KnowhereException
&
e
)
{
WRAPPER_LOG_ERROR
<<
e
.
what
();
throw
WrapperException
(
e
.
what
());
return
Status
(
KNOWHERE_UNEXPECTED_ERROR
,
e
.
what
());
}
catch
(
std
::
exception
&
e
)
{
WRAPPER_LOG_ERROR
<<
e
.
what
();
...
...
core/unittest/db/test_db.cpp
浏览文件 @
bee37170
...
...
@@ -336,6 +336,19 @@ TEST_F(DBTest, SEARCH_TEST) {
}
#endif
index
.
engine_type_
=
(
int
)
milvus
::
engine
::
EngineType
::
FAISS_PQ
;
db_
->
CreateIndex
(
TABLE_NAME
,
index
);
// wait until build index finish
{
std
::
vector
<
std
::
string
>
tags
;
milvus
::
engine
::
ResultIds
result_ids
;
milvus
::
engine
::
ResultDistances
result_distances
;
stat
=
db_
->
Query
(
TABLE_NAME
,
tags
,
k
,
nq
,
10
,
xq
.
data
(),
result_ids
,
result_distances
);
ASSERT_TRUE
(
stat
.
ok
());
stat
=
db_
->
Query
(
TABLE_NAME
,
tags
,
k
,
1100
,
10
,
xq
.
data
(),
result_ids
,
result_distances
);
ASSERT_TRUE
(
stat
.
ok
());
}
{
// search by specify index file
milvus
::
engine
::
meta
::
DatesT
dates
;
std
::
vector
<
std
::
string
>
file_ids
=
{
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录