From 40f51a63c8e7258db15269427ae4fe1ad199c550 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Sat, 21 Nov 2020 03:04:18 +0000 Subject: Update default C++ standard to C++14 (3RDPARTY_UPDATE) Resolves: COMPMID-3849 Signed-off-by: Georgios Pinitas Change-Id: I6369f112337310140e2d6c8e79630cd11138dfa0 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4544 Tested-by: Arm Jenkins Reviewed-by: Michalis Spyrou Comments-Addressed: Arm Jenkins --- tests/validation/CL/UNIT/TensorAllocator.cpp | 6 +++--- tests/validation/NEON/UNIT/TensorAllocator.cpp | 10 ++++------ tests/validation/fixtures/UNIT/DynamicTensorFixture.h | 6 +++--- 3 files changed, 10 insertions(+), 12 deletions(-) (limited to 'tests/validation') diff --git a/tests/validation/CL/UNIT/TensorAllocator.cpp b/tests/validation/CL/UNIT/TensorAllocator.cpp index 9db98fb534..3ccdd99fe3 100644 --- a/tests/validation/CL/UNIT/TensorAllocator.cpp +++ b/tests/validation/CL/UNIT/TensorAllocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 Arm Limited. + * Copyright (c) 2018-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -135,10 +135,10 @@ TEST_CASE(ImportMemoryMalloc, framework::DatasetMode::ALL) const size_t total_size_in_bytes = tensor.info()->total_size(); const size_t alignment = CLKernelLibrary::get().get_device().getInfo(); size_t space = total_size_in_bytes + alignment; - auto raw_data = support::cpp14::make_unique(space); + auto raw_data = std::make_unique(space); void *aligned_ptr = raw_data.get(); - support::cpp11::align(alignment, total_size_in_bytes, aligned_ptr, space); + std::align(alignment, total_size_in_bytes, aligned_ptr, space); cl::Buffer wrapped_buffer(import_malloc_memory_helper(aligned_ptr, total_size_in_bytes)); ARM_COMPUTE_EXPECT(bool(tensor.allocator()->import_memory(wrapped_buffer)), framework::LogLevel::ERRORS); diff --git a/tests/validation/NEON/UNIT/TensorAllocator.cpp b/tests/validation/NEON/UNIT/TensorAllocator.cpp index 273d2e0a4f..ef19524d1c 100644 --- a/tests/validation/NEON/UNIT/TensorAllocator.cpp +++ b/tests/validation/NEON/UNIT/TensorAllocator.cpp @@ -29,8 +29,6 @@ #include "arm_compute/runtime/MemoryRegion.h" #include "arm_compute/runtime/NEON/functions/NEActivationLayer.h" -#include "support/MemorySupport.h" - #include "tests/Globals.h" #include "tests/Utils.h" #include "tests/framework/Asserts.h" @@ -58,7 +56,7 @@ TEST_CASE(ImportMemory, framework::DatasetMode::ALL) // Allocate memory buffer const size_t total_size = info.total_size(); - auto data = support::cpp14::make_unique(total_size); + auto data = std::make_unique(total_size); // Negative case : Import nullptr Tensor t1; @@ -111,10 +109,10 @@ TEST_CASE(ImportMemoryMalloc, framework::DatasetMode::ALL) const size_t total_size_in_elems = tensor.info()->tensor_shape().total_size(); const size_t total_size_in_bytes = tensor.info()->total_size(); size_t space = total_size_in_bytes + required_alignment; - auto raw_data = support::cpp14::make_unique(space); + auto raw_data = std::make_unique(space); void *aligned_ptr = raw_data.get(); - support::cpp11::align(required_alignment, total_size_in_bytes, aligned_ptr, space); + std::align(required_alignment, total_size_in_bytes, aligned_ptr, space); ARM_COMPUTE_EXPECT(bool(tensor.allocator()->import_memory(aligned_ptr)), framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(!tensor.info()->is_resizable(), framework::LogLevel::ERRORS); @@ -160,7 +158,7 @@ TEST_CASE(ImportMemoryMallocPadded, framework::DatasetMode::ALL) // Allocate and import tensor const size_t total_size_in_bytes = tensor.info()->total_size(); - auto raw_data = support::cpp14::make_unique(total_size_in_bytes); + auto raw_data = std::make_unique(total_size_in_bytes); ARM_COMPUTE_EXPECT(bool(tensor.allocator()->import_memory(raw_data.get())), framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(!tensor.info()->is_resizable(), framework::LogLevel::ERRORS); diff --git a/tests/validation/fixtures/UNIT/DynamicTensorFixture.h b/tests/validation/fixtures/UNIT/DynamicTensorFixture.h index 74e62fb77f..4ac19bf3ba 100644 --- a/tests/validation/fixtures/UNIT/DynamicTensorFixture.h +++ b/tests/validation/fixtures/UNIT/DynamicTensorFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Arm Limited. + * Copyright (c) 2019-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -264,7 +264,7 @@ public: _info = info; // Create function - _f_target = support::cpp14::make_unique(_ms.mm); + _f_target = std::make_unique(_ms.mm); } void run_iteration(unsigned int idx) @@ -425,7 +425,7 @@ protected: for(unsigned int i = 0; i < num_functions; ++i) { - _functions.emplace_back(support::cpp14::make_unique(_ms.mm)); + _functions.emplace_back(std::make_unique(_ms.mm)); } for(unsigned int i = 0; i < num_resizes; ++i) -- cgit v1.2.1