Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
c66c65cb
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
695
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
c66c65cb
编写于
12月 01, 2017
作者:
T
typhoonzero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add grpc benchmark
上级
067381e2
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
134 addition
and
3 deletion
+134
-3
paddle/operators/CMakeLists.txt
paddle/operators/CMakeLists.txt
+4
-0
paddle/operators/recv_op.cc
paddle/operators/recv_op.cc
+1
-1
paddle/operators/send_op.cc
paddle/operators/send_op.cc
+1
-0
paddle/operators/send_recv_op_benchmark.cc
paddle/operators/send_recv_op_benchmark.cc
+121
-0
paddle/operators/send_recv_op_test.cc
paddle/operators/send_recv_op_test.cc
+7
-2
未找到文件。
paddle/operators/CMakeLists.txt
浏览文件 @
c66c65cb
...
@@ -227,6 +227,10 @@ set_source_files_properties(
...
@@ -227,6 +227,10 @@ set_source_files_properties(
COMPILE_FLAGS
"-Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor"
)
COMPILE_FLAGS
"-Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor"
)
cc_test
(
test_send_recv SRCS send_recv_op_test.cc DEPS send_op recv_op sum_op executor
)
cc_test
(
test_send_recv SRCS send_recv_op_test.cc DEPS send_op recv_op sum_op executor
)
# FIXME(typhoonzero): use gtest to get benchmark result
if
(
WITH_PROFILER
)
cc_test
(
test_send_recv_benchmark SRCS send_recv_op_benchmark.cc DEPS send_op recv_op sum_op executor
)
endif
()
endif
()
endif
()
op_library
(
cond_op SRCS cond_op.cc DEPS framework_proto tensor operator net_op
)
op_library
(
cond_op SRCS cond_op.cc DEPS framework_proto tensor operator net_op
)
...
...
paddle/operators/recv_op.cc
浏览文件 @
c66c65cb
...
@@ -38,7 +38,7 @@ void RunServer(Server **rpc_server,
...
@@ -38,7 +38,7 @@ void RunServer(Server **rpc_server,
builder
.
RegisterService
(
service
.
get
());
builder
.
RegisterService
(
service
.
get
());
std
::
unique_ptr
<
Server
>
server
(
builder
.
BuildAndStart
());
std
::
unique_ptr
<
Server
>
server
(
builder
.
BuildAndStart
());
*
rpc_server
=
server
.
get
();
*
rpc_server
=
server
.
get
();
LOG
(
INFO
)
<<
"Server listening on "
<<
server_address
<<
std
::
endl
;
LOG
(
INFO
)
<<
"Server listening on "
<<
server_address
;
server
->
Wait
();
server
->
Wait
();
}
}
...
...
paddle/operators/send_op.cc
浏览文件 @
c66c65cb
...
@@ -41,6 +41,7 @@ class SendOp : public framework::OperatorBase {
...
@@ -41,6 +41,7 @@ class SendOp : public framework::OperatorBase {
// TODO(typhoonzero): how to call InitVariables
// TODO(typhoonzero): how to call InitVariables
}
}
}
}
void
Run
(
const
framework
::
Scope
&
scope
,
void
Run
(
const
framework
::
Scope
&
scope
,
const
platform
::
DeviceContext
&
dev_ctx
)
const
override
{
const
platform
::
DeviceContext
&
dev_ctx
)
const
override
{
auto
iname
=
Input
(
"X"
);
auto
iname
=
Input
(
"X"
);
...
...
paddle/operators/send_recv_op_benchmark.cc
0 → 100644
浏览文件 @
c66c65cb
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
// TODO(typhoonzero): add python bindings for this test as
// a RemoteOptimizer.
#include <unistd.h>
#include <iostream>
#include <thread>
#include "gtest/gtest.h"
#include "paddle/framework/op_registry.h"
#include "paddle/framework/operator.h"
#include "paddle/framework/program_desc.h"
USE_NO_KERNEL_OP
(
send
);
USE_NO_KERNEL_OP
(
recv
);
USE_OP
(
sum
);
// global for simplicity.
std
::
unique_ptr
<
paddle
::
framework
::
OperatorBase
>
recv_op
;
int
benchmark_count
=
100000
;
int
mat_size
=
10
;
void
InitTensorsInScope
(
paddle
::
framework
::
Scope
&
scope
,
paddle
::
platform
::
CPUPlace
&
place
)
{
paddle
::
platform
::
CPUDeviceContext
ctx
(
place
);
auto
var
=
scope
.
Var
(
"X"
);
auto
tensor
=
var
->
GetMutable
<
paddle
::
framework
::
LoDTensor
>
();
tensor
->
Resize
({
mat_size
,
mat_size
});
float
*
expect
=
tensor
->
mutable_data
<
float
>
(
place
);
for
(
int64_t
i
=
0
;
i
<
tensor
->
numel
();
++
i
)
{
expect
[
i
]
=
static_cast
<
float
>
(
i
)
/
1000.0
f
;
}
auto
out_var
=
scope
.
Var
(
"Out"
);
auto
out_tensor
=
out_var
->
GetMutable
<
paddle
::
framework
::
LoDTensor
>
();
out_tensor
->
Resize
({
mat_size
,
mat_size
});
tensor
->
mutable_data
<
float
>
(
place
);
// allocate
}
void
AddOp
(
const
std
::
string
&
type
,
const
paddle
::
framework
::
VariableNameMap
&
inputs
,
const
paddle
::
framework
::
VariableNameMap
&
outputs
,
paddle
::
framework
::
AttributeMap
attrs
,
paddle
::
framework
::
BlockDescBind
*
block
)
{
// insert output
for
(
auto
kv
:
outputs
)
{
for
(
auto
v
:
kv
.
second
)
{
auto
var
=
block
->
Var
(
v
);
var
->
SetDataType
(
paddle
::
framework
::
DataType
::
FP32
);
}
}
// insert op
auto
op
=
block
->
AppendOp
();
op
->
SetType
(
type
);
for
(
auto
&
kv
:
inputs
)
{
op
->
SetInput
(
kv
.
first
,
kv
.
second
);
}
for
(
auto
&
kv
:
outputs
)
{
op
->
SetOutput
(
kv
.
first
,
kv
.
second
);
}
op
->
SetAttrMap
(
attrs
);
}
void
StartServerNet
()
{
paddle
::
framework
::
Scope
scope
;
paddle
::
platform
::
CPUPlace
place
;
InitTensorsInScope
(
scope
,
place
);
// sub program run in recv_op, for simple test we use sum
paddle
::
framework
::
ProgramDescBind
program
;
paddle
::
framework
::
BlockDescBind
*
block
=
program
.
MutableBlock
(
0
);
// X for server side tensors, RX for received tensers, must be of same shape.
AddOp
(
"sum"
,
{{
"X"
,
{
"X"
,
"RX"
}}},
{{
"Out"
,
{
"Out"
}}},
{},
block
);
paddle
::
framework
::
AttributeMap
attrs
;
attrs
.
insert
({
"endpoint"
,
std
::
string
(
"127.0.0.1:6174"
)});
attrs
.
insert
({
"OptimizeBlock"
,
block
});
recv_op
=
paddle
::
framework
::
OpRegistry
::
CreateOp
(
"recv"
,
{{
"RX"
,
{
"RX"
}}},
{{
"Out"
,
{
"Out"
}}},
attrs
);
paddle
::
platform
::
CPUDeviceContext
ctx
(
place
);
for
(
int
i
=
0
;
i
<
benchmark_count
;
++
i
)
{
recv_op
->
Run
(
scope
,
ctx
);
}
}
TEST
(
SendRecvBenchmark
,
CPU
)
{
std
::
thread
server_thread
(
StartServerNet
);
sleep
(
5
);
// wait server to start
// local net
paddle
::
framework
::
Scope
scope
;
paddle
::
platform
::
CPUPlace
place
;
InitTensorsInScope
(
scope
,
place
);
paddle
::
framework
::
AttributeMap
attrs
;
attrs
.
insert
({
"endpoint"
,
std
::
string
(
"127.0.0.1:6174"
)});
auto
send_op
=
paddle
::
framework
::
OpRegistry
::
CreateOp
(
"send"
,
{{
"X"
,
{
"X"
}}},
{{
"Out"
,
{
"Out"
}}},
attrs
);
paddle
::
platform
::
CPUDeviceContext
ctx
(
place
);
for
(
int
i
=
0
;
i
<
benchmark_count
;
++
i
)
{
send_op
->
Run
(
scope
,
ctx
);
}
recv_op
.
reset
();
// dtor can shutdown and join server thread.
server_thread
.
join
();
}
paddle/operators/send_recv_op_test.cc
浏览文件 @
c66c65cb
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
// a RemoteOptimizer.
// a RemoteOptimizer.
#include <unistd.h>
#include <unistd.h>
#include <iostream>
#include <thread>
#include <thread>
#include "gtest/gtest.h"
#include "gtest/gtest.h"
...
@@ -38,7 +39,7 @@ void InitTensorsInScope(paddle::framework::Scope &scope,
...
@@ -38,7 +39,7 @@ void InitTensorsInScope(paddle::framework::Scope &scope,
tensor
->
Resize
({
10
,
10
});
tensor
->
Resize
({
10
,
10
});
float
*
expect
=
tensor
->
mutable_data
<
float
>
(
place
);
float
*
expect
=
tensor
->
mutable_data
<
float
>
(
place
);
for
(
int64_t
i
=
0
;
i
<
tensor
->
numel
();
++
i
)
{
for
(
int64_t
i
=
0
;
i
<
tensor
->
numel
();
++
i
)
{
expect
[
i
]
=
static_cast
<
float
>
(
i
);
expect
[
i
]
=
static_cast
<
float
>
(
i
)
/
1000.0
f
;
}
}
auto
out_var
=
scope
.
Var
(
"Out"
);
auto
out_var
=
scope
.
Var
(
"Out"
);
...
@@ -89,7 +90,11 @@ void StartServerNet() {
...
@@ -89,7 +90,11 @@ void StartServerNet() {
recv_op
=
paddle
::
framework
::
OpRegistry
::
CreateOp
(
"recv"
,
{{
"RX"
,
{
"RX"
}}},
recv_op
=
paddle
::
framework
::
OpRegistry
::
CreateOp
(
"recv"
,
{{
"RX"
,
{
"RX"
}}},
{{
"Out"
,
{
"Out"
}}},
attrs
);
{{
"Out"
,
{
"Out"
}}},
attrs
);
paddle
::
platform
::
CPUDeviceContext
ctx
(
place
);
paddle
::
platform
::
CPUDeviceContext
ctx
(
place
);
recv_op
->
Run
(
scope
,
ctx
);
while
(
1
)
{
recv_op
->
Run
(
scope
,
ctx
);
// run once
break
;
}
}
}
TEST
(
SendRecvOp
,
CPU
)
{
TEST
(
SendRecvOp
,
CPU
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录