Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
4cd64105
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,发现更多精彩内容 >>
提交
4cd64105
编写于
9月 11, 2019
作者:
Y
Yu Kun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove some nouse changes
Former-commit-id: c550390a97917b975fe456a733efda7d5b17c099
上级
6625cc1a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
23 deletion
+15
-23
cpp/conf/server_config.template
cpp/conf/server_config.template
+2
-2
cpp/src/scheduler/task/SearchTask.cpp
cpp/src/scheduler/task/SearchTask.cpp
+13
-18
cpp/src/sdk/grpc/ClientProxy.cpp
cpp/src/sdk/grpc/ClientProxy.cpp
+0
-2
cpp/src/server/grpc_impl/GrpcMilvusServer.cpp
cpp/src/server/grpc_impl/GrpcMilvusServer.cpp
+0
-1
未找到文件。
cpp/conf/server_config.template
浏览文件 @
4cd64105
...
@@ -56,12 +56,12 @@ resource_config:
...
@@ -56,12 +56,12 @@ resource_config:
cpu:
cpu:
type: CPU
type: CPU
device_id: 0
device_id: 0
enable_executor:
tru
e
enable_executor:
fals
e
gpu0:
gpu0:
type: GPU
type: GPU
device_id: 0
device_id: 0
enable_executor:
fals
e
enable_executor:
tru
e
gpu_resource_num: 2
gpu_resource_num: 2
pinned_memory: 300
pinned_memory: 300
temp_memory: 300
temp_memory: 300
...
...
cpp/src/scheduler/task/SearchTask.cpp
浏览文件 @
4cd64105
...
@@ -152,10 +152,10 @@ XSearchTask::Execute() {
...
@@ -152,10 +152,10 @@ XSearchTask::Execute() {
return
;
return
;
}
}
ENGINE_LOG_DEBUG
<<
"Searching in file id
"
<<
index_id_
<<
" with "
ENGINE_LOG_DEBUG
<<
"Searching in file id
:
"
<<
index_id_
<<
" with "
<<
search_contexts_
.
size
()
<<
" tasks"
;
<<
search_contexts_
.
size
()
<<
" tasks"
;
server
::
TimeRecorder
rc
(
"DoSearch file id
"
+
std
::
to_string
(
index_id_
));
server
::
TimeRecorder
rc
(
"DoSearch file id
:
"
+
std
::
to_string
(
index_id_
));
server
::
CollectDurationMetrics
metrics
(
index_type_
);
server
::
CollectDurationMetrics
metrics
(
index_type_
);
...
@@ -163,37 +163,32 @@ XSearchTask::Execute() {
...
@@ -163,37 +163,32 @@ XSearchTask::Execute() {
std
::
vector
<
float
>
output_distance
;
std
::
vector
<
float
>
output_distance
;
for
(
auto
&
context
:
search_contexts_
)
{
for
(
auto
&
context
:
search_contexts_
)
{
//step 1: allocate memory
//step 1: allocate memory
auto
nq
=
context
->
nq
();
auto
inner_k
=
context
->
topk
();
auto
topk
=
context
->
topk
();
auto
nprobe
=
context
->
nprobe
();
auto
nprobe
=
context
->
nprobe
();
auto
vectors
=
context
->
vectors
();
output_ids
.
resize
(
inner_k
*
context
->
nq
());
output_distance
.
resize
(
inner_k
*
context
->
nq
());
output_ids
.
resize
(
topk
*
nq
);
output_distance
.
resize
(
topk
*
nq
);
std
::
string
hdr
=
"context "
+
context
->
Identity
()
+
" nq "
+
std
::
to_string
(
nq
)
+
" topk "
+
std
::
to_string
(
topk
);
try
{
try
{
//step 2: search
//step 2: search
index_engine_
->
Search
(
nq
,
vectors
,
topk
,
nprobe
,
output_distance
.
data
(),
output_ids
.
data
());
index_engine_
->
Search
(
context
->
nq
(),
context
->
vectors
(),
inner_k
,
nprobe
,
output_distance
.
data
(),
output_ids
.
data
());
double
span
=
rc
.
RecordSection
(
hdr
+
", do search"
);
double
span
=
rc
.
RecordSection
(
"do search for context:"
+
context
->
Identity
()
);
context
->
AccumSearchCost
(
span
);
context
->
AccumSearchCost
(
span
);
//step 3: cluster result
//step 3: cluster result
SearchContext
::
ResultSet
result_set
;
SearchContext
::
ResultSet
result_set
;
auto
spec_k
=
index_engine_
->
Count
()
<
topk
?
index_engine_
->
Count
()
:
topk
;
auto
spec_k
=
index_engine_
->
Count
()
<
context
->
topk
()
?
index_engine_
->
Count
()
:
context
->
topk
()
;
XSearchTask
::
ClusterResult
(
output_ids
,
output_distance
,
nq
,
spec_k
,
result_set
);
XSearchTask
::
ClusterResult
(
output_ids
,
output_distance
,
context
->
nq
()
,
spec_k
,
result_set
);
span
=
rc
.
RecordSection
(
hdr
+
", cluster result"
);
span
=
rc
.
RecordSection
(
"cluster result for context:"
+
context
->
Identity
()
);
context
->
AccumReduceCost
(
span
);
context
->
AccumReduceCost
(
span
);
// step 4: pick up topk result
// step 4: pick up topk result
XSearchTask
::
TopkResult
(
result_set
,
top
k
,
metric_l2
,
context
->
GetResult
());
XSearchTask
::
TopkResult
(
result_set
,
inner_
k
,
metric_l2
,
context
->
GetResult
());
span
=
rc
.
RecordSection
(
hdr
+
", reduce topk"
);
span
=
rc
.
RecordSection
(
"reduce topk for context:"
+
context
->
Identity
()
);
context
->
AccumReduceCost
(
span
);
context
->
AccumReduceCost
(
span
);
}
catch
(
std
::
exception
&
ex
)
{
}
catch
(
std
::
exception
&
ex
)
{
ENGINE_LOG_ERROR
<<
"SearchTask encounter exception: "
<<
ex
.
what
();
ENGINE_LOG_ERROR
<<
"SearchTask encounter exception: "
<<
ex
.
what
();
...
...
cpp/src/sdk/grpc/ClientProxy.cpp
浏览文件 @
4cd64105
...
@@ -240,7 +240,6 @@ ClientProxy::Search(const std::string &table_name,
...
@@ -240,7 +240,6 @@ ClientProxy::Search(const std::string &table_name,
//step 3: search vectors
//step 3: search vectors
::
milvus
::
grpc
::
TopKQueryResultList
topk_query_result_list
;
::
milvus
::
grpc
::
TopKQueryResultList
topk_query_result_list
;
Status
status
=
client_ptr_
->
Search
(
topk_query_result_list
,
search_param
);
Status
status
=
client_ptr_
->
Search
(
topk_query_result_list
,
search_param
);
//step 4: convert result array
//step 4: convert result array
...
@@ -255,7 +254,6 @@ ClientProxy::Search(const std::string &table_name,
...
@@ -255,7 +254,6 @@ ClientProxy::Search(const std::string &table_name,
topk_query_result_array
.
emplace_back
(
result
);
topk_query_result_array
.
emplace_back
(
result
);
}
}
return
status
;
return
status
;
}
catch
(
std
::
exception
&
ex
)
{
}
catch
(
std
::
exception
&
ex
)
{
...
...
cpp/src/server/grpc_impl/GrpcMilvusServer.cpp
浏览文件 @
4cd64105
...
@@ -78,7 +78,6 @@ GrpcMilvusServer::StartService() {
...
@@ -78,7 +78,6 @@ GrpcMilvusServer::StartService() {
builder
.
RegisterService
(
&
service
);
builder
.
RegisterService
(
&
service
);
server
=
builder
.
BuildAndStart
();
server
=
builder
.
BuildAndStart
();
// builder.addTransportFilter();
server
->
Wait
();
server
->
Wait
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录