From c23f6fa1ad71908fb239348f990e6b18be19f2fb Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 26 Sep 2023 16:51:16 +0800 Subject: [PATCH 1/4] Add ScatterND_Update operator --- include/tim/vx/ops.h | 1 + include/tim/vx/ops/scatternd_update.h | 54 ++++++++++++++++++ src/tim/vx/ops/scatternd_update.cc | 45 +++++++++++++++ src/tim/vx/ops/scatternd_update_test.cc | 74 +++++++++++++++++++++++++ 4 files changed, 174 insertions(+) create mode 100644 include/tim/vx/ops/scatternd_update.h create mode 100644 src/tim/vx/ops/scatternd_update.cc create mode 100644 src/tim/vx/ops/scatternd_update_test.cc diff --git a/include/tim/vx/ops.h b/include/tim/vx/ops.h index 270d4fbbf..efc84b1aa 100644 --- 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_update.h" #endif /* TIM_VX_OPS_H_ */ diff --git a/include/tim/vx/ops/scatternd_update.h b/include/tim/vx/ops/scatternd_update.h new file mode 100644 index 000000000..7786acf27 --- /dev/null +++ b/include/tim/vx/ops/scatternd_update.h @@ -0,0 +1,54 @@ +/**************************************************************************** +* +* 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_UPDATE_H_ +#define TIM_VX_OPS_SCATTERND_UPDATE_H_ +#include "tim/vx/builtin_op.h" + +namespace tim { +namespace vx { +namespace ops { + +/** + * ## ScatterND_Update + * + * Scatter updates into a new tensor according to indices. + * + * - shape : The shape of the resulting tensor. + */ + +class ScatterND_Update : public BuiltinOp { + public: + ScatterND_Update(Graph* graph, const std::vector& shape); + + std::shared_ptr Clone(std::shared_ptr& graph) const override; + + protected: + const std::vector shape_; +}; + +} // namespace ops +} // namespace vx +} // namespace tim + +#endif /* TIM_VX_OPS_SCATTERND_UPDATE_H_ */ diff --git a/src/tim/vx/ops/scatternd_update.cc b/src/tim/vx/ops/scatternd_update.cc new file mode 100644 index 000000000..d45b1af51 --- /dev/null +++ b/src/tim/vx/ops/scatternd_update.cc @@ -0,0 +1,45 @@ +/**************************************************************************** +* +* 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_update.h" + +#include "builtin_op_impl.h" +#include "vsi_nn_pub.h" + +namespace tim { +namespace vx { +namespace ops { + +ScatterND_Update::ScatterND_Update(Graph* graph, const std::vector& shape) + : BuiltinOp(graph, VSI_NN_OP_SCATTER_ND_UPDATE), shape_(shape) { + this->impl()->node()->nn_param.scatter_nd.dim_num = shape_.size(); + this->impl()->node()->nn_param.scatter_nd.shape = shape_.data(); +} + +std::shared_ptr ScatterND_Update::Clone(std::shared_ptr& graph) const { + return graph->CreateOperation(this->shape_); +} + +} // namespace ops +} // namespace vx +} // namespace tim \ No newline at end of file diff --git a/src/tim/vx/ops/scatternd_update_test.cc b/src/tim/vx/ops/scatternd_update_test.cc new file mode 100644 index 000000000..d7c299fd3 --- /dev/null +++ b/src/tim/vx/ops/scatternd_update_test.cc @@ -0,0 +1,74 @@ +/**************************************************************************** +* +* 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_update.h" + +#include "gtest/gtest.h" + +TEST(ScatterND_Update, 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 input_data = { 1, 2, 3, 4, 5, 6, 7, 8}; + std::vector indices_data = { 4, 3, 1, 7 }; + std::vector updates_data = { 9, 10, 11, 12 }; + std::vector 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))); + std::vector shape = {8}; + auto op = graph->CreateOperation(shape); + (*op).BindInputs({input_tensor, indices_tensor, updates_tensor}).BindOutputs({output_tensor}); + + EXPECT_TRUE(graph->Compile()); + EXPECT_TRUE(graph->Run()); + std::vector output(golden.size()); + + EXPECT_TRUE(output_tensor->CopyDataFromTensor(output.data())); + EXPECT_EQ(golden, output); +} + From 9843dde4841799d84ad892c365ebd5687f38d3ba Mon Sep 17 00:00:00 2001 From: xie-oritek <142767785+xie-oritek@users.noreply.github.com> Date: Tue, 26 Sep 2023 20:39:10 +0800 Subject: [PATCH 2/4] Remove ScatterNDUpdate shape param --- include/tim/vx/ops/scatternd_update.h | 5 +---- src/tim/vx/ops/scatternd_update.cc | 8 +++----- src/tim/vx/ops/scatternd_update_test.cc | 3 +-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/include/tim/vx/ops/scatternd_update.h b/include/tim/vx/ops/scatternd_update.h index 7786acf27..b1853b4d1 100644 --- a/include/tim/vx/ops/scatternd_update.h +++ b/include/tim/vx/ops/scatternd_update.h @@ -39,12 +39,9 @@ namespace ops { class ScatterND_Update : public BuiltinOp { public: - ScatterND_Update(Graph* graph, const std::vector& shape); + ScatterND_Update(Graph* graph); std::shared_ptr Clone(std::shared_ptr& graph) const override; - - protected: - const std::vector shape_; }; } // namespace ops diff --git a/src/tim/vx/ops/scatternd_update.cc b/src/tim/vx/ops/scatternd_update.cc index d45b1af51..1c09f350a 100644 --- a/src/tim/vx/ops/scatternd_update.cc +++ b/src/tim/vx/ops/scatternd_update.cc @@ -30,14 +30,12 @@ namespace tim { namespace vx { namespace ops { -ScatterND_Update::ScatterND_Update(Graph* graph, const std::vector& shape) - : BuiltinOp(graph, VSI_NN_OP_SCATTER_ND_UPDATE), shape_(shape) { - this->impl()->node()->nn_param.scatter_nd.dim_num = shape_.size(); - this->impl()->node()->nn_param.scatter_nd.shape = shape_.data(); +ScatterND_Update::ScatterND_Update(Graph* graph) + : BuiltinOp(graph, VSI_NN_OP_SCATTER_ND_UPDATE) { } std::shared_ptr ScatterND_Update::Clone(std::shared_ptr& graph) const { - return graph->CreateOperation(this->shape_); + return graph->CreateOperation(); } } // namespace ops diff --git a/src/tim/vx/ops/scatternd_update_test.cc b/src/tim/vx/ops/scatternd_update_test.cc index d7c299fd3..80d121577 100644 --- a/src/tim/vx/ops/scatternd_update_test.cc +++ b/src/tim/vx/ops/scatternd_update_test.cc @@ -60,8 +60,7 @@ TEST(ScatterND_Update, shape_8) { indices_data.data(), indices_data.size()*sizeof(int32_t))); EXPECT_TRUE(updates_tensor->CopyDataToTensor( updates_data.data(), updates_data.size()*sizeof(float))); - std::vector shape = {8}; - auto op = graph->CreateOperation(shape); + auto op = graph->CreateOperation(); (*op).BindInputs({input_tensor, indices_tensor, updates_tensor}).BindOutputs({output_tensor}); EXPECT_TRUE(graph->Compile()); From 894df506cccb15a9fd43a5cf44baabf744663c88 Mon Sep 17 00:00:00 2001 From: xie-oritek <142767785+xie-oritek@users.noreply.github.com> Date: Tue, 10 Oct 2023 19:16:14 +0800 Subject: [PATCH 3/4] Rename ScatterND_Update to ScatterND_ONNX_V16 --- include/tim/vx/ops.h | 2 +- .../ops/{scatternd_update.h => scatternd_onnx_v16.h} | 12 ++++++------ .../{scatternd_update.cc => scatternd_onnx_v16.cc} | 6 +++--- ...rnd_update_test.cc => scatternd_onnx_v16_test.cc} | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) rename include/tim/vx/ops/{scatternd_update.h => scatternd_onnx_v16.h} (87%) rename src/tim/vx/ops/{scatternd_update.cc => scatternd_onnx_v16.cc} (89%) rename src/tim/vx/ops/{scatternd_update_test.cc => scatternd_onnx_v16_test.cc} (95%) diff --git a/include/tim/vx/ops.h b/include/tim/vx/ops.h index efc84b1aa..38a296a5a 100644 --- a/include/tim/vx/ops.h +++ b/include/tim/vx/ops.h @@ -108,6 +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_update.h" +#include "tim/vx/ops/scatternd_onnx_v16.h" #endif /* TIM_VX_OPS_H_ */ diff --git a/include/tim/vx/ops/scatternd_update.h b/include/tim/vx/ops/scatternd_onnx_v16.h similarity index 87% rename from include/tim/vx/ops/scatternd_update.h rename to include/tim/vx/ops/scatternd_onnx_v16.h index b1853b4d1..9b47efff4 100644 --- a/include/tim/vx/ops/scatternd_update.h +++ b/include/tim/vx/ops/scatternd_onnx_v16.h @@ -21,8 +21,8 @@ * DEALINGS IN THE SOFTWARE. * *****************************************************************************/ -#ifndef TIM_VX_OPS_SCATTERND_UPDATE_H_ -#define TIM_VX_OPS_SCATTERND_UPDATE_H_ +#ifndef TIM_VX_OPS_SCATTERND_ONNX_V16_H_ +#define TIM_VX_OPS_SCATTERND_ONNX_V16_H_ #include "tim/vx/builtin_op.h" namespace tim { @@ -30,16 +30,16 @@ namespace vx { namespace ops { /** - * ## ScatterND_Update + * ## ScatterND_ONNX_V16 * * Scatter updates into a new tensor according to indices. * * - shape : The shape of the resulting tensor. */ -class ScatterND_Update : public BuiltinOp { +class ScatterND_ONNX_V16 : public BuiltinOp { public: - ScatterND_Update(Graph* graph); + ScatterND_ONNX_V16(Graph* graph); std::shared_ptr Clone(std::shared_ptr& graph) const override; }; @@ -48,4 +48,4 @@ class ScatterND_Update : public BuiltinOp { } // namespace vx } // namespace tim -#endif /* TIM_VX_OPS_SCATTERND_UPDATE_H_ */ +#endif /* TIM_VX_OPS_SCATTERND_ONNX_V16_H_ */ diff --git a/src/tim/vx/ops/scatternd_update.cc b/src/tim/vx/ops/scatternd_onnx_v16.cc similarity index 89% rename from src/tim/vx/ops/scatternd_update.cc rename to src/tim/vx/ops/scatternd_onnx_v16.cc index 1c09f350a..b2b333fe0 100644 --- a/src/tim/vx/ops/scatternd_update.cc +++ b/src/tim/vx/ops/scatternd_onnx_v16.cc @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. * *****************************************************************************/ -#include "tim/vx/ops/scatternd_update.h" +#include "tim/vx/ops/scatternd_onnx_v16.h" #include "builtin_op_impl.h" #include "vsi_nn_pub.h" @@ -30,11 +30,11 @@ namespace tim { namespace vx { namespace ops { -ScatterND_Update::ScatterND_Update(Graph* graph) +ScatterND_ONNX_V16::ScatterND_Update(Graph* graph) : BuiltinOp(graph, VSI_NN_OP_SCATTER_ND_UPDATE) { } -std::shared_ptr ScatterND_Update::Clone(std::shared_ptr& graph) const { +std::shared_ptr ScatterND_ONNX_V16::Clone(std::shared_ptr& graph) const { return graph->CreateOperation(); } diff --git a/src/tim/vx/ops/scatternd_update_test.cc b/src/tim/vx/ops/scatternd_onnx_v16_test.cc similarity index 95% rename from src/tim/vx/ops/scatternd_update_test.cc rename to src/tim/vx/ops/scatternd_onnx_v16_test.cc index 80d121577..ef8c28e84 100644 --- a/src/tim/vx/ops/scatternd_update_test.cc +++ b/src/tim/vx/ops/scatternd_onnx_v16_test.cc @@ -23,11 +23,11 @@ *****************************************************************************/ #include "tim/vx/context.h" #include "tim/vx/graph.h" -#include "tim/vx/ops/scatternd_update.h" +#include "tim/vx/ops/scatternd_onnx_v16.h" #include "gtest/gtest.h" -TEST(ScatterND_Update, shape_8) { +TEST(ScatterND_ONNX_V16, shape_8) { auto ctx = tim::vx::Context::Create(); auto graph = ctx->CreateGraph(); @@ -60,7 +60,7 @@ TEST(ScatterND_Update, shape_8) { 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(); + auto op = graph->CreateOperation(); (*op).BindInputs({input_tensor, indices_tensor, updates_tensor}).BindOutputs({output_tensor}); EXPECT_TRUE(graph->Compile()); From a42219bd280baae51afedab5ecb9ddf4ecf0ca40 Mon Sep 17 00:00:00 2001 From: xie-oritek <142767785+xie-oritek@users.noreply.github.com> Date: Tue, 10 Oct 2023 19:30:26 +0800 Subject: [PATCH 4/4] Fix ScatterND_ONNX_V16 rename problem --- src/tim/vx/ops/scatternd_onnx_v16.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tim/vx/ops/scatternd_onnx_v16.cc b/src/tim/vx/ops/scatternd_onnx_v16.cc index b2b333fe0..758783a3f 100644 --- a/src/tim/vx/ops/scatternd_onnx_v16.cc +++ b/src/tim/vx/ops/scatternd_onnx_v16.cc @@ -30,12 +30,12 @@ namespace tim { namespace vx { namespace ops { -ScatterND_ONNX_V16::ScatterND_Update(Graph* graph) +ScatterND_ONNX_V16::ScatterND_ONNX_V16(Graph* graph) : BuiltinOp(graph, VSI_NN_OP_SCATTER_ND_UPDATE) { } std::shared_ptr ScatterND_ONNX_V16::Clone(std::shared_ptr& graph) const { - return graph->CreateOperation(); + return graph->CreateOperation(); } } // namespace ops