diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-09-03 15:16:37 +0100 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-09-07 10:52:29 +0000 |
commit | 2d2213920ba5ab95052a557dd20594a6ccb7d562 (patch) | |
tree | 675b58a4474c75bf5ea7539a483ffbcb8a6375fd /tests/validation/fixtures | |
parent | cbf4d553e123a9fa7a92072aea61edcf50ed6c32 (diff) | |
download | ComputeLibrary-2d2213920ba5ab95052a557dd20594a6ccb7d562.tar.gz |
COMPMID-3154: Deprecate NE/CL LocallyConnectedLayer
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Ia7516fadcf3df072abf9b83aef4d9939212ce082
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3918
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests/validation/fixtures')
-rw-r--r-- | tests/validation/fixtures/LocallyConnectedFixture.h | 136 |
1 files changed, 0 insertions, 136 deletions
diff --git a/tests/validation/fixtures/LocallyConnectedFixture.h b/tests/validation/fixtures/LocallyConnectedFixture.h deleted file mode 100644 index 2e2b71665b..0000000000 --- a/tests/validation/fixtures/LocallyConnectedFixture.h +++ /dev/null @@ -1,136 +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_LOCALLY_CONNECTED_FIXTURE -#define ARM_COMPUTE_TEST_LOCALLY_CONNECTED_FIXTURE - -#include "arm_compute/core/Error.h" -#include "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.h" -#include "arm_compute/runtime/NEON/NEScheduler.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/LocallyConnected.h" -#include "tests/validation/reference/Utils.h" - -#include <random> - -namespace arm_compute -{ -class NELocallyConnected; - -namespace test -{ -namespace validation -{ -template <typename TensorType, typename AccessorType, typename FunctionType, typename T> -class LocallyConnectedValidationFixture : public framework::Fixture -{ -public: - using TBias = typename std::conditional<std::is_same<typename std::decay<T>::type, uint8_t>::value, int32_t, T>::type; - -public: - template <typename...> - void setup(TensorShape input_shape, TensorShape weights_shape, TensorShape bias_shape, TensorShape output_shape, PadStrideInfo info, Size2D dilation, DataType data_type) - { - ARM_COMPUTE_UNUSED(dilation); - - _data_type = data_type; - _bias_data_type = data_type; - - _target = compute_target(input_shape, weights_shape, bias_shape, output_shape, info); - _reference = compute_reference(input_shape, weights_shape, bias_shape, output_shape, info); - } - -protected: - template <typename U> - void fill(U &&tensor, int i) - { - std::uniform_real_distribution<> distribution(-1.0f, 1.0f); - library->fill(tensor, distribution, i); - } - - TensorType compute_target(const TensorShape &input_shape, const TensorShape &weights_shape, const TensorShape &bias_shape, const TensorShape &output_shape, const PadStrideInfo &info) - { - TensorShape reshaped_weights_shape(weights_shape); - - // Create tensors - TensorType src = create_tensor<TensorType>(input_shape, _data_type); - TensorType weights = create_tensor<TensorType>(reshaped_weights_shape, _data_type); - TensorType bias = create_tensor<TensorType>(bias_shape, _bias_data_type); - TensorType dst = create_tensor<TensorType>(output_shape, _data_type); - - // Create and configure function - FunctionType locally_connected; - locally_connected.configure(&src, &weights, &bias, &dst, info); - - // Allocate tensors - src.allocator()->allocate(); - weights.allocator()->allocate(); - bias.allocator()->allocate(); - dst.allocator()->allocate(); - - ARM_COMPUTE_EXPECT(!src.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(!weights.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(!bias.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); - - // Fill tensors - fill(AccessorType(src), 0); - fill(AccessorType(weights), 1); - fill(AccessorType(bias), 2); - - locally_connected.run(); - - return dst; - } - - SimpleTensor<T> compute_reference(const TensorShape &input_shape, const TensorShape &weights_shape, const TensorShape &bias_shape, const TensorShape &output_shape, const PadStrideInfo &info) - { - // Create reference - SimpleTensor<T> src(input_shape, _data_type); - SimpleTensor<T> weights(weights_shape, _data_type); - SimpleTensor<TBias> bias(bias_shape, _bias_data_type); - - // Fill reference - fill(src, 0); - fill(weights, 1); - fill(bias, 2); - - return reference::locally_connected<T>(src, weights, bias, output_shape, info); - } - - TensorType _target{}; - SimpleTensor<T> _reference{}; - DataType _data_type{}; - DataType _bias_data_type{}; -}; - -} // namespace validation -} // namespace test -} // namespace arm_compute -#endif /* ARM_COMPUTE_TEST_LOCALLY_CONNECTED_FIXTURE */ |