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
b466027e
Commit
b466027e
authored
Mar 29, 2019
by
Diego Caballero
Committed by
Scott Cyphers
Mar 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[CPU] Fix ambiguous 'op' namespace. (#2683)
parent
105f03bc
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
8 additions
and
8 deletions
+8
-8
bounded_relu.cpp
src/ngraph/runtime/cpu/builder/bounded_relu.cpp
+1
-1
leaky_relu.cpp
src/ngraph/runtime/cpu/builder/leaky_relu.cpp
+1
-1
quantization.cpp
src/ngraph/runtime/cpu/builder/quantization.cpp
+1
-1
mkldnn_utils.cpp
src/ngraph/runtime/cpu/mkldnn_utils.cpp
+1
-1
cpu_assignment.cpp
src/ngraph/runtime/cpu/pass/cpu_assignment.cpp
+0
-0
cpu_fusion.cpp
src/ngraph/runtime/cpu/pass/cpu_fusion.cpp
+0
-0
cpu_memory_optimization.cpp
src/ngraph/runtime/cpu/pass/cpu_memory_optimization.cpp
+4
-4
cpu_rnn_fusion.cpp
src/ngraph/runtime/cpu/pass/cpu_rnn_fusion.cpp
+0
-0
No files found.
src/ngraph/runtime/cpu/builder/bounded_relu.cpp
View file @
b466027e
...
@@ -38,7 +38,7 @@ namespace ngraph
...
@@ -38,7 +38,7 @@ namespace ngraph
auto
&
out_tensor
=
external_function
->
get_tensor_data
(
out
[
0
].
get_name
());
auto
&
out_tensor
=
external_function
->
get_tensor_data
(
out
[
0
].
get_name
());
size_t
count
=
out
[
0
].
get_size
();
size_t
count
=
out
[
0
].
get_size
();
auto
alpha
=
static_cast
<
const
op
::
BoundedRelu
*>
(
node
)
->
get_alpha
();
auto
alpha
=
static_cast
<
const
ngraph
::
op
::
BoundedRelu
*>
(
node
)
->
get_alpha
();
if
(
runtime
::
cpu
::
mkldnn_utils
::
use_mkldnn_kernel
(
node
))
if
(
runtime
::
cpu
::
mkldnn_utils
::
use_mkldnn_kernel
(
node
))
{
{
...
...
src/ngraph/runtime/cpu/builder/leaky_relu.cpp
View file @
b466027e
...
@@ -38,7 +38,7 @@ namespace ngraph
...
@@ -38,7 +38,7 @@ namespace ngraph
auto
&
out_tensor
=
external_function
->
get_tensor_data
(
out
[
0
].
get_name
());
auto
&
out_tensor
=
external_function
->
get_tensor_data
(
out
[
0
].
get_name
());
size_t
count
=
out
[
0
].
get_size
();
size_t
count
=
out
[
0
].
get_size
();
auto
alpha
=
static_cast
<
const
op
::
LeakyRelu
*>
(
node
)
->
get_alpha
();
auto
alpha
=
static_cast
<
const
ngraph
::
op
::
LeakyRelu
*>
(
node
)
->
get_alpha
();
if
(
runtime
::
cpu
::
mkldnn_utils
::
use_mkldnn_kernel
(
node
))
if
(
runtime
::
cpu
::
mkldnn_utils
::
use_mkldnn_kernel
(
node
))
{
{
...
...
src/ngraph/runtime/cpu/builder/quantization.cpp
View file @
b466027e
...
@@ -313,7 +313,7 @@ namespace ngraph
...
@@ -313,7 +313,7 @@ namespace ngraph
auto
arg0_shape
=
args
[
0
].
get_shape
();
auto
arg0_shape
=
args
[
0
].
get_shape
();
auto
arg1_shape
=
args
[
1
].
get_shape
();
auto
arg1_shape
=
args
[
1
].
get_shape
();
auto
daxes
=
quantize
->
get_axes
();
auto
daxes
=
quantize
->
get_axes
();
op
::
Quantize
::
RoundMode
round_mode
=
quantize
->
get_round_mode
();
ngraph
::
op
::
Quantize
::
RoundMode
round_mode
=
quantize
->
get_round_mode
();
if
(
args
[
0
].
get_element_type
()
==
element
::
f32
)
if
(
args
[
0
].
get_element_type
()
==
element
::
f32
)
{
{
...
...
src/ngraph/runtime/cpu/mkldnn_utils.cpp
View file @
b466027e
...
@@ -705,7 +705,7 @@ bool runtime::cpu::mkldnn_utils::use_mkldnn_kernel(const ngraph::Node* node)
...
@@ -705,7 +705,7 @@ bool runtime::cpu::mkldnn_utils::use_mkldnn_kernel(const ngraph::Node* node)
void
runtime
::
cpu
::
mkldnn_utils
::
assign_mkldnn_kernel
(
Node
*
node
)
void
runtime
::
cpu
::
mkldnn_utils
::
assign_mkldnn_kernel
(
Node
*
node
)
{
{
auto
ngraph_op
=
static_cast
<
op
::
Op
*>
(
node
);
auto
ngraph_op
=
static_cast
<
ngraph
::
op
::
Op
*>
(
node
);
auto
op_annotations
=
std
::
make_shared
<
ngraph
::
runtime
::
cpu
::
CPUOpAnnotations
>
();
auto
op_annotations
=
std
::
make_shared
<
ngraph
::
runtime
::
cpu
::
CPUOpAnnotations
>
();
op_annotations
->
set_mkldnn_op
(
true
);
op_annotations
->
set_mkldnn_op
(
true
);
ngraph_op
->
set_op_annotations
(
op_annotations
);
ngraph_op
->
set_op_annotations
(
op_annotations
);
...
...
src/ngraph/runtime/cpu/pass/cpu_assignment.cpp
View file @
b466027e
This diff is collapsed.
Click to expand it.
src/ngraph/runtime/cpu/pass/cpu_fusion.cpp
View file @
b466027e
This diff is collapsed.
Click to expand it.
src/ngraph/runtime/cpu/pass/cpu_memory_optimization.cpp
View file @
b466027e
...
@@ -64,7 +64,7 @@ bool runtime::cpu::pass::CPUMemoryOptimization::run_on_function(std::shared_ptr<
...
@@ -64,7 +64,7 @@ bool runtime::cpu::pass::CPUMemoryOptimization::run_on_function(std::shared_ptr<
{
{
if
(
n
->
description
()
==
"Concat"
)
if
(
n
->
description
()
==
"Concat"
)
{
{
auto
concat
=
std
::
static_pointer_cast
<
op
::
Concat
>
(
n
);
auto
concat
=
std
::
static_pointer_cast
<
ngraph
::
op
::
Concat
>
(
n
);
auto
shape
=
concat
->
get_input_shape
(
0
);
auto
shape
=
concat
->
get_input_shape
(
0
);
auto
axis
=
concat
->
get_concatenation_axis
();
auto
axis
=
concat
->
get_concatenation_axis
();
auto
product
=
1
;
auto
product
=
1
;
...
@@ -134,7 +134,7 @@ bool runtime::cpu::pass::CPUMemoryOptimization::run_on_function(std::shared_ptr<
...
@@ -134,7 +134,7 @@ bool runtime::cpu::pass::CPUMemoryOptimization::run_on_function(std::shared_ptr<
{
{
if
(
arg
->
is_op
())
if
(
arg
->
is_op
())
{
{
auto
op
=
std
::
static_pointer_cast
<
op
::
Op
>
(
arg
);
auto
op
=
std
::
static_pointer_cast
<
ngraph
::
op
::
Op
>
(
arg
);
auto
annotation
=
op
->
get_op_annotations
();
auto
annotation
=
op
->
get_op_annotations
();
if
(
annotation
&&
annotation
->
get_in_place_oi_pairs
().
size
()
>
0
)
if
(
annotation
&&
annotation
->
get_in_place_oi_pairs
().
size
()
>
0
)
...
@@ -177,7 +177,7 @@ bool runtime::cpu::pass::CPUMemoryOptimization::run_on_function(std::shared_ptr<
...
@@ -177,7 +177,7 @@ bool runtime::cpu::pass::CPUMemoryOptimization::run_on_function(std::shared_ptr<
{
{
if
(
user
->
is_op
())
if
(
user
->
is_op
())
{
{
auto
op
=
std
::
static_pointer_cast
<
op
::
Op
>
(
user
);
auto
op
=
std
::
static_pointer_cast
<
ngraph
::
op
::
Op
>
(
user
);
if
(
auto
op_annotations
=
op
->
get_op_annotations
())
if
(
auto
op_annotations
=
op
->
get_op_annotations
())
{
{
if
(
op_annotations
->
get_in_place_oi_pairs
().
size
()
>
0
)
if
(
op_annotations
->
get_in_place_oi_pairs
().
size
()
>
0
)
...
@@ -227,7 +227,7 @@ bool runtime::cpu::pass::CPUMemoryOptimization::run_on_function(std::shared_ptr<
...
@@ -227,7 +227,7 @@ bool runtime::cpu::pass::CPUMemoryOptimization::run_on_function(std::shared_ptr<
{
{
if
(
n
->
description
()
==
"Slice"
)
if
(
n
->
description
()
==
"Slice"
)
{
{
auto
slice
=
std
::
static_pointer_cast
<
op
::
Slice
>
(
n
);
auto
slice
=
std
::
static_pointer_cast
<
ngraph
::
op
::
Slice
>
(
n
);
auto
in_shape
=
slice
->
get_input_shape
(
0
);
auto
in_shape
=
slice
->
get_input_shape
(
0
);
auto
out_shape
=
slice
->
get_output_shape
(
0
);
auto
out_shape
=
slice
->
get_output_shape
(
0
);
auto
strides
=
slice
->
get_strides
();
auto
strides
=
slice
->
get_strides
();
...
...
src/ngraph/runtime/cpu/pass/cpu_rnn_fusion.cpp
View file @
b466027e
This diff is collapsed.
Click to expand it.
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