Add ScatterND_Update operator (#652)

* Add ScatterND_Update operator * Remove ScatterNDUpdate shape param * Rename ScatterND_Update to ScatterND_ONNX_V16 * Fix ScatterND_ONNX_V16 rename problem --------- Co-authored-by: unknown <[email protected]>
VeriSilicon · Oct 11, 2023 · 1008179 · 1008179
1 parent 363c369
commit 1008179
Show file tree

Hide file tree

Showing 4 changed files with 168 additions and 0 deletions.
diff --git a/include/tim/vx/ops.h b/include/tim/vx/ops.h
@@ -108,5 +108,6 @@
 #include "tim/vx/ops/max_pool3d.h"
 #include "tim/vx/ops/unidirectional_sequence_gru.h"
 #include "tim/vx/ops/grucell.h"
+#include "tim/vx/ops/scatternd_onnx_v16.h"
 
 #endif /* TIM_VX_OPS_H_ */
diff --git a/include/tim/vx/ops/scatternd_onnx_v16.h b/include/tim/vx/ops/scatternd_onnx_v16.h
@@ -0,0 +1,51 @@
+/****************************************************************************
+*
+*    Copyright (c) 2020-2023 Vivante Corporation
+*
+*    Permission is hereby granted, free of charge, to any person obtaining a
+*    copy of this software and associated documentation files (the "Software"),
+*    to deal in the Software without restriction, including without limitation
+*    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+*    and/or sell copies of the Software, and to permit persons to whom the
+*    Software is furnished to do so, subject to the following conditions:
+*
+*    The above copyright notice and this permission notice shall be included in
+*    all copies or substantial portions of the Software.
+*
+*    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+*    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+*    DEALINGS IN THE SOFTWARE.
+*
+*****************************************************************************/
+#ifndef TIM_VX_OPS_SCATTERND_ONNX_V16_H_
+#define TIM_VX_OPS_SCATTERND_ONNX_V16_H_
+#include "tim/vx/builtin_op.h"
+
+namespace tim {
+namespace vx {
+namespace ops {
+
+/**
+ * ## ScatterND_ONNX_V16
+ *
+ * Scatter updates into a new tensor according to indices.
+ *
+ * - shape : The shape of the resulting tensor. 
+ */
+
+class ScatterND_ONNX_V16 : public BuiltinOp {
+ public:
+  ScatterND_ONNX_V16(Graph* graph);
+
+  std::shared_ptr<Operation> Clone(std::shared_ptr<Graph>& graph) const override;
+};
+
+}  // namespace ops
+}  // namespace vx
+}  // namespace tim
+
+#endif /* TIM_VX_OPS_SCATTERND_ONNX_V16_H_ */
diff --git a/src/tim/vx/ops/scatternd_onnx_v16.cc b/src/tim/vx/ops/scatternd_onnx_v16.cc
@@ -0,0 +1,43 @@
+/****************************************************************************
+*
+*    Copyright (c) 2020-2023 Vivante Corporation
+*
+*    Permission is hereby granted, free of charge, to any person obtaining a
+*    copy of this software and associated documentation files (the "Software"),
+*    to deal in the Software without restriction, including without limitation
+*    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+*    and/or sell copies of the Software, and to permit persons to whom the
+*    Software is furnished to do so, subject to the following conditions:
+*
+*    The above copyright notice and this permission notice shall be included in
+*    all copies or substantial portions of the Software.
+*
+*    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+*    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+*    DEALINGS IN THE SOFTWARE.
+*
+*****************************************************************************/
+#include "tim/vx/ops/scatternd_onnx_v16.h"
+
+#include "builtin_op_impl.h"
+#include "vsi_nn_pub.h"
+
+namespace tim {
+namespace vx {
+namespace ops {
+
+ScatterND_ONNX_V16::ScatterND_ONNX_V16(Graph* graph)
+    : BuiltinOp(graph, VSI_NN_OP_SCATTER_ND_UPDATE) {
+}
+
+std::shared_ptr<Operation> ScatterND_ONNX_V16::Clone(std::shared_ptr<Graph>& graph) const {
+  return graph->CreateOperation<ScatterND_ONNX_V16>();
+}
+
+}  // namespace ops
+}  // namespace vx
+}  // namespace tim
diff --git a/src/tim/vx/ops/scatternd_onnx_v16_test.cc b/src/tim/vx/ops/scatternd_onnx_v16_test.cc
@@ -0,0 +1,73 @@
+/****************************************************************************
+*
+*    Copyright (c) 2020-2023 Vivante Corporation
+*
+*    Permission is hereby granted, free of charge, to any person obtaining a
+*    copy of this software and associated documentation files (the "Software"),
+*    to deal in the Software without restriction, including without limitation
+*    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+*    and/or sell copies of the Software, and to permit persons to whom the
+*    Software is furnished to do so, subject to the following conditions:
+*
+*    The above copyright notice and this permission notice shall be included in
+*    all copies or substantial portions of the Software.
+*
+*    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+*    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+*    DEALINGS IN THE SOFTWARE.
+*
+*****************************************************************************/
+#include "tim/vx/context.h"
+#include "tim/vx/graph.h"
+#include "tim/vx/ops/scatternd_onnx_v16.h"
+
+#include "gtest/gtest.h"
+
+TEST(ScatterND_ONNX_V16, shape_8) {
+    auto ctx = tim::vx::Context::Create();
+    auto graph = ctx->CreateGraph();
+
+    tim::vx::ShapeType in_shape({8});
+    tim::vx::ShapeType indices_shape({1,4});
+    tim::vx::ShapeType updates_shape({4});
+    tim::vx::ShapeType out_shape({8});
+    tim::vx::TensorSpec input_spec(tim::vx::DataType::FLOAT32,
+                            in_shape, tim::vx::TensorAttribute::INPUT);
+    tim::vx::TensorSpec indices_spec(tim::vx::DataType::INT32,
+                            indices_shape, tim::vx::TensorAttribute::INPUT);
+    tim::vx::TensorSpec updates_spec(tim::vx::DataType::FLOAT32,
+                            updates_shape, tim::vx::TensorAttribute::INPUT);
+    tim::vx::TensorSpec output_spec(tim::vx::DataType::FLOAT32,
+                            out_shape, tim::vx::TensorAttribute::OUTPUT);
+
+    auto input_tensor = graph->CreateTensor(input_spec);
+    auto indices_tensor = graph->CreateTensor(indices_spec);
+    auto updates_tensor = graph->CreateTensor(updates_spec);
+    auto output_tensor = graph->CreateTensor(output_spec);
+
+    std::vector<float> input_data = { 1, 2, 3, 4, 5, 6, 7, 8};
+    std::vector<int32_t> indices_data = { 4, 3, 1, 7 };
+    std::vector<float> updates_data = { 9, 10, 11, 12 };
+    std::vector<float> golden = { 1, 11, 3, 10, 9, 6, 7, 12 };
+
+    EXPECT_TRUE(input_tensor->CopyDataToTensor(
+        input_data.data(), input_data.size()*sizeof(float)));
+    EXPECT_TRUE(indices_tensor->CopyDataToTensor(
+        indices_data.data(), indices_data.size()*sizeof(int32_t)));
+    EXPECT_TRUE(updates_tensor->CopyDataToTensor(
+        updates_data.data(), updates_data.size()*sizeof(float)));
+    auto op = graph->CreateOperation<tim::vx::ops::ScatterND_ONNX_V16>();
+    (*op).BindInputs({input_tensor, indices_tensor, updates_tensor}).BindOutputs({output_tensor});
+
+    EXPECT_TRUE(graph->Compile());
+    EXPECT_TRUE(graph->Run());
+    std::vector<float> output(golden.size());
+
+    EXPECT_TRUE(output_tensor->CopyDataFromTensor(output.data()));
+    EXPECT_EQ(golden, output);
+}
+