Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tic
Overview
Overview
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wenyuanbo
tic
Commits
292ab02d
Commit
292ab02d
authored
Nov 06, 2018
by
Bob.Liu
Committed by
Tianqi Chen
Nov 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FRONTEND][ONNX] fixed operator converter for Split in onnx frontend (#2038)
parent
ca0fe22c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
1 deletions
+54
-1
nnvm/python/nnvm/frontend/onnx.py
+18
-1
nnvm/tests/python/frontend/onnx/test_forward.py
+36
-0
No files found.
nnvm/python/nnvm/frontend/onnx.py
View file @
292ab02d
...
@@ -464,6 +464,23 @@ class Unsqueeze(OnnxOpConverter):
...
@@ -464,6 +464,23 @@ class Unsqueeze(OnnxOpConverter):
inputs
[
0
]
=
_sym
.
expand_dims
(
inputs
[
0
],
axis
=
axes
,
num_newaxis
=
1
)
inputs
[
0
]
=
_sym
.
expand_dims
(
inputs
[
0
],
axis
=
axes
,
num_newaxis
=
1
)
return
inputs
[
0
]
return
inputs
[
0
]
class
Split
(
OnnxOpConverter
):
""" Operator converter for Split.
"""
@classmethod
def
_impl_v1
(
cls
,
inputs
,
attr
,
params
):
attr
[
'indices_or_sections'
]
=
[]
index
=
0
for
i
in
attr
[
'split'
][:
-
1
]:
index
+=
i
attr
[
'indices_or_sections'
]
.
append
(
index
)
return
AttrCvt
(
op_name
=
'split'
,
ignores
=
[
'split'
])(
inputs
,
attr
,
params
)
class
Slice
(
OnnxOpConverter
):
class
Slice
(
OnnxOpConverter
):
""" Operator converter for Slice.
""" Operator converter for Slice.
"""
"""
...
@@ -754,7 +771,7 @@ def _get_convert_map(opset):
...
@@ -754,7 +771,7 @@ def _get_convert_map(opset):
'Cast'
:
Cast
.
get_converter
(
opset
),
'Cast'
:
Cast
.
get_converter
(
opset
),
'Reshape'
:
Reshape
.
get_converter
(
opset
),
'Reshape'
:
Reshape
.
get_converter
(
opset
),
'Concat'
:
Renamer
(
'concatenate'
),
'Concat'
:
Renamer
(
'concatenate'
),
'Split'
:
AttrCvt
(
'split'
,
{
'split'
:
'indices_or_sections'
}
),
'Split'
:
Split
.
get_converter
(
opset
),
'Slice'
:
Slice
.
get_converter
(
opset
),
'Slice'
:
Slice
.
get_converter
(
opset
),
'Transpose'
:
AttrCvt
(
'transpose'
,
{
'perm'
:
'axes'
}),
'Transpose'
:
AttrCvt
(
'transpose'
,
{
'perm'
:
'axes'
}),
'Gather'
:
Gather
.
get_converter
(
opset
),
'Gather'
:
Gather
.
get_converter
(
opset
),
...
...
nnvm/tests/python/frontend/onnx/test_forward.py
View file @
292ab02d
...
@@ -712,6 +712,41 @@ def test_constantfill():
...
@@ -712,6 +712,41 @@ def test_constantfill():
verify_constantfill
(
False
,
(
2
,
3
,
4
,
5
),
(
2
,
3
,
4
,
5
),
10
,
'float32'
)
verify_constantfill
(
False
,
(
2
,
3
,
4
,
5
),
(
2
,
3
,
4
,
5
),
10
,
'float32'
)
verify_constantfill
(
True
,
(
2
,
3
,
4
,
5
),
(
2
,
3
,
4
,
5
,
4
,
5
,
6
),
10
,
'float32'
,
extra_shape
=
(
4
,
5
,
6
))
verify_constantfill
(
True
,
(
2
,
3
,
4
,
5
),
(
2
,
3
,
4
,
5
,
4
,
5
,
6
),
10
,
'float32'
,
extra_shape
=
(
4
,
5
,
6
))
def
verify_split
(
indata
,
outdatas
,
split
,
axis
=
0
):
indata
=
np
.
array
(
indata
)
.
astype
(
np
.
float32
)
outdatas
=
[
np
.
array
(
o
)
.
astype
(
np
.
float32
)
for
o
in
outdatas
]
node
=
helper
.
make_node
(
'Split'
,
inputs
=
[
'input'
],
outputs
=
[
'output_{}'
.
format
(
i
)
for
i
in
range
(
len
(
split
))],
axis
=
axis
,
split
=
split
)
graph
=
helper
.
make_graph
([
node
],
'split_test'
,
inputs
=
[
helper
.
make_tensor_value_info
(
"input"
,
TensorProto
.
FLOAT
,
list
(
indata
.
shape
))],
outputs
=
[
helper
.
make_tensor_value_info
(
"output_{}"
.
format
(
i
),
TensorProto
.
FLOAT
,
list
(
outdatas
[
i
]
.
shape
))
for
i
in
range
(
len
(
split
))
])
model
=
helper
.
make_model
(
graph
,
producer_name
=
'split_test'
)
for
target
,
ctx
in
ctx_list
():
output_shape
=
[
o
.
shape
for
o
in
outdatas
]
output_type
=
[
'float32'
,
'float32'
,
'float32'
]
tvm_out
=
get_tvm_output
(
model
,
indata
,
target
,
ctx
,
output_shape
,
output_type
)
for
o
,
t
in
zip
(
outdatas
,
tvm_out
):
tvm
.
testing
.
assert_allclose
(
o
,
t
)
def
test_split
():
# 1D
verify_split
([
1.
,
2.
,
3.
,
4.
,
5.
,
6.
],
[[
1.
,
2.
],
[
3.
,
4.
],
[
5.
,
6.
]],
[
2
,
2
,
2
],
0
)
verify_split
([
1.
,
2.
,
3.
,
4.
,
5.
,
6.
],
[[
1.
,
2.
],
[
3.
],
[
4.
,
5.
,
6.
]],
[
2
,
1
,
3
],
0
)
# 2D
verify_split
([[
1.
,
2.
,
3.
,
4.
],
[
7.
,
8.
,
9.
,
10.
]],
[[[
1.
,
2.
],
[
7.
,
8.
]],
[[
3.
,
4.
],
[
9.
,
10.
]]],
[
2
,
2
],
1
)
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
# verify_super_resolution_example()
# verify_super_resolution_example()
# verify_squeezenet1_1()
# verify_squeezenet1_1()
...
@@ -737,3 +772,4 @@ if __name__ == '__main__':
...
@@ -737,3 +772,4 @@ if __name__ == '__main__':
test_forward_arg_min_max
()
test_forward_arg_min_max
()
test_softmax
()
test_softmax
()
test_constantfill
()
test_constantfill
()
test_split
()
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