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
21757793
Commit
21757793
authored
Mar 01, 2018
by
Jaikrishnan Menon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CPU: Fix merge artifacts from "cleanups"
parent
dec1d77a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
mkldnn_emitter.cpp
src/ngraph/runtime/cpu/mkldnn_emitter.cpp
+16
-16
No files found.
src/ngraph/runtime/cpu/mkldnn_emitter.cpp
View file @
21757793
...
...
@@ -171,11 +171,11 @@ size_t
mkldnn
::
memory
::
dims
(
padding_above
.
begin
(),
padding_above
.
end
()),
mkldnn
::
padding_kind
::
zero
},
mkldnn_utils
::
global_cpu_engine
}},
*
mkldnn_primitives
[
input_index
],
*
mkldnn_primitives
[
delta_index
],
*
mkldnn_primitives
[
result_index
]));
*
m
_m
kldnn_primitives
[
input_index
],
*
m
_m
kldnn_primitives
[
delta_index
],
*
m
_m
kldnn_primitives
[
result_index
]));
primitive_deps
[
primitive_index
]
=
{
input_index
,
delta_index
,
result_index
};
m_
primitive_deps
[
primitive_index
]
=
{
input_index
,
delta_index
,
result_index
};
return
primitive_index
;
}
...
...
@@ -214,11 +214,11 @@ size_t MKLDNNEmitter::build_convolution_backward_data(const mkldnn::memory::desc
mkldnn
::
memory
::
dims
(
padding_above
.
begin
(),
padding_above
.
end
()),
mkldnn
::
padding_kind
::
zero
},
mkldnn_utils
::
global_cpu_engine
}},
*
mkldnn_primitives
[
delta_index
],
*
mkldnn_primitives
[
weights_index
],
*
mkldnn_primitives
[
result_index
]));
*
m
_m
kldnn_primitives
[
delta_index
],
*
m
_m
kldnn_primitives
[
weights_index
],
*
m
_m
kldnn_primitives
[
result_index
]));
primitive_deps
[
primitive_index
]
=
{
weights_index
,
delta_index
,
result_index
};
m_
primitive_deps
[
primitive_index
]
=
{
weights_index
,
delta_index
,
result_index
};
return
primitive_index
;
}
...
...
@@ -244,10 +244,10 @@ size_t MKLDNNEmitter::build_pooling_forward(mkldnn::algorithm pooling_algorithm,
mkldnn
::
memory
::
dims
(
padding_above
.
begin
(),
padding_above
.
end
()),
mkldnn
::
padding_kind
::
zero
},
mkldnn_utils
::
global_cpu_engine
},
*
mkldnn_primitives
[
input_index
],
*
mkldnn_primitives
[
result_index
]));
*
m
_m
kldnn_primitives
[
input_index
],
*
m
_m
kldnn_primitives
[
result_index
]));
primitive_deps
[
primitive_index
]
=
{
input_index
,
result_index
};
m_
primitive_deps
[
primitive_index
]
=
{
input_index
,
result_index
};
return
primitive_index
;
}
...
...
@@ -258,9 +258,9 @@ size_t MKLDNNEmitter::build_reorder(const mkldnn::memory::desc& input_desc,
size_t
result_index
=
build_memory_primitive
(
result_desc
);
size_t
primitive_index
=
insert_primitive
(
new
mkldnn
::
reorder
(
*
m
kldnn_primitives
[
input_index
],
*
mkldnn_primitives
[
result_index
]));
new
mkldnn
::
reorder
(
*
m
_mkldnn_primitives
[
input_index
],
*
m_
mkldnn_primitives
[
result_index
]));
primitive_deps
[
primitive_index
]
=
{
input_index
,
result_index
};
m_
primitive_deps
[
primitive_index
]
=
{
input_index
,
result_index
};
return
primitive_index
;
}
...
...
@@ -273,10 +273,10 @@ size_t MKLDNNEmitter::build_relu_forward(const mkldnn::memory::desc& input_desc,
size_t
primitive_index
=
insert_primitive
(
new
mkldnn
::
relu_forward
(
{{
mkldnn
::
prop_kind
::
forward_training
,
mkldnn
::
algorithm
::
eltwise_relu
,
input_desc
,
0
,
0
},
mkldnn_utils
::
global_cpu_engine
},
*
mkldnn_primitives
[
input_index
],
*
mkldnn_primitives
[
result_index
]));
*
m
_m
kldnn_primitives
[
input_index
],
*
m
_m
kldnn_primitives
[
result_index
]));
primitive_deps
[
primitive_index
]
=
{
input_index
,
result_index
};
m_
primitive_deps
[
primitive_index
]
=
{
input_index
,
result_index
};
return
primitive_index
;
}
...
...
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