From fc004494c9cde94fe7b5d67199faf2596e223cf3 Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Fri, 23 Mar 2018 11:40:05 +0000 Subject: COMPMID-959: Removed Interleave blocked kernel. Change-Id: I775eecbc39da583aae2eb4e033c5930dfc402899 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/125684 Tested-by: Jenkins Reviewed-by: Georgios Pinitas --- .../fixtures/GEMMInterleaveBlockedFixture.h | 114 --------------------- 1 file changed, 114 deletions(-) delete mode 100644 tests/validation/fixtures/GEMMInterleaveBlockedFixture.h (limited to 'tests/validation/fixtures') diff --git a/tests/validation/fixtures/GEMMInterleaveBlockedFixture.h b/tests/validation/fixtures/GEMMInterleaveBlockedFixture.h deleted file mode 100644 index 488324dcc8..0000000000 --- a/tests/validation/fixtures/GEMMInterleaveBlockedFixture.h +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2017 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_GEMM_INTERLEAVE_BLOCKED_FIXTURE -#define ARM_COMPUTE_TEST_GEMM_INTERLEAVE_BLOCKED_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/GEMMInterleaveBlocked.h" - -#include - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -template -class GEMMInterleaveBlockedValidationFixture : public framework::Fixture -{ -public: - template - void setup(size_t x, size_t y, int int_by, int block) - { - const float interleave_by_f32 = int_by; - const TensorShape shape_a(x, y); - const TensorShape shape_b(static_cast(x * interleave_by_f32), static_cast(std::ceil(y / interleave_by_f32))); - _target = compute_target(shape_a, shape_b, int_by, block); - _reference = compute_reference(shape_a, shape_b, int_by, block); - } - -protected: - template - void fill(U &&tensor, int i) - { - ARM_COMPUTE_ERROR_ON(tensor.data_type() != DataType::U8); - std::uniform_int_distribution<> distribution(0, 255); - library->fill(tensor, distribution, i); - } - - TensorType compute_target(const TensorShape &shape_a, const TensorShape &shape_b, int int_by, int block) - { - // Create tensors - TensorType a = create_tensor(shape_a, DataType::U8, 1); - TensorType b = create_tensor(shape_b, DataType::U8, 1); - - // Create and configure function - FunctionType f; - f.configure(&a, &b, int_by, block, Transposed); - - ARM_COMPUTE_EXPECT(a.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(b.info()->is_resizable(), framework::LogLevel::ERRORS); - - // Allocate tensors - a.allocator()->allocate(); - b.allocator()->allocate(); - - ARM_COMPUTE_EXPECT(!a.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(!b.info()->is_resizable(), framework::LogLevel::ERRORS); - - // Fill tensors - fill(AccessorType(a), 0); - - // Compute GEMM function - f.run(); - return b; - } - - SimpleTensor compute_reference(const TensorShape &shape_a, const TensorShape &shape_b, int int_by, int block) - { - // Create reference - SimpleTensor a{ shape_a, DataType::U8, 1 }; - SimpleTensor b{ shape_b, DataType::U8, 1 }; - - // Fill reference - fill(a, 0); - return reference::gemm_interleave_blocked(a, b, int_by, block, Transposed); - } - - TensorType _target{}; - SimpleTensor _reference{}; -}; - -} // namespace validation -} // namespace test -} // namespace arm_compute -#endif /* ARM_COMPUTE_TEST_GEMM_INTERLEAVE_BLOCKED_FIXTURE */ -- cgit v1.2.1