From f932d2c8409831cb9cb97a2eb65be93ad4709cd6 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Mon, 6 Jul 2020 11:27:21 +0100 Subject: COMPMID-3386: Support memory injection in CLConcatenate functions/kernels Signed-off-by: Georgios Pinitas Change-Id: I611adf4f506d406540e920b0bd6befb4b5108918 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3601 Tested-by: Arm Jenkins Reviewed-by: Michalis Spyrou Comments-Addressed: Arm Jenkins --- tests/validation/CL/BatchConcatenateLayer.cpp | 8 ++++---- tests/validation/CL/DepthConcatenateLayer.cpp | 8 ++++---- tests/validation/CL/WidthConcatenateLayer.cpp | 8 ++++---- tests/validation/GLES_COMPUTE/DepthConcatenateLayer.cpp | 4 ++-- tests/validation/fixtures/ConcatenateLayerFixture.h | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'tests') diff --git a/tests/validation/CL/BatchConcatenateLayer.cpp b/tests/validation/CL/BatchConcatenateLayer.cpp index 327ddfc9d6..6fd189b716 100644 --- a/tests/validation/CL/BatchConcatenateLayer.cpp +++ b/tests/validation/CL/BatchConcatenateLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Arm Limited. + * Copyright (c) 2019-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -70,7 +70,7 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( inputs_vector_info.emplace_back(std::move(input_info1)); inputs_vector_info.emplace_back(std::move(input_info2)); - std::vector inputs_vector_info_raw; + std::vector inputs_vector_info_raw; inputs_vector_info_raw.reserve(inputs_vector_info.size()); for(auto &input : inputs_vector_info) { @@ -97,8 +97,8 @@ TEST_CASE(Configuration, framework::DatasetMode::ALL) ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); // Create and configure function - CLConcatenateLayer concat_layer; - std::vector inputs; + CLConcatenateLayer concat_layer; + std::vector inputs; inputs.emplace_back(&src1); inputs.emplace_back(&src2); inputs.emplace_back(&src3); diff --git a/tests/validation/CL/DepthConcatenateLayer.cpp b/tests/validation/CL/DepthConcatenateLayer.cpp index a3dbffb4c1..4f5bd118bf 100644 --- a/tests/validation/CL/DepthConcatenateLayer.cpp +++ b/tests/validation/CL/DepthConcatenateLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 Arm Limited. + * Copyright (c) 2017-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -67,7 +67,7 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( inputs_vector_info.emplace_back(std::move(input_info1)); inputs_vector_info.emplace_back(std::move(input_info2)); - std::vector inputs_vector_info_raw; + std::vector inputs_vector_info_raw; inputs_vector_info_raw.reserve(inputs_vector_info.size()); for(auto &input : inputs_vector_info) { @@ -94,8 +94,8 @@ TEST_CASE(Configuration, framework::DatasetMode::ALL) ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); // Create and configure function - CLConcatenateLayer concat_layer; - std::vector inputs; + CLConcatenateLayer concat_layer; + std::vector inputs; inputs.emplace_back(&src1); inputs.emplace_back(&src2); inputs.emplace_back(&src3); diff --git a/tests/validation/CL/WidthConcatenateLayer.cpp b/tests/validation/CL/WidthConcatenateLayer.cpp index 665f8011f0..408fe148d7 100644 --- a/tests/validation/CL/WidthConcatenateLayer.cpp +++ b/tests/validation/CL/WidthConcatenateLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 Arm Limited. + * Copyright (c) 2018-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -71,7 +71,7 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( inputs_vector_info.emplace_back(std::move(input_info1)); inputs_vector_info.emplace_back(std::move(input_info2)); - std::vector inputs_vector_info_raw; + std::vector inputs_vector_info_raw; inputs_vector_info_raw.reserve(inputs_vector_info.size()); for(auto &input : inputs_vector_info) { @@ -98,8 +98,8 @@ TEST_CASE(Configuration, framework::DatasetMode::ALL) ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); // Create and configure function - CLConcatenateLayer concat_layer; - std::vector inputs; + CLConcatenateLayer concat_layer; + std::vector inputs; inputs.emplace_back(&src1); inputs.emplace_back(&src2); inputs.emplace_back(&src3); diff --git a/tests/validation/GLES_COMPUTE/DepthConcatenateLayer.cpp b/tests/validation/GLES_COMPUTE/DepthConcatenateLayer.cpp index 1d183b96b9..6ad6fcf5c4 100644 --- a/tests/validation/GLES_COMPUTE/DepthConcatenateLayer.cpp +++ b/tests/validation/GLES_COMPUTE/DepthConcatenateLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 Arm Limited. + * Copyright (c) 2017-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -43,7 +43,7 @@ TEST_SUITE(GC) TEST_SUITE(DepthConcatenateLayer) template -using GCDepthConcatenateLayerFixture = ConcatenateLayerValidationFixture; +using GCDepthConcatenateLayerFixture = ConcatenateLayerValidationFixture; TEST_SUITE(Float) TEST_SUITE(FP16) diff --git a/tests/validation/fixtures/ConcatenateLayerFixture.h b/tests/validation/fixtures/ConcatenateLayerFixture.h index a56eac1fdf..e85f81cb53 100644 --- a/tests/validation/fixtures/ConcatenateLayerFixture.h +++ b/tests/validation/fixtures/ConcatenateLayerFixture.h @@ -43,11 +43,11 @@ namespace test { namespace validation { -template +template class ConcatenateLayerValidationFixture : public framework::Fixture { private: - using SrcITensorType = typename std::conditional::value, const ITensorType, ITensorType>::type; + using SrcITensorType = typename std::conditional::type; public: template -- cgit v1.2.1