diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-06-16 17:44:46 +0100 |
---|---|---|
committer | Michalis Spyrou <michalis.spyrou@arm.com> | 2020-06-17 09:29:40 +0000 |
commit | 1fd2c80692ed8ecefc4d8deb783564ad19eaf70c (patch) | |
tree | b44219bdc8bdc17cb2906dd50a5ba1ee1e6b12fc /tests | |
parent | 27a9e4f10516679bc6e92bec104ae219e1fa7f15 (diff) | |
download | ComputeLibrary-1fd2c80692ed8ecefc4d8deb783564ad19eaf70c.tar.gz |
COMPMID-3375: Port NEActivationLayer functions/kernels to run on
different tensors.
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I98782bb73e9dc0899ffb1796aca6f99714adea94
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3343
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/framework/instruments/SchedulerTimer.cpp | 2 | ||||
-rw-r--r-- | tests/validation/NEON/ReshapeOperator.cpp | 78 |
2 files changed, 1 insertions, 79 deletions
diff --git a/tests/framework/instruments/SchedulerTimer.cpp b/tests/framework/instruments/SchedulerTimer.cpp index 58e1b56904..8729179a46 100644 --- a/tests/framework/instruments/SchedulerTimer.cpp +++ b/tests/framework/instruments/SchedulerTimer.cpp @@ -86,7 +86,7 @@ public: _kernels.push_back(std::move(info)); } - void schedule_op(ICPPKernel *kernel, const Hints &hints, std::vector<InputOperatorTensors *> &inputs, std::vector<OutputOperatorTensors *> &outputs) override + void schedule_op(ICPPKernel *kernel, const Hints &hints, const std::vector<InputTensor> &inputs, const std::vector<OutputTensor> &outputs) override { _timer.start(); _real_scheduler.schedule_op(kernel, hints, inputs, outputs); diff --git a/tests/validation/NEON/ReshapeOperator.cpp b/tests/validation/NEON/ReshapeOperator.cpp deleted file mode 100644 index 82e9768a2c..0000000000 --- a/tests/validation/NEON/ReshapeOperator.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2020 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. - */ -#include "arm_compute/core/Types.h" -#include "arm_compute/runtime/NEON/functions/NEReshapeLayer.h" -#include "arm_compute/runtime/OperatorTensor.h" -#include "arm_compute/runtime/Tensor.h" -#include "arm_compute/runtime/TensorAllocator.h" -#include "tests/AssetsLibrary.h" -#include "tests/Globals.h" -#include "tests/NEON/Accessor.h" -#include "tests/Utils.h" -#include "tests/framework/Asserts.h" -#include "tests/framework/Macros.h" -#include "tests/framework/datasets/Datasets.h" -#include "tests/validation/Validation.h" - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -TEST_SUITE(NEON) -TEST_SUITE(ReshapeOperator) - -TEST_CASE(Run, framework::DatasetMode::ALL) -{ - // Create tensors and info - TensorInfo src_info(TensorShape(27U, 11U, 3U), 1, DataType::F32); - TensorInfo dst_info(TensorShape(27U, 11U, 3U), 1, DataType::F32); - Tensor src = create_tensor<Tensor>(TensorShape(27U, 11U, 3U), DataType::F32, 1); - Tensor dst = create_tensor<Tensor>(TensorShape(27U, 11U, 3U), DataType::F32, 1); - - // Create and configure function - experimental::NEReshapeLayer reshape_operator; - reshape_operator.configure(&src_info, &dst_info); - - // Allocate tensors - src.allocator()->allocate(); - dst.allocator()->allocate(); - - InputOperatorTensors src_0 = std::make_pair(TensorType::ACL_SRC, &src); - OutputOperatorTensors dst_0 = std::make_pair(TensorType::ACL_DST, &dst); - - std::vector<InputOperatorTensors *> src_vec = { &src_0 }; - std::vector<OutputOperatorTensors *> dst_vec = { &dst_0 }; - std::vector<OperatorTensors *> work_vec = {}; - - // Compute functions - reshape_operator.run(src_vec, dst_vec, work_vec); -} - -TEST_SUITE_END() // ReshapeOperator -TEST_SUITE_END() // NEON -} // namespace validation -} // namespace test -} // namespace arm_compute |