Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
2fcf2855
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,发现更多精彩内容 >>
未验证
提交
2fcf2855
编写于
4月 01, 2020
作者:
X
Xiaohai Xu
提交者:
GitHub
4月 01, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix sq8h deletion (#1830)
Signed-off-by:
N
sahuang
<
xiaohai.xu@zilliz.com
>
上级
a15124d6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
14 deletion
+18
-14
core/src/index/thirdparty/faiss/gpu/GpuIndexIVFSQHybrid.cu
core/src/index/thirdparty/faiss/gpu/GpuIndexIVFSQHybrid.cu
+8
-3
core/src/index/unittest/test_ivf.cpp
core/src/index/unittest/test_ivf.cpp
+8
-10
core/src/server/delivery/request/DeleteByIDRequest.cpp
core/src/server/delivery/request/DeleteByIDRequest.cpp
+2
-1
未找到文件。
core/src/index/thirdparty/faiss/gpu/GpuIndexIVFSQHybrid.cu
浏览文件 @
2fcf2855
...
...
@@ -340,9 +340,14 @@ GpuIndexIVFSQHybrid::searchImpl_(int n,
static_assert
(
sizeof
(
long
)
==
sizeof
(
Index
::
idx_t
),
"size mismatch"
);
Tensor
<
long
,
2
,
true
>
outLabels
(
const_cast
<
long
*>
(
labels
),
{
n
,
k
});
auto
bitsetDevice
=
toDevice
<
uint8_t
,
1
>
(
resources_
,
device_
,
nullptr
,
stream
,
{
0
});
index_
->
query
(
queries
,
bitsetDevice
,
nprobe
,
k
,
outDistances
,
outLabels
);
if
(
!
bitset
)
{
auto
bitsetDevice
=
toDevice
<
uint8_t
,
1
>
(
resources_
,
device_
,
nullptr
,
stream
,
{
0
});
index_
->
query
(
queries
,
bitsetDevice
,
nprobe
,
k
,
outDistances
,
outLabels
);
}
else
{
auto
bitsetDevice
=
toDevice
<
uint8_t
,
1
>
(
resources_
,
device_
,
const_cast
<
uint8_t
*>
(
bitset
->
data
()),
stream
,{(
int
)
bitset
->
size
()});
index_
->
query
(
queries
,
bitsetDevice
,
nprobe
,
k
,
outDistances
,
outLabels
);
}
}
}
}
// namespace
core/src/index/unittest/test_ivf.cpp
浏览文件 @
2fcf2855
...
...
@@ -166,17 +166,15 @@ TEST_P(IVFTest, ivf_basic_gpu) {
AssertAnns
(
result
,
nq
,
k
);
// PrintResult(result, nq, k);
if
(
index_type_
!=
milvus
::
knowhere
::
IndexEnum
::
INDEX_FAISS_IVFSQ8H
)
{
faiss
::
ConcurrentBitsetPtr
concurrent_bitset_ptr
=
std
::
make_shared
<
faiss
::
ConcurrentBitset
>
(
nb
);
for
(
int64_t
i
=
0
;
i
<
nq
;
++
i
)
{
concurrent_bitset_ptr
->
set
(
i
);
}
index_
->
SetBlacklist
(
concurrent_bitset_ptr
);
auto
result_bs_1
=
index_
->
Query
(
query_dataset
,
conf_
);
AssertAnns
(
result_bs_1
,
nq
,
k
,
CheckMode
::
CHECK_NOT_EQUAL
);
// PrintResult(result, nq, k);
faiss
::
ConcurrentBitsetPtr
concurrent_bitset_ptr
=
std
::
make_shared
<
faiss
::
ConcurrentBitset
>
(
nb
);
for
(
int64_t
i
=
0
;
i
<
nq
;
++
i
)
{
concurrent_bitset_ptr
->
set
(
i
);
}
index_
->
SetBlacklist
(
concurrent_bitset_ptr
);
auto
result_bs_1
=
index_
->
Query
(
query_dataset
,
conf_
);
AssertAnns
(
result_bs_1
,
nq
,
k
,
CheckMode
::
CHECK_NOT_EQUAL
);
// PrintResult(result, nq, k);
#ifdef MILVUS_GPU_VERSION
milvus
::
knowhere
::
FaissGpuResourceMgr
::
GetInstance
().
Dump
();
...
...
core/src/server/delivery/request/DeleteByIDRequest.cpp
浏览文件 @
2fcf2855
...
...
@@ -75,7 +75,8 @@ DeleteByIDRequest::OnExecute() {
table_schema
.
engine_type_
!=
(
int32_t
)
engine
::
EngineType
::
FAISS_IVFFLAT
&&
table_schema
.
engine_type_
!=
(
int32_t
)
engine
::
EngineType
::
FAISS_BIN_IVFFLAT
&&
table_schema
.
engine_type_
!=
(
int32_t
)
engine
::
EngineType
::
FAISS_IVFSQ8
&&
table_schema
.
engine_type_
!=
(
int32_t
)
engine
::
EngineType
::
FAISS_PQ
)
{
table_schema
.
engine_type_
!=
(
int32_t
)
engine
::
EngineType
::
FAISS_PQ
&&
table_schema
.
engine_type_
!=
(
int32_t
)
engine
::
EngineType
::
FAISS_IVFSQ8H
)
{
std
::
string
err_msg
=
"Index type "
+
std
::
to_string
(
table_schema
.
engine_type_
)
+
" does not support delete operation"
;
SERVER_LOG_ERROR
<<
err_msg
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录