From c6aa49b6709edada24b1ab3bc1308e0974f9e057 Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Tue, 7 Aug 2018 11:53:30 +0100 Subject: COMPMID-1344 Add grouping support to CLWeightsReshapeKernel Change-Id: Idde333308db71087ec234b3fd1eb4e36a44db46c Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/143049 Reviewed-by: Gian Marco Iodice Tested-by: Jenkins --- tests/validation/fixtures/WeightsReshapeFixture.h | 130 ++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 tests/validation/fixtures/WeightsReshapeFixture.h (limited to 'tests/validation/fixtures') diff --git a/tests/validation/fixtures/WeightsReshapeFixture.h b/tests/validation/fixtures/WeightsReshapeFixture.h new file mode 100644 index 0000000000..06765f6c21 --- /dev/null +++ b/tests/validation/fixtures/WeightsReshapeFixture.h @@ -0,0 +1,130 @@ +/* + * 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_WEIGHTS_RESHAPE_FIXTURE +#define ARM_COMPUTE_TEST_WEIGHTS_RESHAPE_FIXTURE + +#include "arm_compute/core/Helpers.h" +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/core/utils/misc/ShapeCalculator.h" +#include "arm_compute/runtime/Tensor.h" +#include "tests/AssetsLibrary.h" +#include "tests/Globals.h" +#include "tests/IAccessor.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Fixture.h" +#include "tests/validation/reference/WeightsReshape.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +using namespace arm_compute::misc::shape_calculator; + +template +class WeightsReshapeValidationFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape input_shape, DataType data_type, bool has_bias, unsigned int num_groups) + { + const TensorShape output_shape = compute_weights_reshaped_shape(TensorInfo(input_shape, 1, data_type), has_bias, num_groups); + + _target = compute_target(input_shape, output_shape, has_bias, num_groups, data_type); + _reference = compute_reference(input_shape, output_shape, has_bias, num_groups, data_type); + } + +protected: + template + void fill(U &&tensor, const int seed) + { + library->fill_tensor_uniform(tensor, seed); + } + + TensorType compute_target(const TensorShape &input_shape, const TensorShape &output_shape, const bool has_bias, const unsigned int num_groups, DataType data_type) + { + // Create tensors + TensorType src = create_tensor(input_shape, data_type); + TensorType bias = create_tensor(TensorShape(input_shape[3]), data_type); + TensorType dst = create_tensor(output_shape, data_type); + + // Create and configure function + FunctionType weights_reshape_func; + weights_reshape_func.configure(&src, (has_bias ? &bias : nullptr), &dst, num_groups); + + ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Allocate tensors + src.allocator()->allocate(); + dst.allocator()->allocate(); + + ARM_COMPUTE_EXPECT(!src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Fill tensors + fill(AccessorType(src), 0); + + if(has_bias) + { + ARM_COMPUTE_EXPECT(bias.info()->is_resizable(), framework::LogLevel::ERRORS); + + bias.allocator()->allocate(); + + ARM_COMPUTE_EXPECT(!bias.info()->is_resizable(), framework::LogLevel::ERRORS); + + fill(AccessorType(bias), 1); + } + + // Compute function + weights_reshape_func.run(); + + return dst; + } + + SimpleTensor compute_reference(const TensorShape &input_shape, const TensorShape &output_shape, const bool has_bias, const unsigned int num_groups, DataType data_type) + { + // Create reference + SimpleTensor src{ input_shape, data_type }; + SimpleTensor bias{ TensorShape(has_bias ? input_shape[3] : 0), data_type }; + + // Fill reference + fill(src, 0); + if(has_bias) + { + fill(bias, 1); + } + + return reference::weights_reshape(src, bias, output_shape, num_groups); + } + + TensorType _target{}; + SimpleTensor _reference{}; +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_WEIGHTS_RESHAPE_FIXTURE */ -- cgit v1.2.1