Skip to content

Fix None shape error when one input to ConcatV2 has a shape. #2135

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

Merged
merged 7 commits into from
Apr 12, 2023
Merged

Fix None shape error when one input to ConcatV2 has a shape. #2135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
314e8f1
Fix None shape error when one input to ConcatV2 has a shape.
klasma Mar 14, 2023
cb51875
Merge branch 'main' into fix-none-shape-concatenation
klasma Mar 16, 2023
3bc954e
Merge branch 'main' into fix-none-shape-concatenation
fatcat-z Mar 24, 2023
3c3d659
Merge branch 'main' into fix-none-shape-concatenation
fatcat-z Apr 12, 2023
8f5f1d9
Test of negative axis concatenation where the first input has none sh…
klasma Apr 12, 2023
47fec37
Merge branch 'main' of https://github.com/klasma/tensorflow-onnx into…
klasma Apr 12, 2023
03cfaee
Merge branch 'fix-none-shape-concatenation' of https://github.com/kla…
klasma Apr 12, 2023
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: 17 additions & 0 deletions tests/test_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,6 +1685,23 @@ def func(x1, x2, x3):
return tf.identity(x_, name=_TFOUTPUT)
self._run_test_case(func, [_OUTPUT], {_INPUT: x_val1, _INPUT1: x_val2, "input3:0": x_val3})

def test_concat_negative_axis_none_shape(self):
x_val = np.array([1.0, 2.0, 3.0, 4.0, 5.0, 6.0], dtype=np.float32).reshape((2, 3))
y_val = np.array([7.0, 8.0, 9.0, 10.0, 11.0, 12.0], dtype=np.float32).reshape((2, 3))
s1_val = np.array([1, 1], dtype=np.int32)
s2_val = np.array([1, 1], dtype=np.int32)
def func():
x = tf_placeholder(tf.float32, [2, 3], name=_TFINPUT)
y = tf_placeholder(tf.float32, [2, 3], name=_TFINPUT1)
s1 = tf_placeholder(tf.int32, [2], name="input3")
s2 = tf_placeholder(tf.int32, [2], name="input4")
s = tf.add(s1, s2)
x_with_none_shape = tf.slice(x, [0, 0], s)
t = tf.concat([x_with_none_shape, y], -1)
return tf.identity(t, name=_TFOUTPUT)
self._run_test_case(func, [_OUTPUT], {_INPUT: x_val, _INPUT1: y_val, "input3:0": s1_val, "input4:0": s2_val},
as_session=True, premade_placeholders=True)

def test_concat_const_string(self):
x_val1 = np.array([["Hello world", "abc"], ["def", "♦♥♠♣"]], dtype=str)
const_val = np.array([["Hello there", "wxyz"], ["", "π"]], dtype=str)
Expand Down
9 changes: 7 additions & 2 deletions tf2onnx/onnx_opset/tensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,13 @@ def version_1(cls, ctx, node, **kwargs):
ctx.remove_input(node, node.input[-1], len(node.input) - 1)

if axis_val < 0: # onnxruntime does not support -1 axis, but TF supports.
input_shape = ctx.get_shape(node.input[0])
utils.make_sure(input_shape is not None, "shape of {} is None".format(node.input[0]))
input_shape = None
for node_input in node.input:
input_shape = ctx.get_shape(node_input)
if input_shape is not None:
break
utils.make_sure(input_shape is not None,
"the shapes of the following inputs are None: {}".format(', '.join(node.input)))
axis_val = len(input_shape) + axis_val
node.set_attr("axis", axis_val)

Expand Down