diff --git a/include/tim/vx/ops.h b/include/tim/vx/ops.h index d93b313..230c667 100644 --- a/include/tim/vx/ops.h +++ b/include/tim/vx/ops.h @@ -67,6 +67,8 @@ #include "tim/vx/ops/resize.h" #include "tim/vx/ops/reverse.h" #include "tim/vx/ops/rnn_cell.h" +#include "tim/vx/ops/roi_align.h" +#include "tim/vx/ops/roi_pool.h" #include "tim/vx/ops/scatternd.h" #include "tim/vx/ops/select.h" #include "tim/vx/ops/shuffle_channel.h" diff --git a/include/tim/vx/ops/roi_pool.h b/include/tim/vx/ops/roi_pool.h new file mode 100644 index 0000000..953b3f3 --- /dev/null +++ b/include/tim/vx/ops/roi_pool.h @@ -0,0 +1,65 @@ +/**************************************************************************** +* +* 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_ROI_POOL_H_ +#define TIM_VX_OPS_ROI_POOL_H_ + +#include +#include "tim/vx/direct_map_op.h" +#include "tim/vx/types.h" + +namespace tim { +namespace vx { +namespace ops { + +/** + * ## ROI_POOL + * + * Select and scale the feature map of each region of interest to a unified output + * size by max-pooling. + * + * pool_type : only support max-pooling (MAX) + * scale : The ratio of image to feature map (Range: 0 < scale <= 1) + * size : The size of roi pooling (height/width) + * + */ + +class ROI_Pool : public DirectMapOp { + public: + ROI_Pool(Graph* graph, PoolType type, float scale, + const std::array& size); + + std::shared_ptr Clone( + std::shared_ptr& graph) const override; + + protected: + const PoolType type_; + const float scale_; + std::array size_; +}; + +} // namespace ops +} // namespace vx +} // namespace tim + +#endif /* TIM_VX_OPS_ROI_POOL_H_ */ diff --git a/src/tim/vx/ops/roi_align_test.cc b/src/tim/vx/ops/roi_align_test.cc index 1785e13..00fd6d4 100644 --- a/src/tim/vx/ops/roi_align_test.cc +++ b/src/tim/vx/ops/roi_align_test.cc @@ -48,7 +48,7 @@ TEST(ROI_Align, shape_4_2_1_1_float32) { int32_t width_sample_num = 4; tim::vx::ShapeType input_shape({width, height, channels, batch}); //whcn - tim::vx::ShapeType regions_shape({num_rois, 4}); + tim::vx::ShapeType regions_shape({4, num_rois}); tim::vx::ShapeType batch_index_shape({num_rois}); tim::vx::ShapeType output_shape( {(uint32_t)out_width, (uint32_t)out_height, depth, num_rois}); diff --git a/src/tim/vx/ops/roi_pool.cc b/src/tim/vx/ops/roi_pool.cc new file mode 100644 index 0000000..e0243ce --- /dev/null +++ b/src/tim/vx/ops/roi_pool.cc @@ -0,0 +1,54 @@ +/**************************************************************************** +* +* 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/roi_pool.h" + +#include "direct_map_op_impl.h" +#include "type_utils.h" +#include "vsi_nn_pub.h" + +namespace tim { +namespace vx { +namespace ops { + +ROI_Pool::ROI_Pool(Graph* graph, PoolType type, float scale, + const std::array& size) + : DirectMapOp(graph, VSI_NN_OP_ROI_POOL), + type_(type), + scale_(scale), + size_(size) { + this->impl()->node()->nn_param.roi_pool.type = TranslatePoolType(type); + this->impl()->node()->nn_param.roi_pool.scale = scale; + this->impl()->node()->nn_param.roi_pool.size[0] = size[0]; + this->impl()->node()->nn_param.roi_pool.size[1] = size[1]; +} + +std::shared_ptr ROI_Pool::Clone( + std::shared_ptr& graph) const { + return graph->CreateOperation( + this->type_, this->scale_, this->size_); +} + +} // namespace ops +} // namespace vx +} // namespace tim \ No newline at end of file diff --git a/src/tim/vx/ops/roi_pool_test.cc b/src/tim/vx/ops/roi_pool_test.cc new file mode 100644 index 0000000..33e7e46 --- /dev/null +++ b/src/tim/vx/ops/roi_pool_test.cc @@ -0,0 +1,100 @@ +/**************************************************************************** +* +* 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/roi_pool.h" + +#include "gtest/gtest.h" +#include "test_utils.h" +#include "tim/vx/context.h" +#include "tim/vx/graph.h" +#include "tim/vx/types.h" + +TEST(ROI_Pool, shape_4_2_1_1_float32) { + auto ctx = tim::vx::Context::Create(); + auto graph = ctx->CreateGraph(); + + uint32_t height = 4; + uint32_t width = 4; + uint32_t channels = 1; + uint32_t batch = 1; + uint32_t num_rois = 4; + uint32_t depth = channels; + + int32_t out_height = 2; + int32_t out_width = 2; + float scale = 0.5f; + + + tim::vx::ShapeType input_shape({width, height, channels, batch}); //whcn + tim::vx::ShapeType regions_shape({5, num_rois}); + tim::vx::ShapeType output_shape( + {(uint32_t)out_width, (uint32_t)out_height, depth, num_rois}); + + tim::vx::TensorSpec input_spec(tim::vx::DataType::FLOAT32, input_shape, + tim::vx::TensorAttribute::INPUT); + tim::vx::TensorSpec regions_spec(tim::vx::DataType::FLOAT32, regions_shape, + tim::vx::TensorAttribute::INPUT); + tim::vx::TensorSpec output_spec(tim::vx::DataType::FLOAT32, output_shape, + tim::vx::TensorAttribute::OUTPUT); + + std::vector input_data = {-10.0f, -1.0f, 4.0f, -5.0f, + -8.0f, -2.0f, 9.0f, 1.0f, + 7.0f, -2.0f, 3.0f, -7.0f, + -2.0f, 10.0f, -3.0f, 5.0f}; + + std::vector regions_data = {0.0f, 2.0f, 2.0f, 4.0f, 4.0f, + 0.0f, 0.0f, 0.0f, 8.0f, 8.0f, + 0.0f, 2.0f, 0.0f, 4.0f, 8.0f, + 0.0f, 0.0f, 2.0f, 8.0f, 4.0f}; + + + std::vector golden = { + -2, 9, -2, 3, + 9, 9, 10, 5, + -1, 9, 10, 3, + 9, 9, 7, 3}; + + auto input_tensor = graph->CreateTensor(input_spec); + auto regions_tensor = graph->CreateTensor(regions_spec); + auto output_tensor = graph->CreateTensor(output_spec); + + std::array size; + size[0] = out_height; + size[1] = out_width; + auto roi_pool = graph->CreateOperation(tim::vx::PoolType::MAX, scale, size); + (*roi_pool) + .BindInput(input_tensor) + .BindInput(regions_tensor) + .BindOutput(output_tensor); + + + + EXPECT_TRUE(input_tensor->CopyDataToTensor(input_data.data(), input_data.size()*sizeof(float))); + EXPECT_TRUE(regions_tensor->CopyDataToTensor(regions_data.data(), regions_data.size()*sizeof(float))); + EXPECT_TRUE(graph->Compile()); + EXPECT_TRUE(graph->Run()); + + std::vector output(num_rois * out_height * out_width * depth); + EXPECT_TRUE(output_tensor->CopyDataFromTensor(output.data())); + EXPECT_EQ(golden, output); +} \ No newline at end of file