From 73023027d6250daaa1df49fdeb1d21e59a0bf7f5 Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Tue, 4 Sep 2018 14:55:55 +0100 Subject: COMPMID-1539 Implement YOLOLayer on CL Change-Id: I332c0703e1399fca0c5b724529b54a28f49c88da Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/146842 Tested-by: Jenkins Reviewed-by: Georgios Pinitas --- tests/validation/reference/ActivationLayer.cpp | 41 +------------ tests/validation/reference/ActivationLayer.h | 50 +++++++++++++++- tests/validation/reference/YOLOLayer.cpp | 80 ++++++++++++++++++++++++++ tests/validation/reference/YOLOLayer.h | 47 +++++++++++++++ 4 files changed, 177 insertions(+), 41 deletions(-) create mode 100644 tests/validation/reference/YOLOLayer.cpp create mode 100644 tests/validation/reference/YOLOLayer.h (limited to 'tests/validation/reference') diff --git a/tests/validation/reference/ActivationLayer.cpp b/tests/validation/reference/ActivationLayer.cpp index 9455effd72..9750ea95a6 100644 --- a/tests/validation/reference/ActivationLayer.cpp +++ b/tests/validation/reference/ActivationLayer.cpp @@ -46,46 +46,7 @@ SimpleTensor activation_layer(const SimpleTensor &src, ActivationLayerInfo for(int i = 0; i < src.num_elements(); ++i) { - T x = src[i]; - - switch(info.activation()) - { - case ActivationLayerInfo::ActivationFunction::ABS: - dst[i] = std::abs(x); - break; - case ActivationLayerInfo::ActivationFunction::LINEAR: - dst[i] = a * x + b; - break; - case ActivationLayerInfo::ActivationFunction::LOGISTIC: - dst[i] = static_cast(1) / (static_cast(1) + std::exp(-x)); - break; - case ActivationLayerInfo::ActivationFunction::RELU: - dst[i] = std::max(static_cast(0), x); - break; - case ActivationLayerInfo::ActivationFunction::BOUNDED_RELU: - dst[i] = std::min(a, std::max(static_cast(0), x)); - break; - case ActivationLayerInfo::ActivationFunction::LU_BOUNDED_RELU: - dst[i] = std::min(a, std::max(b, x)); - break; - case ActivationLayerInfo::ActivationFunction::LEAKY_RELU: - dst[i] = (x > 0) ? x : a * x; - break; - case ActivationLayerInfo::ActivationFunction::SOFT_RELU: - dst[i] = std::log(static_cast(1) + std::exp(x)); - break; - case ActivationLayerInfo::ActivationFunction::SQRT: - dst[i] = std::sqrt(x); - break; - case ActivationLayerInfo::ActivationFunction::SQUARE: - dst[i] = x * x; - break; - case ActivationLayerInfo::ActivationFunction::TANH: - dst[i] = a * std::tanh(b * x); - break; - default: - ARM_COMPUTE_ERROR("Unsupported activation function"); - } + dst[i] = activate_float(src[i], a, b, info.activation()); } return dst; diff --git a/tests/validation/reference/ActivationLayer.h b/tests/validation/reference/ActivationLayer.h index 09f602ffa1..c752e74733 100644 --- a/tests/validation/reference/ActivationLayer.h +++ b/tests/validation/reference/ActivationLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -35,6 +35,54 @@ namespace validation { namespace reference { +template +inline T activate_float(T x, T a, T b, ActivationLayerInfo::ActivationFunction activation) +{ + T ret; + + switch(activation) + { + case ActivationLayerInfo::ActivationFunction::ABS: + ret = std::abs(x); + break; + case ActivationLayerInfo::ActivationFunction::LINEAR: + ret = a * x + b; + break; + case ActivationLayerInfo::ActivationFunction::LOGISTIC: + ret = static_cast(1) / (static_cast(1) + std::exp(-x)); + break; + case ActivationLayerInfo::ActivationFunction::RELU: + ret = std::max(static_cast(0), x); + break; + case ActivationLayerInfo::ActivationFunction::BOUNDED_RELU: + ret = std::min(a, std::max(static_cast(0), x)); + break; + case ActivationLayerInfo::ActivationFunction::LU_BOUNDED_RELU: + ret = std::min(a, std::max(b, x)); + break; + case ActivationLayerInfo::ActivationFunction::LEAKY_RELU: + ret = (x > 0) ? x : a * x; + break; + case ActivationLayerInfo::ActivationFunction::SOFT_RELU: + ret = std::log(static_cast(1) + std::exp(x)); + break; + case ActivationLayerInfo::ActivationFunction::SQRT: + ret = std::sqrt(x); + break; + case ActivationLayerInfo::ActivationFunction::SQUARE: + ret = x * x; + break; + case ActivationLayerInfo::ActivationFunction::TANH: + ret = a * std::tanh(b * x); + break; + default: + ARM_COMPUTE_ERROR("Unsupported activation function"); + break; + } + + return ret; +} + template ::value, int>::type = 0> SimpleTensor activation_layer(const SimpleTensor &src, ActivationLayerInfo info); diff --git a/tests/validation/reference/YOLOLayer.cpp b/tests/validation/reference/YOLOLayer.cpp new file mode 100644 index 0000000000..a12f411680 --- /dev/null +++ b/tests/validation/reference/YOLOLayer.cpp @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * 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 "YOLOLayer.h" + +#include "ActivationLayer.h" + +#include "arm_compute/core/Types.h" +#include "tests/validation/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template ::value, int>::type> +SimpleTensor yolo_layer(const SimpleTensor &src, const ActivationLayerInfo &info, int32_t num_classes) +{ + // Create reference + SimpleTensor dst{ src.shape(), src.data_type() }; + + // Compute reference + const T a(info.a()); + const T b(info.b()); + + for(int i = 0; i < src.num_elements(); ++i) + { + const size_t z = index2coord(dst.shape(), i).z() % (num_classes + 5); + + if(z != 2 && z != 3) + { + dst[i] = activate_float(src[i], a, b, info.activation()); + } + else + { + dst[i] = src[i]; + } + } + + return dst; +} + +template <> +SimpleTensor yolo_layer(const SimpleTensor &src, const ActivationLayerInfo &info, int32_t num_classes) +{ + SimpleTensor src_tmp = convert_from_asymmetric(src); + SimpleTensor dst_tmp = yolo_layer(src_tmp, info, num_classes); + SimpleTensor dst = convert_to_asymmetric(dst_tmp, src.quantization_info()); + return dst; +} + +template SimpleTensor yolo_layer(const SimpleTensor &src, const ActivationLayerInfo &info, int32_t num_classes); +template SimpleTensor yolo_layer(const SimpleTensor &src, const ActivationLayerInfo &info, int32_t num_classes); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/reference/YOLOLayer.h b/tests/validation/reference/YOLOLayer.h new file mode 100644 index 0000000000..659f1dd2d9 --- /dev/null +++ b/tests/validation/reference/YOLOLayer.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * 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 __ARM_COMPUTE_TEST_YOLO_LAYER_H__ +#define __ARM_COMPUTE_TEST_YOLO_LAYER_H__ + +#include "tests/SimpleTensor.h" +#include "tests/validation/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template ::value, int>::type = 0> +SimpleTensor yolo_layer(const SimpleTensor &src, const ActivationLayerInfo &info, int32_t num_classes); + +template ::value, int>::type = 0> +SimpleTensor yolo_layer(const SimpleTensor &src, const ActivationLayerInfo &info, int32_t num_classes); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_YOLO_LAYER_H__ */ -- cgit v1.2.1