From 3663a99e0f1b49234cc48f7f5bf4fd1e37bb313b Mon Sep 17 00:00:00 2001 From: Chen Xin Date: Wed, 3 Aug 2022 19:00:33 +0800 Subject: [PATCH] Fixed param compute bug for lrn Signed-off-by: Chen Xin --- .../tim/vx/ops/localresponsenormalization.h | 5 ++ src/tim/vx/ops/localresponsenormalization.cc | 2 +- .../vx/ops/localresponsenormalization_test.cc | 62 +++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 src/tim/vx/ops/localresponsenormalization_test.cc diff --git a/include/tim/vx/ops/localresponsenormalization.h b/include/tim/vx/ops/localresponsenormalization.h index d425193..b4f6b84 100644 --- a/include/tim/vx/ops/localresponsenormalization.h +++ b/include/tim/vx/ops/localresponsenormalization.h @@ -34,6 +34,11 @@ * sqr_sum[a, b, c, d] = sum( * pow(input[a, b, c, d - depth_radius : d + depth_radius + 1], 2)) * output = input / pow((bias + alpha * sqr_sum), beta) + * output = input / pow((bias + alpha * sqr_sum), beta) + * size : width of the 1-D normalization window. + * bias : An offset (usually positive to avoid dividing by 0). + * alpha : A scale factor. + * beta : An exponent. * ``` */ diff --git a/src/tim/vx/ops/localresponsenormalization.cc b/src/tim/vx/ops/localresponsenormalization.cc index 0937915..9ecc8c1 100644 --- a/src/tim/vx/ops/localresponsenormalization.cc +++ b/src/tim/vx/ops/localresponsenormalization.cc @@ -39,7 +39,7 @@ LocalResponseNormalization::LocalResponseNormalization(Graph* graph, beta_(beta), bias_(bias), axis_(axis) { - this->impl()->node()->nn_param.lrn.size = size_ * 2 + 1; + this->impl()->node()->nn_param.lrn.size = size_; this->impl()->node()->nn_param.lrn.alpha = alpha_; this->impl()->node()->nn_param.lrn.beta = beta_; this->impl()->node()->nn_param.lrn.bias = bias_; diff --git a/src/tim/vx/ops/localresponsenormalization_test.cc b/src/tim/vx/ops/localresponsenormalization_test.cc new file mode 100644 index 0000000..f57190d --- /dev/null +++ b/src/tim/vx/ops/localresponsenormalization_test.cc @@ -0,0 +1,62 @@ +/**************************************************************************** +* +* 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/localresponsenormalization.h" +#include "test_utils.h" +#include "gtest/gtest.h" + +TEST(localresponsenormalization, axis_0_shape_6_1_1_1_float) { + auto ctx = tim::vx::Context::Create(); + auto graph = ctx->CreateGraph(); + + tim::vx::ShapeType io_shape({6, 1, 1, 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 = {-1.1, 0.6, 0.7, 1.2, -0.7, 0.1}; + std::vector golden = {-0.264926, 0.125109, 0.140112, + 0.267261, -0.161788, 0.0244266}; + + EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), + in_data.size() * sizeof(float))); + + int radius = 5; + float alpha = 4.0, beta = 0.5, bias = 9.0; + auto op = graph->CreateOperation( + radius, alpha, beta, bias, 0); + (*op).BindInputs({input_tensor}).BindOutputs({output_tensor}); + + EXPECT_TRUE(graph->Compile()); + EXPECT_TRUE(graph->Run()); + + std::vector output(18); + EXPECT_TRUE(output_tensor->CopyDataFromTensor(output.data())); + EXPECT_TRUE(ArraysMatch(golden, output, 1e-5f)); +} \ No newline at end of file