From cbf39c63a6eb89a2c80b2338afc374081803d79d Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Mon, 10 Sep 2018 15:07:45 +0100 Subject: COMPMID-1566: Add broadcast to CLArithmeticSubtraction Change-Id: I05d21f9a92013ecfd1128d12cf1561cfd6e5c5e9 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/147983 Tested-by: bsgcomp Reviewed-by: Anthony Barbier --- .../fixtures/ArithmeticSubtractionFixture.h | 114 --------------------- 1 file changed, 114 deletions(-) delete mode 100644 tests/validation/fixtures/ArithmeticSubtractionFixture.h (limited to 'tests/validation/fixtures/ArithmeticSubtractionFixture.h') diff --git a/tests/validation/fixtures/ArithmeticSubtractionFixture.h b/tests/validation/fixtures/ArithmeticSubtractionFixture.h deleted file mode 100644 index 9897677691..0000000000 --- a/tests/validation/fixtures/ArithmeticSubtractionFixture.h +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2017-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_ARITHMETIC_SUBTRACTION_FIXTURE -#define ARM_COMPUTE_TEST_ARITHMETIC_SUBTRACTION_FIXTURE - -#include "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.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/Helpers.h" -#include "tests/validation/reference/ArithmeticSubtraction.h" - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -template -class ArithmeticSubtractionValidationFixture : public framework::Fixture -{ -public: - template - void setup(TensorShape shape, DataType data_type0, DataType data_type1, DataType output_data_type, ConvertPolicy convert_policy) - { - _target = compute_target(shape, data_type0, data_type1, output_data_type, convert_policy); - _reference = compute_reference(shape, data_type0, data_type1, output_data_type, convert_policy); - } - -protected: - template - void fill(U &&tensor, int i) - { - library->fill_tensor_uniform(tensor, i); - } - - TensorType compute_target(const TensorShape &shape, DataType data_type0, DataType data_type1, DataType output_data_type, ConvertPolicy convert_policy) - { - // Create tensors - TensorType ref_src1 = create_tensor(shape, data_type0, 1); - TensorType ref_src2 = create_tensor(shape, data_type1, 1); - TensorType dst = create_tensor(shape, output_data_type, 1); - - // Create and configure function - FunctionType sub; - sub.configure(&ref_src1, &ref_src2, &dst, convert_policy); - - ARM_COMPUTE_EXPECT(ref_src1.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(ref_src2.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); - - // Allocate tensors - ref_src1.allocator()->allocate(); - ref_src2.allocator()->allocate(); - dst.allocator()->allocate(); - - ARM_COMPUTE_EXPECT(!ref_src1.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(!ref_src2.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); - - // Fill tensors - fill(AccessorType(ref_src1), 0); - fill(AccessorType(ref_src2), 1); - - // Compute function - sub.run(); - - return dst; - } - - SimpleTensor compute_reference(const TensorShape &shape, DataType data_type0, DataType data_type1, DataType output_data_type, ConvertPolicy convert_policy) - { - // Create reference - SimpleTensor ref_src1{ shape, data_type0, 1 }; - SimpleTensor ref_src2{ shape, data_type1, 1 }; - - // Fill reference - fill(ref_src1, 0); - fill(ref_src2, 1); - - return reference::arithmetic_subtraction(ref_src1, ref_src2, output_data_type, convert_policy); - } - - TensorType _target{}; - SimpleTensor _reference{}; -}; -} // namespace validation -} // namespace test -} // namespace arm_compute -#endif /* ARM_COMPUTE_TEST_ARITHMETIC_SUBTRACTION_FIXTURE */ -- cgit v1.2.1