Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
e6390486
M
milvus
项目概览
milvus
/
milvus
大约 1 年 前同步成功
通知
261
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,发现更多精彩内容 >>
未验证
提交
e6390486
编写于
5月 10, 2020
作者:
C
Cai Yudong
提交者:
GitHub
5月 10, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update debug log (#2275)
Signed-off-by:
N
yudong.cai
<
yudong.cai@zilliz.com
>
上级
a37f9b07
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
29 addition
and
38 deletion
+29
-38
core/src/scheduler/selector/BuildIndexPass.cpp
core/src/scheduler/selector/BuildIndexPass.cpp
+3
-7
core/src/scheduler/selector/BuildIndexPass.h
core/src/scheduler/selector/BuildIndexPass.h
+1
-1
core/src/scheduler/selector/FaissFlatPass.cpp
core/src/scheduler/selector/FaissFlatPass.cpp
+4
-5
core/src/scheduler/selector/FaissFlatPass.h
core/src/scheduler/selector/FaissFlatPass.h
+1
-1
core/src/scheduler/selector/FaissIVFFlatPass.cpp
core/src/scheduler/selector/FaissIVFFlatPass.cpp
+4
-5
core/src/scheduler/selector/FaissIVFFlatPass.h
core/src/scheduler/selector/FaissIVFFlatPass.h
+1
-1
core/src/scheduler/selector/FaissIVFPQPass.cpp
core/src/scheduler/selector/FaissIVFPQPass.cpp
+4
-5
core/src/scheduler/selector/FaissIVFPQPass.h
core/src/scheduler/selector/FaissIVFPQPass.h
+1
-1
core/src/scheduler/selector/FaissIVFSQ8HPass.cpp
core/src/scheduler/selector/FaissIVFSQ8HPass.cpp
+4
-5
core/src/scheduler/selector/FaissIVFSQ8HPass.h
core/src/scheduler/selector/FaissIVFSQ8HPass.h
+1
-1
core/src/scheduler/selector/FaissIVFSQ8Pass.cpp
core/src/scheduler/selector/FaissIVFSQ8Pass.cpp
+4
-5
core/src/scheduler/selector/FaissIVFSQ8Pass.h
core/src/scheduler/selector/FaissIVFSQ8Pass.h
+1
-1
未找到文件。
core/src/scheduler/selector/BuildIndexPass.cpp
浏览文件 @
e6390486
...
...
@@ -47,13 +47,9 @@ BuildIndexPass::Run(const TaskPtr& task) {
LOG_SERVER_WARNING_
<<
"BuildIndexPass cannot get build index gpu!"
;
return
false
;
}
if
(
specified_gpu_id_
>=
build_gpus_
.
size
())
{
specified_gpu_id_
=
specified_gpu_id_
%
build_gpus_
.
size
();
}
LOG_SERVER_DEBUG_
<<
"Specify gpu"
<<
specified_gpu_id_
<<
" to build index!"
;
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
ResourceType
::
GPU
,
build_gpus_
[
specified_gpu_id_
]);
specified_gpu_id_
=
(
specified_gpu_id_
+
1
)
%
build_gpus_
.
size
();
LOG_SERVER_DEBUG_
<<
"Specify gpu"
<<
build_gpus_
[
idx_
]
<<
" to build index!"
;
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
ResourceType
::
GPU
,
build_gpus_
[
idx_
]);
idx_
=
(
idx_
+
1
)
%
build_gpus_
.
size
();
}
auto
label
=
std
::
make_shared
<
SpecResLabel
>
(
std
::
weak_ptr
<
Resource
>
(
res_ptr
));
...
...
core/src/scheduler/selector/BuildIndexPass.h
浏览文件 @
e6390486
...
...
@@ -40,7 +40,7 @@ class BuildIndexPass : public Pass, public server::GpuResourceConfigHandler {
Run
(
const
TaskPtr
&
task
)
override
;
private:
uint64_t
specified_gpu_id
_
=
0
;
uint64_t
idx
_
=
0
;
};
using
BuildIndexPassPtr
=
std
::
shared_ptr
<
BuildIndexPass
>
;
...
...
core/src/scheduler/selector/FaissFlatPass.cpp
浏览文件 @
e6390486
...
...
@@ -61,11 +61,10 @@ FaissFlatPass::Run(const TaskPtr& task) {
"search"
,
0
);
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
"cpu"
);
}
else
{
auto
best_device_id
=
count_
%
search_gpus_
.
size
();
LOG_SERVER_DEBUG_
<<
LogOut
(
"[%s][%d] FaissFlatPass: nq > gpu_search_threshold, specify gpu %d to search!"
,
"search"
,
0
,
best_device_id
);
++
count_
;
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
ResourceType
::
GPU
,
search_gpus_
[
best_device_id
]);
LOG_SERVER_DEBUG_
<<
LogOut
(
"[%s][%d] FaissFlatPass: nq >= gpu_search_threshold, specify gpu %d to search!"
,
"search"
,
0
,
search_gpus_
[
idx_
]);
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
ResourceType
::
GPU
,
search_gpus_
[
idx_
]);
idx_
=
(
idx_
+
1
)
%
search_gpus_
.
size
();
}
auto
label
=
std
::
make_shared
<
SpecResLabel
>
(
res_ptr
);
task
->
label
()
=
label
;
...
...
core/src/scheduler/selector/FaissFlatPass.h
浏览文件 @
e6390486
...
...
@@ -41,7 +41,7 @@ class FaissFlatPass : public Pass, public server::GpuResourceConfigHandler {
Run
(
const
TaskPtr
&
task
)
override
;
private:
int64_t
count
_
=
0
;
int64_t
idx
_
=
0
;
};
using
FaissFlatPassPtr
=
std
::
shared_ptr
<
FaissFlatPass
>
;
...
...
core/src/scheduler/selector/FaissIVFFlatPass.cpp
浏览文件 @
e6390486
...
...
@@ -62,11 +62,10 @@ FaissIVFFlatPass::Run(const TaskPtr& task) {
"search"
,
0
);
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
"cpu"
);
}
else
{
auto
best_device_id
=
count_
%
search_gpus_
.
size
();
LOG_SERVER_DEBUG_
<<
LogOut
(
"[%s][%d] FaissIVFFlatPass: nq > gpu_search_threshold, specify gpu %d to search!"
,
"search"
,
0
,
best_device_id
);
count_
++
;
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
ResourceType
::
GPU
,
search_gpus_
[
best_device_id
]);
LOG_SERVER_DEBUG_
<<
LogOut
(
"[%s][%d] FaissIVFFlatPass: nq >= gpu_search_threshold, specify gpu %d to search!"
,
"search"
,
0
,
search_gpus_
[
idx_
]);
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
ResourceType
::
GPU
,
search_gpus_
[
idx_
]);
idx_
=
(
idx_
+
1
)
%
search_gpus_
.
size
();
}
auto
label
=
std
::
make_shared
<
SpecResLabel
>
(
res_ptr
);
task
->
label
()
=
label
;
...
...
core/src/scheduler/selector/FaissIVFFlatPass.h
浏览文件 @
e6390486
...
...
@@ -41,7 +41,7 @@ class FaissIVFFlatPass : public Pass, public server::GpuResourceConfigHandler {
Run
(
const
TaskPtr
&
task
)
override
;
private:
int64_t
count
_
=
0
;
int64_t
idx
_
=
0
;
};
using
FaissIVFFlatPassPtr
=
std
::
shared_ptr
<
FaissIVFFlatPass
>
;
...
...
core/src/scheduler/selector/FaissIVFPQPass.cpp
浏览文件 @
e6390486
...
...
@@ -64,11 +64,10 @@ FaissIVFPQPass::Run(const TaskPtr& task) {
"search"
,
0
);
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
"cpu"
);
}
else
{
auto
best_device_id
=
count_
%
search_gpus_
.
size
();
LOG_SERVER_DEBUG_
<<
LogOut
(
"[%s][%d] FaissIVFPQPass: nq > gpu_search_threshold, specify gpu %d to search!"
,
"search"
,
0
,
best_device_id
);
++
count_
;
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
ResourceType
::
GPU
,
search_gpus_
[
best_device_id
]);
LOG_SERVER_DEBUG_
<<
LogOut
(
"[%s][%d] FaissIVFPQPass: nq >= gpu_search_threshold, specify gpu %d to search!"
,
"search"
,
0
,
search_gpus_
[
idx_
]);
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
ResourceType
::
GPU
,
search_gpus_
[
idx_
]);
idx_
=
(
idx_
+
1
)
%
search_gpus_
.
size
();
}
auto
label
=
std
::
make_shared
<
SpecResLabel
>
(
res_ptr
);
task
->
label
()
=
label
;
...
...
core/src/scheduler/selector/FaissIVFPQPass.h
浏览文件 @
e6390486
...
...
@@ -41,7 +41,7 @@ class FaissIVFPQPass : public Pass, public server::GpuResourceConfigHandler {
Run
(
const
TaskPtr
&
task
)
override
;
private:
int64_t
count
_
=
0
;
int64_t
idx
_
=
0
;
};
using
FaissIVFPQPassPtr
=
std
::
shared_ptr
<
FaissIVFPQPass
>
;
...
...
core/src/scheduler/selector/FaissIVFSQ8HPass.cpp
浏览文件 @
e6390486
...
...
@@ -62,11 +62,10 @@ FaissIVFSQ8HPass::Run(const TaskPtr& task) {
"search"
,
0
);
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
"cpu"
);
}
else
{
auto
best_device_id
=
count_
%
search_gpus_
.
size
();
LOG_SERVER_DEBUG_
<<
LogOut
(
"[%s][%d] FaissIVFSQ8HPass: nq > gpu_search_threshold, specify gpu %d to search!"
,
"search"
,
0
,
best_device_id
);
++
count_
;
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
ResourceType
::
GPU
,
search_gpus_
[
best_device_id
]);
LOG_SERVER_DEBUG_
<<
LogOut
(
"[%s][%d] FaissIVFSQ8HPass: nq >= gpu_search_threshold, specify gpu %d to search!"
,
"search"
,
0
,
search_gpus_
[
idx_
]);
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
ResourceType
::
GPU
,
search_gpus_
[
idx_
]);
idx_
=
(
idx_
+
1
)
%
search_gpus_
.
size
();
}
auto
label
=
std
::
make_shared
<
SpecResLabel
>
(
res_ptr
);
task
->
label
()
=
label
;
...
...
core/src/scheduler/selector/FaissIVFSQ8HPass.h
浏览文件 @
e6390486
...
...
@@ -41,7 +41,7 @@ class FaissIVFSQ8HPass : public Pass, public server::GpuResourceConfigHandler {
Run
(
const
TaskPtr
&
task
)
override
;
private:
int64_t
count
_
=
0
;
int64_t
idx
_
=
0
;
};
using
FaissIVFSQ8HPassPtr
=
std
::
shared_ptr
<
FaissIVFSQ8HPass
>
;
...
...
core/src/scheduler/selector/FaissIVFSQ8Pass.cpp
浏览文件 @
e6390486
...
...
@@ -62,11 +62,10 @@ FaissIVFSQ8Pass::Run(const TaskPtr& task) {
"search"
,
0
);
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
"cpu"
);
}
else
{
auto
best_device_id
=
count_
%
search_gpus_
.
size
();
LOG_SERVER_DEBUG_
<<
LogOut
(
"[%s][%d] FaissIVFSQ8Pass: nq > gpu_search_threshold, specify gpu %d to search!"
,
"search"
,
0
,
best_device_id
);
count_
++
;
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
ResourceType
::
GPU
,
search_gpus_
[
best_device_id
]);
LOG_SERVER_DEBUG_
<<
LogOut
(
"[%s][%d] FaissIVFSQ8Pass: nq >= gpu_search_threshold, specify gpu %d to search!"
,
"search"
,
0
,
search_gpus_
[
idx_
]);
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
ResourceType
::
GPU
,
search_gpus_
[
idx_
]);
idx_
=
(
idx_
+
1
)
%
search_gpus_
.
size
();
}
auto
label
=
std
::
make_shared
<
SpecResLabel
>
(
res_ptr
);
task
->
label
()
=
label
;
...
...
core/src/scheduler/selector/FaissIVFSQ8Pass.h
浏览文件 @
e6390486
...
...
@@ -41,7 +41,7 @@ class FaissIVFSQ8Pass : public Pass, public server::GpuResourceConfigHandler {
Run
(
const
TaskPtr
&
task
)
override
;
private:
int64_t
count
_
=
0
;
int64_t
idx
_
=
0
;
};
using
FaissIVFSQ8PassPtr
=
std
::
shared_ptr
<
FaissIVFSQ8Pass
>
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录