From 7a8ae32f7339206e3fcf6f0ddc0d0e9eaea8a255 Mon Sep 17 00:00:00 2001 From: chxin66 <57057788+chxin66@users.noreply.github.com> Date: Thu, 5 May 2022 17:06:39 +0800 Subject: [PATCH] Added topk & unit test (#384) Signed-off-by: Chen Xin Co-authored-by: Chen Xin --- include/tim/vx/ops/topk.h | 55 ++++++++++++++++++ src/tim/vx/ops/topk.cc | 45 +++++++++++++++ src/tim/vx/ops/topk_test.cc | 110 ++++++++++++++++++++++++++++++++++++ 3 files changed, 210 insertions(+) create mode 100644 include/tim/vx/ops/topk.h create mode 100644 src/tim/vx/ops/topk.cc create mode 100644 src/tim/vx/ops/topk_test.cc diff --git a/include/tim/vx/ops/topk.h b/include/tim/vx/ops/topk.h new file mode 100644 index 0000000..36b82fe --- /dev/null +++ b/include/tim/vx/ops/topk.h @@ -0,0 +1,55 @@ +/**************************************************************************** +* +* Copyright (c) 2022 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_TOPK_H_ +#define TIM_VX_OPS_TOPK_H_ + +#include + +#include "tim/vx/direct_map_op.h" +#include "tim/vx/types.h" + +namespace tim { +namespace vx { +namespace ops { + +/** + * ## Topk + * + * Finds values and indices of the k largest entries for the last dimension. + * + * - k : Number of top elements to look for along the last dimension. + */ + +class Topk : public DirectMapOp { + public: + Topk(Graph* graph, uint32_t k); + + std::shared_ptr Clone(std::shared_ptr& graph) const override; +}; + +} // namespace ops +} // namespace vx +} // namespace tim + +#endif /* TIM_VX_OPS_TOPK_H_ */ \ No newline at end of file diff --git a/src/tim/vx/ops/topk.cc b/src/tim/vx/ops/topk.cc new file mode 100644 index 0000000..010e506 --- /dev/null +++ b/src/tim/vx/ops/topk.cc @@ -0,0 +1,45 @@ +/**************************************************************************** +* +* Copyright (c) 2022 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/topk.h" + +#include "direct_map_op_impl.h" +#include "type_utils.h" +#include "vsi_nn_pub.h" + +namespace tim { +namespace vx { +namespace ops { + +Topk::Topk(Graph* graph, uint32_t k) + : DirectMapOp(graph, VSI_NN_OP_TOPK) { + this->impl()->node()->nn_param.topk.k = k; +} + +std::shared_ptr Topk::Clone(std::shared_ptr& graph) const { + return graph->CreateOperation(this->impl()->node()->nn_param.topk.k); +} + +} // namespace ops +} // namespace vx +} // namespace tim \ No newline at end of file diff --git a/src/tim/vx/ops/topk_test.cc b/src/tim/vx/ops/topk_test.cc new file mode 100644 index 0000000..dcf05df --- /dev/null +++ b/src/tim/vx/ops/topk_test.cc @@ -0,0 +1,110 @@ +/**************************************************************************** +* +* Copyright (c) 2022 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/topk.h" + +#include "gtest/gtest.h" + +TEST(Topk, shape_3_4_k_2) { + auto ctx = tim::vx::Context::Create(); + auto graph = ctx->CreateGraph(); + + tim::vx::ShapeType input_shape({4, 3}); + tim::vx::ShapeType values_shape({6}); + tim::vx::TensorSpec input_spec(tim::vx::DataType::FLOAT32, input_shape, + tim::vx::TensorAttribute::INPUT); + tim::vx::TensorSpec values_spec(tim::vx::DataType::FLOAT32, values_shape, + tim::vx::TensorAttribute::OUTPUT); + tim::vx::TensorSpec indices_spec(tim::vx::DataType::INT32, values_shape, + tim::vx::TensorAttribute::OUTPUT); + auto input_tensor = graph->CreateTensor(input_spec); + auto value_tensor = graph->CreateTensor(values_spec); + auto indices_tensor = graph->CreateTensor(indices_spec); + + std::vector in_data = { + 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4, + }; + std::vector value_golden = { + 4, 3, 4, 3, 4, 3, + }; + std::vector indices_golden = { + 3, 2, 3, 2, 3, 2, + }; + EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), + in_data.size() * sizeof(float))); + auto op = graph->CreateOperation(2); + (*op).BindInputs({input_tensor}).BindOutputs({value_tensor, indices_tensor}); + + EXPECT_TRUE(graph->Compile()); + EXPECT_TRUE(graph->Run()); + + std::vector value(value_golden.size()); + std::vector indices(6); + EXPECT_TRUE(value_tensor->CopyDataFromTensor(value.data())); + EXPECT_TRUE(indices_tensor->CopyDataFromTensor(indices.data())); + EXPECT_EQ(value_golden, value); + EXPECT_EQ(indices_golden, indices); +} + +TEST(Topk, shape_3_2_2_k_1) { + auto ctx = tim::vx::Context::Create(); + auto graph = ctx->CreateGraph(); + + tim::vx::ShapeType input_shape({2, 2, 3}); + tim::vx::ShapeType values_shape({6}); + tim::vx::TensorSpec input_spec(tim::vx::DataType::FLOAT32, input_shape, + tim::vx::TensorAttribute::INPUT); + tim::vx::TensorSpec values_spec(tim::vx::DataType::FLOAT32, values_shape, + tim::vx::TensorAttribute::OUTPUT); + tim::vx::TensorSpec indices_spec(tim::vx::DataType::INT32, values_shape, + tim::vx::TensorAttribute::OUTPUT); + auto input_tensor = graph->CreateTensor(input_spec); + auto value_tensor = graph->CreateTensor(values_spec); + auto indices_tensor = graph->CreateTensor(indices_spec); + + std::vector in_data = { + 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4, + }; + std::vector value_golden = { + 2, 4, 2, 4, 2, 4, + }; + std::vector indices_golden = { + 1, 1, 1, 1, 1, 1, + }; + EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), + in_data.size() * sizeof(float))); + auto op = graph->CreateOperation(1); + (*op).BindInputs({input_tensor}).BindOutputs({value_tensor, indices_tensor}); + + EXPECT_TRUE(graph->Compile()); + EXPECT_TRUE(graph->Run()); + + std::vector value(value_golden.size()); + std::vector indices(6); + EXPECT_TRUE(value_tensor->CopyDataFromTensor(value.data())); + EXPECT_TRUE(indices_tensor->CopyDataFromTensor(indices.data())); + EXPECT_EQ(value_golden, value); + EXPECT_EQ(indices_golden, indices); +} \ No newline at end of file