diff --git a/BUILD b/BUILD index 882991b..53012e8 100644 --- a/BUILD +++ b/BUILD @@ -36,7 +36,8 @@ cc_library( "src/tim/transform/layout_infer_context.h", ] + glob([ "src/tim/vx/ops/*.cc" - ]) + glob(["src/tim/transform/ops/*.*"]), + ], exclude = ["src/tim/vx/ops/*_test.cc"] + ) + glob(["src/tim/transform/ops/*.*"]), deps = [ "//src/tim/vx/internal:ovxlibimpl", ], diff --git a/include/tim/vx/ops/reorg.h b/include/tim/vx/ops/reorg.h new file mode 100644 index 0000000..18ccc89 --- /dev/null +++ b/include/tim/vx/ops/reorg.h @@ -0,0 +1,44 @@ +/**************************************************************************** +* +* Copyright (c) 2021 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_REORG_H_ +#define TIM_VX_OPS_REORG_H_ +#include "tim/vx/operation.h" + +namespace tim { +namespace vx { +namespace ops { + +class Reorg : public Operation { + public: + Reorg(Graph* graph, const uint32_t stride); + + protected: + uint32_t stride_; +}; + +} // namespace ops +} // namespace vx +} // namespace tim + +#endif /* TIM_VX_OPS_REORG_H_ */ diff --git a/src/tim/vx/ops/README.md b/src/tim/vx/ops/README.md index 687aa2f..a831ce4 100644 --- a/src/tim/vx/ops/README.md +++ b/src/tim/vx/ops/README.md @@ -25,7 +25,7 @@ Prelu|PRELU|Mapped Relu|RELU|Mapped ||RELUN|Unmapped ||LSTM|Unmapped -||REORG|Unmapped +Reorg|REORG|Mapped ||VARIABLE|Unmapped L2Normalization|L2_NORMALIZE|Mapped FullyConnected|FCL2|Mapped diff --git a/src/tim/vx/ops/reorg.cc b/src/tim/vx/ops/reorg.cc new file mode 100644 index 0000000..41e9285 --- /dev/null +++ b/src/tim/vx/ops/reorg.cc @@ -0,0 +1,40 @@ +/**************************************************************************** +* +* Copyright (c) 2021 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/reorg.h" + +#include "operation_private.h" +#include "vsi_nn_pub.h" + +namespace tim { +namespace vx { +namespace ops { + +Reorg::Reorg(Graph* graph, const uint32_t stride) + : Operation(graph, VSI_NN_OP_REORG), stride_(stride) { + this->impl()->node()->nn_param.reorg.stride = stride_; +} + +} // namespace ops +} // namespace vx +} // namespace tim diff --git a/src/tim/vx/ops/reorg_test.cc b/src/tim/vx/ops/reorg_test.cc new file mode 100644 index 0000000..9d152e8 --- /dev/null +++ b/src/tim/vx/ops/reorg_test.cc @@ -0,0 +1,110 @@ +/**************************************************************************** +* +* Copyright (c) 2021 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/reorg.h" + +#include "gtest/gtest.h" + +// FIXME (KC) : There seems to be a limitation that Channel needs to be >= 4, +// also stride other than 2 is not tested +TEST(OP, reorg_shape_4_4_4_1_u8) { + auto ctx = tim::vx::Context::Create(); + auto graph = ctx->CreateGraph(); + + tim::vx::ShapeType i_shape({4, 4, 4, 1}); + tim::vx::ShapeType o_shape({2, 2, 16, 1}); + tim::vx::Quantization quant(tim::vx::QuantType::ASYMMETRIC, 1, 0); + tim::vx::TensorSpec input_spec(tim::vx::DataType::UINT8, + i_shape, tim::vx::TensorAttribute::INPUT, quant); + tim::vx::TensorSpec output_spec(tim::vx::DataType::UINT8, + o_shape, tim::vx::TensorAttribute::OUTPUT, quant); + + auto input_tensor = graph->CreateTensor(input_spec); + auto output_tensor = graph->CreateTensor(output_spec); + + std::vector in_data = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + }; + std::vector golden = { + 0, 2, 4, 6, 16, 18, 20, 22, 0, 2, 4, 6, 16, 18, 20, 22, + 1, 3, 5, 7, 17, 19, 21, 23, 1, 3, 5, 7, 17, 19, 21, 23, + 8, 10, 12, 14, 24, 26, 28, 30, 8, 10, 12, 14, 24, 26, 28, 30, + 9, 11, 13, 15, 25, 27, 29, 31, 9, 11, 13, 15, 25, 27, 29, 31 + }; + + EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), in_data.size())); + + auto add = graph->CreateOperation(2); + (*add).BindInputs({input_tensor}).BindOutputs({output_tensor}); + + EXPECT_TRUE(graph->Compile()); + EXPECT_TRUE(graph->Run()); + std::vector output(64, 0); + EXPECT_TRUE(output_tensor->CopyDataFromTensor(output.data())); + EXPECT_EQ(golden, output); +} + +TEST(OP, reorg_shape_4_4_4_1_fp32) { + auto ctx = tim::vx::Context::Create(); + auto graph = ctx->CreateGraph(); + + tim::vx::ShapeType i_shape({4, 4, 4, 1}); + tim::vx::ShapeType o_shape({2, 2, 16, 1}); + tim::vx::TensorSpec input_spec(tim::vx::DataType::FLOAT32, + i_shape, tim::vx::TensorAttribute::INPUT); + tim::vx::TensorSpec output_spec(tim::vx::DataType::FLOAT32, + o_shape, tim::vx::TensorAttribute::OUTPUT); + + auto input_tensor = graph->CreateTensor(input_spec); + auto output_tensor = graph->CreateTensor(output_spec); + + std::vector in_data = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + }; + std::vector golden = { + 0, 2, 4, 6, 16, 18, 20, 22, 0, 2, 4, 6, 16, 18, 20, 22, + 1, 3, 5, 7, 17, 19, 21, 23, 1, 3, 5, 7, 17, 19, 21, 23, + 8, 10, 12, 14, 24, 26, 28, 30, 8, 10, 12, 14, 24, 26, 28, 30, + 9, 11, 13, 15, 25, 27, 29, 31, 9, 11, 13, 15, 25, 27, 29, 31 + }; + + EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), in_data.size())); + + auto add = graph->CreateOperation(2); + (*add).BindInputs({input_tensor}).BindOutputs({output_tensor}); + + EXPECT_TRUE(graph->Compile()); + EXPECT_TRUE(graph->Run()); + std::vector output(64, 0); + EXPECT_TRUE(output_tensor->CopyDataFromTensor(output.data())); + EXPECT_EQ(golden, output); +} +