Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bug in nnvm to relay converter. #2756

Merged
merged 2 commits into from
Mar 14, 2019
Merged

Fix a bug in nnvm to relay converter. #2756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae2d046
Fix a bug in nnvm to relay converter.
Mar 9, 2019
484e28b
Refine fix to handle the case output is a TupleWrapper
Mar 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions nnvm/python/nnvm/to_relay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# pylint: disable=no-else-return, unidiomatic-typecheck, invalid-name, unused-argument
"""Convert an NNVM graph to Relay."""
import json
import numpy

from tvm import relay, nd
Expand Down Expand Up @@ -241,7 +240,7 @@ def _split(children, attrs, odtype='float32'):

axis = attrs.get_int('axis', 0)

return op.split(children[0], indices_or_sections, axis).astuple()
return op.split(children[0], indices_or_sections, axis)

def _squeeze(children, attrs, odtype='float32'):
axis = attrs.get_int_tuple('axis', None)
Expand Down Expand Up @@ -441,12 +440,10 @@ def to_relay(graph, shape_dict, dtype_dict, params):
graph = graph.apply(["InferShape", "InferType"])
shape = graph.json_attr("shape")
dtype = [graph_attr.TCODE_TO_DTYPE[di] for di in graph.json_attr("dtype")]
heads = [x[0] for x in json.loads(graph.json())['heads']]

gidx = graph.index
relay_map = {}
fn_params = []
output_ids = []

for nid, node in enumerate(gidx.nodes):
children = []
Expand All @@ -468,9 +465,6 @@ def to_relay(graph, shape_dict, dtype_dict, params):
fn_params.append(v)
relay_map[nid] = v
else:
if nid in heads:
output_ids.append(nid)

if op_name in NNVM_OP_2_RELAY_OP:
str_attrs = StrAttrsDict(attrs)
call = NNVM_OP_2_RELAY_OP[op_name](children, str_attrs, odtype)
Expand All @@ -479,7 +473,14 @@ def to_relay(graph, shape_dict, dtype_dict, params):
raise Exception(
"nnvm.to_relay: unsupported operator: {0}".format(op_name))

outputs = [relay_map[nid] for nid in output_ids]
outputs = []
for nid, idx, _ in gidx.output_entries:
output = relay_map[nid]
if isinstance(output, expr.TupleWrapper):
outputs.append(output[idx])
else:
outputs.append(output)

if len(outputs) == 1:
body = outputs[0]
else:
Expand Down
18 changes: 18 additions & 0 deletions tests/python/frontend/nnvm_to_relay/test_forward.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,23 @@ def test_forward_dqn():
verify_nnvm_to_relay(model, params, data_shape=(1, 4, 84, 84))


def test_forward_split_concatenate():
shape = (2, 16)

tensor = nnvm.sym.Variable("data", shape=shape)

splited = nnvm.sym.split(tensor, indices_or_sections=2, axis=1)

concatenated = nnvm.sym.concatenate(*splited, axis=1)

params = {}

verify_nnvm_to_relay(splited[0], params, data_shape=shape)
verify_nnvm_to_relay(splited[1], params, data_shape=shape)
verify_nnvm_to_relay(splited, params, data_shape=shape)
verify_nnvm_to_relay(concatenated, params, data_shape=shape)


if __name__ == '__main__':
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add test_forward_split_concatenate() here so that the test will be executed when we run the this script directly.

test_forward_mlp()
test_forward_vgg()
Expand All @@ -80,3 +97,4 @@ def test_forward_dqn():
test_forward_inception_v3()
test_forward_densenet()
test_forward_dqn()
test_forward_split_concatenate()