Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wzpei9
Paddle
提交
b8196843
P
Paddle
项目概览
wzpei9
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b8196843
编写于
10月 17, 2018
作者:
T
Tao Luo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add compare_mkldnn test
test=develop
上级
e47f4186
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
27 addition
and
27 deletion
+27
-27
paddle/fluid/inference/tests/api/analyzer_resnet50_tester.cc
paddle/fluid/inference/tests/api/analyzer_resnet50_tester.cc
+13
-13
paddle/fluid/inference/tests/api/analyzer_vis_tester.cc
paddle/fluid/inference/tests/api/analyzer_vis_tester.cc
+13
-13
paddle/fluid/inference/tests/api/tester_helper.h
paddle/fluid/inference/tests/api/tester_helper.h
+1
-1
未找到文件。
paddle/fluid/inference/tests/api/analyzer_resnet50_tester.cc
浏览文件 @
b8196843
...
...
@@ -20,16 +20,14 @@ namespace paddle {
namespace
inference
{
namespace
analysis
{
void
SetConfig
(
AnalysisConfig
*
cfg
)
{
void
SetConfig
(
AnalysisConfig
*
cfg
,
bool
_use_mkldnn
=
FLAGS_use_MKLDNN
)
{
cfg
->
param_file
=
FLAGS_infer_model
+
"/params"
;
cfg
->
prog_file
=
FLAGS_infer_model
+
"/model"
;
cfg
->
use_gpu
=
false
;
cfg
->
device
=
0
;
cfg
->
enable_ir_optim
=
true
;
cfg
->
specify_input_name
=
true
;
#ifdef PADDLE_WITH_MKLDNN
cfg
->
_use_mkldnn
=
FLAGS_use_MKLDNN
;
#endif
cfg
->
_use_mkldnn
=
_use_mkldnn
;
}
void
SetInput
(
std
::
vector
<
std
::
vector
<
PaddleTensor
>>
*
inputs
)
{
...
...
@@ -92,17 +90,19 @@ TEST(Analyzer_resnet50, compare) {
std
::
vector
<
std
::
vector
<
PaddleTensor
>>
input_slots_all
;
SetInput
(
&
input_slots_all
);
CompareNativeAndAnalysis
(
cfg
,
input_slots_all
);
}
// Compare result of NativeConfig and AnalysisConfig with MKLDNN
#ifdef PADDLE_WITH_MKLDNN
// since default config._use_mkldnn=true in this case,
// we should compare analysis_outputs in config._use_mkldnn=false
// with native_outputs as well.
FLAGS_use_MKLDNN
=
false
;
AnalysisConfig
cfg1
;
SetConfig
(
&
cfg1
);
CompareNativeAndAnalysis
(
cfg1
,
input_slots_all
);
FLAGS_use_MKLDNN
=
true
;
#endif
TEST
(
Analyzer_resnet50
,
compare_mkldnn
)
{
AnalysisConfig
cfg
;
SetConfig
(
&
cfg
,
true
);
std
::
vector
<
std
::
vector
<
PaddleTensor
>>
input_slots_all
;
SetInput
(
&
input_slots_all
);
CompareNativeAndAnalysis
(
cfg
,
input_slots_all
);
}
#endif
}
// namespace analysis
}
// namespace inference
...
...
paddle/fluid/inference/tests/api/analyzer_vis_tester.cc
浏览文件 @
b8196843
...
...
@@ -50,7 +50,7 @@ Record ProcessALine(const std::string &line) {
return
record
;
}
void
SetConfig
(
AnalysisConfig
*
cfg
)
{
void
SetConfig
(
AnalysisConfig
*
cfg
,
bool
_use_mkldnn
=
FLAGS_use_MKLDNN
)
{
cfg
->
param_file
=
FLAGS_infer_model
+
"/__params__"
;
cfg
->
prog_file
=
FLAGS_infer_model
+
"/__model__"
;
cfg
->
use_gpu
=
false
;
...
...
@@ -59,9 +59,7 @@ void SetConfig(AnalysisConfig *cfg) {
cfg
->
specify_input_name
=
true
;
// TODO(TJ): fix fusion gru
cfg
->
ir_passes
.
push_back
(
"fc_gru_fuse_pass"
);
#ifdef PADDLE_WITH_MKLDNN
cfg
->
_use_mkldnn
=
FLAGS_use_MKLDNN
;
#endif
cfg
->
_use_mkldnn
=
_use_mkldnn
;
}
void
SetInput
(
std
::
vector
<
std
::
vector
<
PaddleTensor
>>
*
inputs
)
{
...
...
@@ -125,17 +123,19 @@ TEST(Analyzer_vis, compare) {
std
::
vector
<
std
::
vector
<
PaddleTensor
>>
input_slots_all
;
SetInput
(
&
input_slots_all
);
CompareNativeAndAnalysis
(
cfg
,
input_slots_all
);
}
// Compare result of NativeConfig and AnalysisConfig with MKLDNN
#ifdef PADDLE_WITH_MKLDNN
// since default config._use_mkldnn=true in this case,
// we should compare analysis_outputs in config._use_mkldnn=false
// with native_outputs as well.
FLAGS_use_MKLDNN
=
false
;
AnalysisConfig
cfg1
;
SetConfig
(
&
cfg1
);
CompareNativeAndAnalysis
(
cfg1
,
input_slots_all
);
FLAGS_use_MKLDNN
=
true
;
#endif
TEST
(
Analyzer_vis
,
compare_mkldnn
)
{
AnalysisConfig
cfg
;
SetConfig
(
&
cfg
,
true
);
std
::
vector
<
std
::
vector
<
PaddleTensor
>>
input_slots_all
;
SetInput
(
&
input_slots_all
);
CompareNativeAndAnalysis
(
cfg
,
input_slots_all
);
}
#endif
}
// namespace analysis
}
// namespace inference
...
...
paddle/fluid/inference/tests/api/tester_helper.h
浏览文件 @
b8196843
...
...
@@ -35,7 +35,7 @@ DEFINE_bool(test_all_data, false, "Test the all dataset in data file.");
DEFINE_int32
(
num_threads
,
1
,
"Running the inference program in multi-threads."
);
DEFINE_bool
(
use_analysis
,
true
,
"Running the inference program in analysis mode."
);
DEFINE_bool
(
use_MKLDNN
,
tru
e
,
DEFINE_bool
(
use_MKLDNN
,
fals
e
,
"Running the inference program with mkldnn library."
);
namespace
paddle
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录