diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-01-09 17:33:11 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:47:40 +0000 |
| commit | 78c009079654268cca9c22848e4fae9f222b100d (patch) | |
| tree | 75caae296b8ad07e5ca8db5ceb3af5750e1fa3ce /src/runtime/CL/functions/CLConvolutionLayer.cpp | |
| parent | e4904c727933d8b6d79ec7a1fc3f371414a11a97 (diff) | |
| download | ComputeLibrary-78c009079654268cca9c22848e4fae9f222b100d.tar.gz | |
COMPMID-754: Add validation to kernels.
Adds validation method to:
- CLConvolutionLayer
Change-Id: I95516e20cfb71c1e603c60fc6491ac695883a856
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/117355
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/CL/functions/CLConvolutionLayer.cpp')
| -rw-r--r-- | src/runtime/CL/functions/CLConvolutionLayer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/runtime/CL/functions/CLConvolutionLayer.cpp b/src/runtime/CL/functions/CLConvolutionLayer.cpp index a0bee520a6..1a486ce5c7 100644 --- a/src/runtime/CL/functions/CLConvolutionLayer.cpp +++ b/src/runtime/CL/functions/CLConvolutionLayer.cpp @@ -26,6 +26,8 @@ #include "arm_compute/core/PixelValue.h" #include "arm_compute/core/Utils.h" #include "arm_compute/core/Validate.h" +#include "arm_compute/core/utils/misc/ShapeCalculator.h" +#include "arm_compute/core/utils/quantization/AsymmHelpers.h" #include "arm_compute/runtime/CL/CLScheduler.h" #include <cmath> @@ -33,6 +35,7 @@ #include <tuple> using namespace arm_compute; +using namespace arm_compute::misc::shape_calculator; CLConvolutionLayer::CLConvolutionLayer(std::shared_ptr<IMemoryManager> memory_manager) : _memory_manager(std::move(memory_manager)), _function() @@ -70,7 +73,7 @@ void CLConvolutionLayer::configure(ICLTensor *input, const ICLTensor *weights, c Status CLConvolutionLayer::validate(const ITensorInfo *input, const ITensorInfo *weights, const ITensorInfo *biases, const ITensorInfo *output, const PadStrideInfo &conv_info, const WeightsInfo &weights_info) { - ARM_COMPUTE_ERROR_ON_NULLPTR(input, weights, output); + ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(input, weights, output); //Configure if the parameters match the direct convolution or the gemm-based const GPUTarget gpu_target = CLScheduler::get().target(); @@ -86,8 +89,7 @@ Status CLConvolutionLayer::validate(const ITensorInfo *input, const ITensorInfo case ConvolutionMethod::GEMM: { // Validate gemm-based convolution layer - /* TODO COMPMID-754: Add validation methods for CLGEMMConvolutionLayer - CLGEMMConvolutionLayer::validate(input, weights, biases, output, conv_info, weights_info); */ + CLGEMMConvolutionLayer::validate(input, weights, biases, output, conv_info, weights_info); break; } default: |