Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
N
ngraph
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ngraph
Commits
466854c6
Commit
466854c6
authored
Feb 16, 2018
by
pthoreho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style fix
parent
5ce09de0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
47 additions
and
38 deletions
+47
-38
cpu_emitter.cpp
src/ngraph/runtime/cpu/cpu_emitter.cpp
+47
-38
No files found.
src/ngraph/runtime/cpu/cpu_emitter.cpp
View file @
466854c6
...
...
@@ -2726,76 +2726,85 @@ namespace ngraph
if
(
delta_rank
==
4
&&
mpb
->
get_window_shape
().
size
()
==
2
&&
args
[
0
].
get_element_type
()
==
element
::
f32
)
{
const
string
&
et
=
get_mkldnn_data_type
(
args
[
1
].
get_element_type
().
c_type_string
());
const
string
&
et
=
get_mkldnn_data_type
(
args
[
1
].
get_element_type
().
c_type_string
());
writer
<<
"{
\n
"
;
writer
.
indent
++
;
writer
<<
"engine cpu_engine = engine(engine::cpu, 0);
\n
"
;
writer
<<
"memory::desc input_data_desc = memory::desc({"
<<
join
(
delta_shape
)
<<
"}, "
<<
et
<<
", memory::format::nchw);
\n
"
;
writer
<<
"memory::desc result_desc = memory::desc({"
<<
join
(
out_shape
)
<<
"}, "
<<
et
<<
", memory::format::nchw);
\n
"
;
writer
<<
"memory input_data = memory({input_data_desc, cpu_engine}, "
<<
args
[
1
].
get_name
()
<<
");
\n
"
;
writer
<<
"memory result = memory({result_desc, cpu_engine}, "
<<
out
[
0
].
get_name
()
<<
");
\n
"
;
writer
<<
"memory::desc input_data_desc = memory::desc({"
<<
join
(
delta_shape
)
<<
"}, "
<<
et
<<
", memory::format::nchw);
\n
"
;
writer
<<
"memory::desc result_desc = memory::desc({"
<<
join
(
out_shape
)
<<
"}, "
<<
et
<<
", memory::format::nchw);
\n
"
;
writer
<<
"memory input_data = memory({input_data_desc, cpu_engine}, "
<<
args
[
1
].
get_name
()
<<
");
\n
"
;
writer
<<
"memory result = memory({result_desc, cpu_engine}, "
<<
out
[
0
].
get_name
()
<<
");
\n
"
;
//----------------------------------------------------------------------------------------------
// create a forward primitive_desc, use this to query the workspace
// FIXME: (pruthvi) this is a workaround, till we maintain a global context to refer to the corrosponding
// MKLDNN fprop kernel. this impacts performance
writer
<<
"memory::desc max_pool_input_desc = memory::desc({"
<<
join
(
args
[
0
].
get_shape
())
<<
"}, "
<<
et
<<
", memory::format::nchw);
\n
"
;
writer
<<
"memory::desc max_pool_result_desc = memory::desc({"
<<
join
(
args
[
1
].
get_shape
())
<<
"}, "
<<
et
<<
", memory::format::nchw);
\n
"
;
writer
<<
"memory maxpool_input_data = memory({max_pool_input_desc, cpu_engine}, "
writer
<<
"memory::desc max_pool_input_desc = memory::desc({"
<<
join
(
args
[
0
].
get_shape
())
<<
"}, "
<<
et
<<
", memory::format::nchw);
\n
"
;
writer
<<
"memory::desc max_pool_result_desc = memory::desc({"
<<
join
(
args
[
1
].
get_shape
())
<<
"}, "
<<
et
<<
", memory::format::nchw);
\n
"
;
writer
<<
"memory maxpool_input_data = memory({max_pool_input_desc, cpu_engine}, "
<<
args
[
0
].
get_name
()
<<
");
\n
"
;
writer
<<
"memory maxpool_result = memory({max_pool_result_desc, cpu_engine}, "
<<
out
[
0
].
get_name
()
<<
");
\n
"
;
writer
<<
"pooling_forward::primitive_desc pool_fwd_pd = pooling_forward::primitive_desc("
<<
"{prop_kind::forward, algorithm::pooling_max, "
<<
"max_pool_input_desc, max_pool_result_desc, {"
<<
join
(
max_pool_fprop_op
->
get_window_movement_strides
())
<<
"}, {"
<<
join
(
max_pool_fprop_op
->
get_window_shape
())
<<
"}, "
<<
"{"
<<
join
(
max_pool_fprop_op
->
get_padding_below
())
<<
"}, "
<<
"{"
<<
join
(
max_pool_fprop_op
->
get_padding_above
())
<<
"}, "
<<
"padding_kind::zero}, cpu_engine);
\n
"
;
<<
out
[
0
].
get_name
()
<<
");
\n
"
;
writer
<<
"pooling_forward::primitive_desc pool_fwd_pd = "
"pooling_forward::primitive_desc("
<<
"{prop_kind::forward, algorithm::pooling_max, "
<<
"max_pool_input_desc, max_pool_result_desc, {"
<<
join
(
max_pool_fprop_op
->
get_window_movement_strides
())
<<
"}, {"
<<
join
(
max_pool_fprop_op
->
get_window_shape
())
<<
"}, "
<<
"{"
<<
join
(
max_pool_fprop_op
->
get_padding_below
())
<<
"}, "
<<
"{"
<<
join
(
max_pool_fprop_op
->
get_padding_above
())
<<
"}, "
<<
"padding_kind::zero}, cpu_engine);
\n
"
;
// query the workspace from the forward primitive desc and allocates memory
writer
<<
"auto max_pool_workspace_memory = "
"memory(pool_fwd_pd.workspace_primitive_desc());
\n
"
;
"memory(pool_fwd_pd.workspace_primitive_desc());
\n
"
;
//run fprop with this workspace attached
writer
<<
"pooling_forward max_pooling_fwd = pooling_forward("
<<
"pool_fwd_pd, maxpool_input_data, maxpool_result, max_pool_workspace_memory);
\n
"
;
<<
"pool_fwd_pd, maxpool_input_data, maxpool_result, "
"max_pool_workspace_memory);
\n
"
;
writer
<<
"stream s_fprop = stream(stream::kind::eager);
\n
"
<<
"s_fprop.submit({max_pooling_fwd}).wait();
\n
"
;
<<
"s_fprop.submit({max_pooling_fwd}).wait();
\n
"
;
//---------------------------------------------------------------------------------------------
writer
<<
"auto max_pooling_bwd = pooling_backward(pooling_backward::primitive_desc("
<<
"pooling_backward::desc(algorithm::pooling_max, "
<<
"result_desc, input_data_desc, {"
<<
join
(
mpb
->
get_window_movement_strides
())
<<
"}, {"
<<
join
(
mpb
->
get_window_shape
())
<<
"}, "
<<
"{"
<<
join
(
mpb
->
get_padding_below
())
<<
"}, "
<<
"{"
<<
join
(
mpb
->
get_padding_above
())
<<
"}, "
<<
"padding_kind::zero), cpu_engine, pool_fwd_pd), "
<<
"input_data, max_pool_workspace_memory, result);
\n
"
;
writer
<<
"auto max_pooling_bwd = "
"pooling_backward(pooling_backward::primitive_desc("
<<
"pooling_backward::desc(algorithm::pooling_max, "
<<
"result_desc, input_data_desc, {"
<<
join
(
mpb
->
get_window_movement_strides
())
<<
"}, {"
<<
join
(
mpb
->
get_window_shape
())
<<
"}, "
<<
"{"
<<
join
(
mpb
->
get_padding_below
())
<<
"}, "
<<
"{"
<<
join
(
mpb
->
get_padding_above
())
<<
"}, "
<<
"padding_kind::zero), cpu_engine, pool_fwd_pd), "
<<
"input_data, max_pool_workspace_memory, result);
\n
"
;
writer
<<
"auto s_bwd = stream(stream::kind::eager);
\n
"
<<
"s_bwd.submit({max_pooling_bwd}).wait();
\n
"
;
<<
"s_bwd.submit({max_pooling_bwd}).wait();
\n
"
;
writer
.
indent
--
;
writer
<<
"}
\n
"
;
}
else
{
writer
<<
"kernel::max_pool_backprop<"
<<
out
[
0
].
get_type
()
<<
">("
<<
args
[
0
].
get_name
()
<<
",
\n
"
;
writer
<<
"kernel::max_pool_backprop<"
<<
out
[
0
].
get_type
()
<<
">("
<<
args
[
0
].
get_name
()
<<
",
\n
"
;
writer
<<
" "
<<
args
[
1
].
get_name
()
<<
",
\n
"
;
writer
<<
" "
<<
out
[
0
].
get_name
()
<<
",
\n
"
;
writer
<<
" {"
<<
join
(
delta_shape
)
<<
"},
\n
"
;
writer
<<
" {"
<<
join
(
out_shape
)
<<
"},
\n
"
;
writer
<<
" {"
<<
join
(
mpb
->
get_window_shape
())
<<
"},
\n
"
;
writer
<<
" {"
<<
join
(
mpb
->
get_window_movement_strides
())
<<
"},
\n
"
;
writer
<<
" {"
<<
join
(
mpb
->
get_window_movement_strides
())
<<
"},
\n
"
;
writer
<<
" {"
<<
join
(
mpb
->
get_padding_below
())
<<
"},
\n
"
;
writer
<<
" {"
<<
join
(
mpb
->
get_padding_above
())
<<
"}
\n
"
;
writer
<<
" );
\n
"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment