Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gaoqiong
MIGraphX
Commits
d205aa73
Commit
d205aa73
authored
May 24, 2019
by
Khalique
Browse files
change order of nodes
parent
85496cd9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
src/tf/tf.cpp
src/tf/tf.cpp
+1
-1
test/tf/tf_test.cpp
test/tf/tf_test.cpp
+3
-3
No files found.
src/tf/tf.cpp
View file @
d205aa73
...
@@ -24,7 +24,7 @@ inline namespace MIGRAPHX_INLINE_NS {
...
@@ -24,7 +24,7 @@ inline namespace MIGRAPHX_INLINE_NS {
struct
tf_parser
struct
tf_parser
{
{
using
attribute_map
=
std
::
unordered_map
<
std
::
string
,
tensorflow
::
AttrValue
>
;
using
attribute_map
=
std
::
unordered_map
<
std
::
string
,
tensorflow
::
AttrValue
>
;
using
node_map
=
std
::
unordered_
map
<
std
::
string
,
tensorflow
::
NodeDef
>
;
using
node_map
=
std
::
map
<
std
::
string
,
tensorflow
::
NodeDef
>
;
// using input_node_map = std::unordered_map<std::string, std::unordered_set<std::string>>;
// using input_node_map = std::unordered_map<std::string, std::unordered_set<std::string>>;
using
op_func
=
std
::
function
<
instruction_ref
(
attribute_map
,
std
::
vector
<
instruction_ref
>
)
>
;
using
op_func
=
std
::
function
<
instruction_ref
(
attribute_map
,
std
::
vector
<
instruction_ref
>
)
>
;
...
...
test/tf/tf_test.cpp
View file @
d205aa73
...
@@ -178,9 +178,9 @@ TEST_CASE(mean_test)
...
@@ -178,9 +178,9 @@ TEST_CASE(mean_test)
p
.
add_literal
(
l
);
p
.
add_literal
(
l
);
migraphx
::
op
::
pooling
op
;
migraphx
::
op
::
pooling
op
;
op
.
lengths
=
{
16
,
16
};
op
.
lengths
=
{
16
,
16
};
p
.
add_instruction
(
op
,
l0
);
auto
l3
=
p
.
add_instruction
(
op
,
l0
);
auto
l3
=
p
.
add_instruction
(
op
,
l0
);
p
.
add_instruction
(
migraphx
::
op
::
squeeze
{{
2
,
3
}},
l3
);
p
.
add_instruction
(
migraphx
::
op
::
squeeze
{{
2
,
3
}},
l3
);
p
.
add_instruction
(
op
,
l0
);
auto
prog
=
migraphx
::
parse_tf
(
"mean_test.pb"
,
false
);
auto
prog
=
migraphx
::
parse_tf
(
"mean_test.pb"
,
false
);
EXPECT
(
p
==
prog
);
EXPECT
(
p
==
prog
);
...
@@ -195,9 +195,9 @@ TEST_CASE(mean_test_nhwc)
...
@@ -195,9 +195,9 @@ TEST_CASE(mean_test_nhwc)
p
.
add_literal
(
l
);
p
.
add_literal
(
l
);
migraphx
::
op
::
pooling
op
;
migraphx
::
op
::
pooling
op
;
op
.
lengths
=
{
16
,
16
};
op
.
lengths
=
{
16
,
16
};
p
.
add_instruction
(
op
,
l0
);
auto
l3
=
p
.
add_instruction
(
op
,
l0
);
auto
l3
=
p
.
add_instruction
(
op
,
l0
);
p
.
add_instruction
(
migraphx
::
op
::
squeeze
{{
2
,
3
}},
l3
);
p
.
add_instruction
(
migraphx
::
op
::
squeeze
{{
2
,
3
}},
l3
);
p
.
add_instruction
(
op
,
l0
);
auto
prog
=
migraphx
::
parse_tf
(
"mean_test_nhwc.pb"
,
true
);
auto
prog
=
migraphx
::
parse_tf
(
"mean_test_nhwc.pb"
,
true
);
EXPECT
(
p
==
prog
);
EXPECT
(
p
==
prog
);
...
@@ -271,8 +271,8 @@ TEST_CASE(pooling_test)
...
@@ -271,8 +271,8 @@ TEST_CASE(pooling_test)
max_pool_op
.
stride
=
{
2
,
2
};
max_pool_op
.
stride
=
{
2
,
2
};
avg_pool_op
.
lengths
=
{
2
,
2
};
avg_pool_op
.
lengths
=
{
2
,
2
};
max_pool_op
.
lengths
=
{
2
,
2
};
max_pool_op
.
lengths
=
{
2
,
2
};
p
.
add_instruction
(
max_pool_op
,
l0
);
p
.
add_instruction
(
avg_pool_op
,
l0
);
p
.
add_instruction
(
avg_pool_op
,
l0
);
p
.
add_instruction
(
max_pool_op
,
l0
);
auto
prog
=
migraphx
::
parse_tf
(
"pooling_test.pb"
,
true
);
auto
prog
=
migraphx
::
parse_tf
(
"pooling_test.pb"
,
true
);
EXPECT
(
p
==
prog
);
EXPECT
(
p
==
prog
);
...
...
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