From 60954c671ffdc3422bbdb728fc022eb6896c1e17 Mon Sep 17 00:00:00 2001 From: Alex Gilday Date: Mon, 5 Mar 2018 16:22:48 +0000 Subject: COMPMID-754: Add validation to (De)QuantizationLayers Change-Id: If8fa1277e8dc5b8e28a8bcad4ff9fc672b00ce9a Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/123275 Reviewed-by: Anthony Barbier Tested-by: Jenkins Reviewed-by: Michalis Spyrou --- src/runtime/CL/functions/CLDequantizationLayer.cpp | 13 ++++++++++++- src/runtime/CL/functions/CLQuantizationLayer.cpp | 16 +++++++++++++++- src/runtime/NEON/functions/NEDequantizationLayer.cpp | 13 ++++++++++++- src/runtime/NEON/functions/NEQuantizationLayer.cpp | 16 +++++++++++++++- 4 files changed, 54 insertions(+), 4 deletions(-) (limited to 'src/runtime') diff --git a/src/runtime/CL/functions/CLDequantizationLayer.cpp b/src/runtime/CL/functions/CLDequantizationLayer.cpp index 5559d42c7f..6f33b2efa9 100644 --- a/src/runtime/CL/functions/CLDequantizationLayer.cpp +++ b/src/runtime/CL/functions/CLDequantizationLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -24,6 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLDequantizationLayer.h" +#include "arm_compute/core/CL/ICLTensor.h" #include "arm_compute/runtime/CL/CLScheduler.h" using namespace arm_compute; @@ -33,8 +34,18 @@ CLDequantizationLayer::CLDequantizationLayer() { } +Status CLDequantizationLayer::validate(const ITensorInfo *input, const ITensorInfo *output, const ITensorInfo *min_max) +{ + ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(input, output, min_max); + ARM_COMPUTE_RETURN_ON_ERROR(CLDequantizationLayerKernel::validate(input, output, min_max)); + + return Status{}; +} + void CLDequantizationLayer::configure(const ICLTensor *input, ICLTensor *output, const ICLTensor *min_max) { + ARM_COMPUTE_ERROR_ON_NULLPTR(input, output, min_max); + _dequantize_kernel.configure(input, output, min_max); } diff --git a/src/runtime/CL/functions/CLQuantizationLayer.cpp b/src/runtime/CL/functions/CLQuantizationLayer.cpp index ed1f51c714..a13859cda3 100644 --- a/src/runtime/CL/functions/CLQuantizationLayer.cpp +++ b/src/runtime/CL/functions/CLQuantizationLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -24,6 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLQuantizationLayer.h" +#include "arm_compute/core/Error.h" #include "arm_compute/runtime/CL/CLScheduler.h" using namespace arm_compute; @@ -33,8 +34,21 @@ CLQuantizationLayer::CLQuantizationLayer() { } +Status CLQuantizationLayer::validate(const ITensorInfo *input, const ITensorInfo *output) +{ + ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(input, output); + + TensorInfo min_max{ input->num_channels(), input->data_type() }; + ARM_COMPUTE_RETURN_ON_ERROR(CLMinMaxLayerKernel::validate(input, &min_max)); + ARM_COMPUTE_RETURN_ON_ERROR(CLQuantizationLayerKernel::validate(input, output, &min_max)); + + return Status{}; +} + void CLQuantizationLayer::configure(const ICLTensor *input, ICLTensor *output) { + ARM_COMPUTE_ERROR_ON_NULLPTR(input, output); + // Configure min-max kernel. _min_max tensor will be auto-configured within the kernel. _min_max_kernel.configure(input, &_min_max); diff --git a/src/runtime/NEON/functions/NEDequantizationLayer.cpp b/src/runtime/NEON/functions/NEDequantizationLayer.cpp index a58b6e4007..0627977686 100644 --- a/src/runtime/NEON/functions/NEDequantizationLayer.cpp +++ b/src/runtime/NEON/functions/NEDequantizationLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -25,6 +25,7 @@ #include "arm_compute/runtime/NEON/functions/NEDequantizationLayer.h" #include "arm_compute/core/Types.h" +#include "arm_compute/core/Validate.h" #include "arm_compute/runtime/NEON/NEScheduler.h" using namespace arm_compute; @@ -34,8 +35,18 @@ NEDequantizationLayer::NEDequantizationLayer() { } +Status NEDequantizationLayer::validate(const ITensorInfo *input, const ITensorInfo *output, const ITensorInfo *min_max) +{ + ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(input, output, min_max); + ARM_COMPUTE_RETURN_ON_ERROR(NEDequantizationLayerKernel::validate(input, output, min_max)); + + return Status{}; +} + void NEDequantizationLayer::configure(const ITensor *input, ITensor *output, const ITensor *min_max) { + ARM_COMPUTE_ERROR_ON_NULLPTR(input, output, min_max); + // Configure kernel _dequantize_kernel.configure(input, output, min_max); } diff --git a/src/runtime/NEON/functions/NEQuantizationLayer.cpp b/src/runtime/NEON/functions/NEQuantizationLayer.cpp index a131c4839b..8f7db96de8 100644 --- a/src/runtime/NEON/functions/NEQuantizationLayer.cpp +++ b/src/runtime/NEON/functions/NEQuantizationLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -25,6 +25,7 @@ #include "arm_compute/runtime/NEON/functions/NEQuantizationLayer.h" #include "arm_compute/core/Types.h" +#include "arm_compute/core/Validate.h" #include "arm_compute/runtime/NEON/NEScheduler.h" using namespace arm_compute; @@ -34,8 +35,21 @@ NEQuantizationLayer::NEQuantizationLayer() { } +Status NEQuantizationLayer::validate(const ITensorInfo *input, const ITensorInfo *output) +{ + ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(input, output); + + TensorInfo min_max{ input->num_channels(), input->data_type() }; + ARM_COMPUTE_RETURN_ON_ERROR(NEMinMaxLayerKernel::validate(input, &min_max)); + ARM_COMPUTE_RETURN_ON_ERROR(NEQuantizationLayerKernel::validate(input, output, &min_max)); + + return Status{}; +} + void NEQuantizationLayer::configure(const ITensor *input, ITensor *output) { + ARM_COMPUTE_ERROR_ON_NULLPTR(input, output); + // Configure min-max kernel. _min_max tensor will be auto-configured within the kernel _min_max_kernel.configure(input, &_min_max); -- cgit v1.2.1