Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
52698ebc
M
milvus
项目概览
milvus
/
milvus
11 个月 前同步成功
通知
260
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
52698ebc
编写于
2月 22, 2020
作者:
Y
yudong.cai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#1320 remove debug logging from faiss
Signed-off-by:
N
yudong.cai
<
yudong.cai@zilliz.com
>
上级
078825e9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
1 addition
and
15 deletion
+1
-15
CHANGELOG.md
CHANGELOG.md
+1
-0
core/src/index/thirdparty/faiss/gpu/impl/IVFFlat.cu
core/src/index/thirdparty/faiss/gpu/impl/IVFFlat.cu
+0
-15
未找到文件。
CHANGELOG.md
浏览文件 @
52698ebc
...
@@ -54,6 +54,7 @@ Please mark all change in change log and use the issue from GitHub
...
@@ -54,6 +54,7 @@ Please mark all change in change log and use the issue from GitHub
-
\#
1078 - Move 'insert_buffer_size' to Cache Config section
-
\#
1078 - Move 'insert_buffer_size' to Cache Config section
-
\#
1105 - Error message is not clear when creating IVFSQ8H index without gpu resources
-
\#
1105 - Error message is not clear when creating IVFSQ8H index without gpu resources
-
\#
741, #856, #879, #973, #1100, #1163, #1175, #1206, #1219, #1225, #1233, #1258, #1265, #1274, #1292, #1305 - Various fixes and improvements for Milvus documentation.
-
\#
741, #856, #879, #973, #1100, #1163, #1175, #1206, #1219, #1225, #1233, #1258, #1265, #1274, #1292, #1305 - Various fixes and improvements for Milvus documentation.
-
\#
1320 - Remove debug logging from faiss
## Task
## Task
...
...
core/src/index/thirdparty/faiss/gpu/impl/IVFFlat.cu
浏览文件 @
52698ebc
...
@@ -24,7 +24,6 @@
...
@@ -24,7 +24,6 @@
#include <thrust/host_vector.h>
#include <thrust/host_vector.h>
#include <unordered_map>
#include <unordered_map>
#include <numeric>
#include <numeric>
#include <chrono>
namespace
faiss
{
namespace
gpu
{
namespace
faiss
{
namespace
gpu
{
...
@@ -71,14 +70,11 @@ IVFFlat::copyCodeVectorsFromCpu(const float* vecs,
...
@@ -71,14 +70,11 @@ IVFFlat::copyCodeVectorsFromCpu(const float* vecs,
// list; the length is in sizeof(char)
// list; the length is in sizeof(char)
FAISS_ASSERT
(
deviceData_
->
size
()
+
lengthInBytes
<=
std
::
numeric_limits
<
int64_t
>::
max
());
FAISS_ASSERT
(
deviceData_
->
size
()
+
lengthInBytes
<=
std
::
numeric_limits
<
int64_t
>::
max
());
std
::
chrono
::
high_resolution_clock
::
time_point
time1
=
std
::
chrono
::
high_resolution_clock
::
now
();
deviceData_
->
append
((
unsigned
char
*
)
vecs
,
deviceData_
->
append
((
unsigned
char
*
)
vecs
,
lengthInBytes
,
lengthInBytes
,
stream
,
stream
,
true
/* exact reserved size */
);
true
/* exact reserved size */
);
std
::
chrono
::
high_resolution_clock
::
time_point
time2
=
std
::
chrono
::
high_resolution_clock
::
now
();
copyIndicesFromCpu_
(
indices
,
list_length
);
copyIndicesFromCpu_
(
indices
,
list_length
);
std
::
chrono
::
high_resolution_clock
::
time_point
time3
=
std
::
chrono
::
high_resolution_clock
::
now
();
maxListLength_
=
0
;
maxListLength_
=
0
;
size_t
listId
=
0
;
size_t
listId
=
0
;
...
@@ -97,7 +93,6 @@ IVFFlat::copyCodeVectorsFromCpu(const float* vecs,
...
@@ -97,7 +93,6 @@ IVFFlat::copyCodeVectorsFromCpu(const float* vecs,
pos
+=
size
;
pos
+=
size
;
++
listId
;
++
listId
;
}
}
std
::
chrono
::
high_resolution_clock
::
time_point
time4
=
std
::
chrono
::
high_resolution_clock
::
now
();
deviceListDataPointers_
=
hostPointers
;
deviceListDataPointers_
=
hostPointers
;
...
@@ -106,16 +101,6 @@ IVFFlat::copyCodeVectorsFromCpu(const float* vecs,
...
@@ -106,16 +101,6 @@ IVFFlat::copyCodeVectorsFromCpu(const float* vecs,
if
(
stream
!=
0
)
{
if
(
stream
!=
0
)
{
streamWait
({
stream
},
{
0
});
streamWait
({
stream
},
{
0
});
}
}
std
::
chrono
::
high_resolution_clock
::
time_point
time5
=
std
::
chrono
::
high_resolution_clock
::
now
();
double
span1
=
(
std
::
chrono
::
duration
<
double
,
std
::
micro
>
(
time2
-
time1
)).
count
();
double
span2
=
(
std
::
chrono
::
duration
<
double
,
std
::
micro
>
(
time3
-
time2
)).
count
();
double
span3
=
(
std
::
chrono
::
duration
<
double
,
std
::
micro
>
(
time4
-
time3
)).
count
();
double
span4
=
(
std
::
chrono
::
duration
<
double
,
std
::
micro
>
(
time5
-
time4
)).
count
();
std
::
cout
<<
"Span1: "
<<
span1
*
0.001
<<
"ms"
<<
std
::
endl
;
std
::
cout
<<
"Span2: "
<<
span2
*
0.001
<<
"ms"
<<
std
::
endl
;
std
::
cout
<<
"Span3: "
<<
span3
*
0.001
<<
"ms"
<<
std
::
endl
;
std
::
cout
<<
"Span4: "
<<
span4
*
0.001
<<
"ms"
<<
std
::
endl
;
}
}
void
void
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录