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

Jump to bottom

Add TensorScatterAdd op for opset 16 #1949

Merged
merged 6 commits into from
May 27, 2022
Merged

Add TensorScatterAdd op for opset 16 #1949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be6e457
add TensorScatterAdd op conversion in opset 16
hwangdeyu May 25, 2022
dd77eb9
add unit test
hwangdeyu May 25, 2022
0ce8de1
Merge branch 'main' into ScatterND_16
hwangdeyu May 25, 2022
bee0ec4
fix pylint name
hwangdeyu May 25, 2022
d03de39
Merge branch 'main' into ScatterND_16
hwangdeyu May 27, 2022
f6be9d8
fix typo and test op check
hwangdeyu May 27, 2022
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
11 changes: 11 additions & 0 deletions tests/test_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4698,6 +4698,17 @@ def func(x, y, z):
return tf.identity(x_, name=_TFOUTPUT)
self._run_test_case(func, [_OUTPUT], {_INPUT: x_val, _INPUT1: y_val, _INPUT2: z_val})

@check_opset_min_version(16, "ScatterND")
def test_scatternd_add(self):
x_val = np.array([10, 20, 30, 40], dtype=np.int32).reshape((4))
y_val = np.array([0, 2], dtype=np.int64).reshape((2, 1))
z_val = np.array([20, 30], dtype=np.int32).reshape((2))

def func(x, y, z):
x_ = tf.tensor_scatter_nd_add(x, y, z)
return tf.identity(x_, name=_TFOUTPUT)
self._run_test_case(func, [_OUTPUT], {_INPUT: x_val, _INPUT1: y_val, _INPUT2: z_val})

@check_opset_min_version(11, "ScatterND")
def test_scatternd_1d(self):
x_val = np.array([4, 3, 1, 7], dtype=np.int32).reshape((4, 1))
Expand Down
10 changes: 10 additions & 0 deletions tf2onnx/onnx_opset/tensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,16 @@ def version_11(cls, ctx, node, **kwargs):
ctx.replace_inputs(node, [node.input[2], node.input[0], node.input[1]])


@tf_op("TensorScatterAdd", onnx_op="ScatterND")
class TensorScatterAdd:
@classmethod
def version_16(cls, ctx, node, **kwargs):
# indicies input must be int64 in ONNX.
if ctx.get_dtype(node.input[1]) != TensorProto.INT64:
ctx.insert_new_node_on_input(node, "Cast", node.input[1], to=TensorProto.INT64)
node.set_attr("reduction", 'add')


@tf_op("TensorScatterUpdate", onnx_op="ScatterND")
class TensorScatterUpdate:
@classmethod
Expand Down