diff --git a/include/tim/vx/ops/simple_operations.h b/include/tim/vx/ops/simple_operations.h index 14633fe..f817a14 100644 --- a/include/tim/vx/ops/simple_operations.h +++ b/include/tim/vx/ops/simple_operations.h @@ -47,6 +47,8 @@ DECLARE_SIMPLE_OP(Sqrt) DECLARE_SIMPLE_OP(Rsqrt) DECLARE_SIMPLE_OP(Square) DECLARE_SIMPLE_OP(LogicalNot) +DECLARE_SIMPLE_OP(Floor) +DECLARE_SIMPLE_OP(Cast) #undef DECLARE_SIMPLE_OP diff --git a/src/tim/vx/ops/README.md b/src/tim/vx/ops/README.md index a831ce4..99f7e63 100644 --- a/src/tim/vx/ops/README.md +++ b/src/tim/vx/ops/README.md @@ -23,7 +23,7 @@ Transpose|PERMUTE|Mapped Prelu|PRELU|Mapped ||UPSAMPLE|Unmapped Relu|RELU|Mapped -||RELUN|Unmapped +||RELUN|Deprecated ||LSTM|Unmapped Reorg|REORG|Mapped ||VARIABLE|Unmapped @@ -84,7 +84,7 @@ Select|SELECT|Mapped ||TENSOR_ADD_MEAN_STDDEV_NORM|Unmapped Relu1|RELU1|Mapped Stack|STACK|Mapped -||FLOOR|Unmapped +Floor|FLOOR|Mapped Square|SQUARE|Mapped Neg|NEG|Mapped Exp|EXP|Mapped @@ -131,7 +131,7 @@ ArgMin|ARGMIN|Mapped HardSwish|SWISH|Mapped ||DEPTHWISE_CONV1D|Unmapped GatherNd|GATHER_ND|Mapped -||CAST|Unmapped +Cast|CAST|Mapped ||LINEAR|Unmapped ||BATCHNORM_SINGLE|Unmapped ||MOMENTS|Unmapped diff --git a/src/tim/vx/ops/simple_operations.cc b/src/tim/vx/ops/simple_operations.cc index 39561c3..896c85f 100644 --- a/src/tim/vx/ops/simple_operations.cc +++ b/src/tim/vx/ops/simple_operations.cc @@ -44,6 +44,8 @@ DEFINE_SIMPLE_OP(Sqrt, VSI_NN_OP_SQRT) DEFINE_SIMPLE_OP(Rsqrt, VSI_NN_OP_RSQRT) DEFINE_SIMPLE_OP(Square, VSI_NN_OP_SQUARE) DEFINE_SIMPLE_OP(LogicalNot, VSI_NN_OP_LOGICAL_NOT) +DEFINE_SIMPLE_OP(Floor, VSI_NN_OP_FLOOR) +DEFINE_SIMPLE_OP(Cast, VSI_NN_OP_CAST) #undef DEFINE_SIMPLE_OP diff --git a/src/tim/vx/ops/simple_operations_test.cc b/src/tim/vx/ops/simple_operations_test.cc new file mode 100644 index 0000000..afe8ad9 --- /dev/null +++ b/src/tim/vx/ops/simple_operations_test.cc @@ -0,0 +1,85 @@ +/**************************************************************************** +* +* 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/simple_operations.h" + +#include "gtest/gtest.h" + +TEST(OP, floor_shape_5_1_fp32) { + auto ctx = tim::vx::Context::Create(); + auto graph = ctx->CreateGraph(); + + tim::vx::ShapeType io_shape({5, 1}); + tim::vx::TensorSpec input_spec(tim::vx::DataType::FLOAT32, + io_shape, tim::vx::TensorAttribute::INPUT); + tim::vx::TensorSpec output_spec(tim::vx::DataType::FLOAT32, + io_shape, tim::vx::TensorAttribute::OUTPUT); + + auto input_tensor = graph->CreateTensor(input_spec); + auto output_tensor = graph->CreateTensor(output_spec); + + std::vector in_data = { -2.5, -0.1, 0, 0.55, std::numeric_limits::infinity() }; + std::vector golden = {-3, -1, 0, 0, std::numeric_limits::infinity() }; + + EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), in_data.size())); + + auto add = graph->CreateOperation(); + (*add).BindInputs({input_tensor}).BindOutputs({output_tensor}); + + EXPECT_TRUE(graph->Compile()); + EXPECT_TRUE(graph->Run()); + std::vector output(5, 0); + EXPECT_TRUE(output_tensor->CopyDataFromTensor(output.data())); + EXPECT_EQ(golden, output); +} + +TEST(OP, cast_shape_5_1_fp32_to_int32) { + auto ctx = tim::vx::Context::Create(); + auto graph = ctx->CreateGraph(); + + tim::vx::ShapeType io_shape({5, 1}); + tim::vx::TensorSpec input_spec(tim::vx::DataType::FLOAT32, + io_shape, tim::vx::TensorAttribute::INPUT); + tim::vx::TensorSpec output_spec(tim::vx::DataType::INT32, + io_shape, tim::vx::TensorAttribute::OUTPUT); + + auto input_tensor = graph->CreateTensor(input_spec); + auto output_tensor = graph->CreateTensor(output_spec); + + std::vector in_data = { -2.5, -0.1, 0, 0.55, std::numeric_limits::infinity() }; + std::vector golden = {-2, 0, 0, 0, std::numeric_limits::max()}; + + EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), in_data.size())); + + auto add = graph->CreateOperation(); + (*add).BindInputs({input_tensor}).BindOutputs({output_tensor}); + + EXPECT_TRUE(graph->Compile()); + EXPECT_TRUE(graph->Run()); + std::vector output(5, 0); + EXPECT_TRUE(output_tensor->CopyDataFromTensor(output.data())); + EXPECT_EQ(golden, output); +} +