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

Fixed bugs in squeeze/unsqueeze for string ops #1261

Merged
merged 1 commit into from
Jan 8, 2021
Merged

Fixed bugs in squeeze/unsqueeze for string ops #1261

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions tf2onnx/custom_opsets/string_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ def any_version(cls, opset, ctx, node, **kwargs):
node.domain = constants.CONTRIB_OPS_DOMAIN
for a in list(node.attr.keys()):
del node.attr[a]
unsqueeze_node = GraphBuilder(ctx).make_squeeze(
{'data': node.input[1], 'axes': [0]}, return_node=True)
unsqueeze_node = GraphBuilder(ctx).make_unsqueeze({'data': node.input[1], 'axes': [0]}, return_node=True)

skip_empty_const = ctx.make_const(utils.make_name('skip_empty_const'), np.array([skip_empty], np.bool))
ctx.replace_inputs(node, [node.input[0], unsqueeze_node.output[0], skip_empty_const.output[0]])
Expand Down Expand Up @@ -88,8 +87,8 @@ def any_version(cls, opset, ctx, node, **kwargs):
if ctx.get_shape(inp) == [] and shape_node is not None:
expand_node = ctx.make_node("Expand", [inp, shape_node.output[0]])
inp = expand_node.output[0]
unsqueeze_node = GraphBuilder(ctx).make_squeeze({'data': inp, 'axes': [0]})
unsqueezes.append(unsqueeze_node.output[0])
unsqueeze_node = GraphBuilder(ctx).make_unsqueeze({'data': inp, 'axes': [0]})
unsqueezes.append(unsqueeze_node)
stack_node = ctx.make_node("Concat", unsqueezes, attr={'axis': 0})
ctx.replace_inputs(node, [stack_node.output[0], separator_node.output[0], axis_node.output[0]])

Expand Down