diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/CL/OpenCL.cpp | 10 | ||||
-rw-r--r-- | src/graph/backends/CL/CLDeviceBackend.cpp | 5 | ||||
-rw-r--r-- | src/graph/backends/CL/CLFunctionsFactory.cpp | 4 | ||||
-rw-r--r-- | src/graph/backends/GLES/GCDeviceBackend.cpp | 5 | ||||
-rw-r--r-- | src/graph/backends/NEON/NEDeviceBackend.cpp | 5 | ||||
-rw-r--r-- | src/graph/backends/NEON/NEFunctionFactory.cpp | 2 | ||||
-rw-r--r-- | src/runtime/CL/functions/CLFFT2D.cpp | 10 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NEFFT2D.cpp | 10 |
8 files changed, 28 insertions, 23 deletions
diff --git a/src/core/CL/OpenCL.cpp b/src/core/CL/OpenCL.cpp index 74c5b041d7..9a3e344f1f 100644 --- a/src/core/CL/OpenCL.cpp +++ b/src/core/CL/OpenCL.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -34,6 +34,14 @@ namespace arm_compute { +CLSymbols::CLSymbols() noexcept(false) + : _loaded( +{ + false, false +}) +{ +} + CLSymbols &CLSymbols::get() { static CLSymbols symbols; diff --git a/src/graph/backends/CL/CLDeviceBackend.cpp b/src/graph/backends/CL/CLDeviceBackend.cpp index de318476ab..0159592af6 100644 --- a/src/graph/backends/CL/CLDeviceBackend.cpp +++ b/src/graph/backends/CL/CLDeviceBackend.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -169,9 +169,8 @@ std::unique_ptr<ITensorHandle> CLDeviceBackend::create_tensor(const Tensor &tens // Create backend tensor handle TensorInfo info(tensor_desc.shape, 1, tensor_desc.data_type, tensor_desc.quant_info); info.set_data_layout(tensor_desc.layout); - auto backend_tensor_handle = support::cpp14::make_unique<CLTensorHandle>(info); - return std::move(backend_tensor_handle); + return support::cpp14::make_unique<CLTensorHandle>(info); } std::unique_ptr<ITensorHandle> CLDeviceBackend::create_subtensor(ITensorHandle *parent, TensorShape shape, Coordinates coords, bool extend_parent) diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index e6684f676d..312e09a49a 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -158,7 +158,7 @@ std::unique_ptr<IFunction> create_detection_output_layer<CPPDetectionOutputLayer wrap_function->register_tensor(input2); wrap_function->register_tensor(output); - return std::move(wrap_function); + return RETURN_UNIQUE_PTR(wrap_function); } template <> std::unique_ptr<IFunction> create_detection_post_process_layer<CPPDetectionPostProcessLayer, CLTargetInfo>(DetectionPostProcessLayerNode &node) @@ -214,7 +214,7 @@ std::unique_ptr<IFunction> create_detection_post_process_layer<CPPDetectionPostP wrap_function->register_tensor(output2); wrap_function->register_tensor(output3); - return std::move(wrap_function); + return RETURN_UNIQUE_PTR(wrap_function); } } // namespace detail diff --git a/src/graph/backends/GLES/GCDeviceBackend.cpp b/src/graph/backends/GLES/GCDeviceBackend.cpp index 83e2436ddb..bb674ce8af 100644 --- a/src/graph/backends/GLES/GCDeviceBackend.cpp +++ b/src/graph/backends/GLES/GCDeviceBackend.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -111,9 +111,8 @@ std::unique_ptr<ITensorHandle> GCDeviceBackend::create_tensor(const Tensor &tens // Create backend tensor handle TensorInfo info(tensor_desc.shape, 1, tensor_desc.data_type, tensor_desc.quant_info); info.set_data_layout(tensor_desc.layout); - auto backend_tensor_handle = support::cpp14::make_unique<GCTensorHandle>(info); - return std::move(backend_tensor_handle); + return support::cpp14::make_unique<GCTensorHandle>(info); } std::unique_ptr<ITensorHandle> GCDeviceBackend::create_subtensor(ITensorHandle *parent, TensorShape shape, Coordinates coords, bool extend_parent) diff --git a/src/graph/backends/NEON/NEDeviceBackend.cpp b/src/graph/backends/NEON/NEDeviceBackend.cpp index 017b4f0f24..b568b7988b 100644 --- a/src/graph/backends/NEON/NEDeviceBackend.cpp +++ b/src/graph/backends/NEON/NEDeviceBackend.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -122,9 +122,8 @@ std::unique_ptr<ITensorHandle> NEDeviceBackend::create_tensor(const Tensor &tens // Create backend tensor handle TensorInfo info(tensor_desc.shape, 1, tensor_desc.data_type, tensor_desc.quant_info); info.set_data_layout(tensor_desc.layout); - auto backend_tensor_handle = support::cpp14::make_unique<NETensorHandle>(info); - return std::move(backend_tensor_handle); + return support::cpp14::make_unique<NETensorHandle>(info); } std::unique_ptr<ITensorHandle> NEDeviceBackend::create_subtensor(ITensorHandle *parent, TensorShape shape, Coordinates coords, bool extend_parent) diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index ddb4ccf391..0aea15d941 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -179,7 +179,7 @@ std::unique_ptr<IFunction> create_normalization_layer<NENormalizationLayer, NETa << " Normalization info: " << norm_info.type() << std::endl); - return std::move(func); + return RETURN_UNIQUE_PTR(func); } } // namespace detail diff --git a/src/runtime/CL/functions/CLFFT2D.cpp b/src/runtime/CL/functions/CLFFT2D.cpp index 165e784786..f5776cbd88 100644 --- a/src/runtime/CL/functions/CLFFT2D.cpp +++ b/src/runtime/CL/functions/CLFFT2D.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -41,14 +41,14 @@ void CLFFT2D::configure(const ICLTensor *input, ICLTensor *output, const FFT2DIn // Setup first pass FFT1DInfo first_pass_config; - first_pass_config.axis = config.axes.first; + first_pass_config.axis = config.axis0; first_pass_config.direction = config.direction; _memory_group.manage(&_first_pass_tensor); _first_pass_func.configure(input, &_first_pass_tensor, first_pass_config); // Setup second pass FFT1DInfo second_pass_config; - second_pass_config.axis = config.axes.second; + second_pass_config.axis = config.axis1; second_pass_config.direction = config.direction; _second_pass_func.configure(&_first_pass_tensor, output, second_pass_config); _first_pass_tensor.allocator()->allocate(); @@ -63,13 +63,13 @@ Status CLFFT2D::validate(const ITensorInfo *input, const ITensorInfo *output, co // Validate first pass FFT1DInfo first_pass_config; - first_pass_config.axis = config.axes.first; + first_pass_config.axis = config.axis0; first_pass_config.direction = config.direction; ARM_COMPUTE_RETURN_ON_ERROR(CLFFT1D::validate(input, &first_pass_tensor, first_pass_config)); // Validate second pass FFT1DInfo second_pass_config; - second_pass_config.axis = config.axes.second; + second_pass_config.axis = config.axis1; second_pass_config.direction = config.direction; ARM_COMPUTE_RETURN_ON_ERROR(CLFFT1D::validate(&first_pass_tensor, output, second_pass_config)); diff --git a/src/runtime/NEON/functions/NEFFT2D.cpp b/src/runtime/NEON/functions/NEFFT2D.cpp index 9210ecfa2e..2fea017781 100644 --- a/src/runtime/NEON/functions/NEFFT2D.cpp +++ b/src/runtime/NEON/functions/NEFFT2D.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -41,14 +41,14 @@ void NEFFT2D::configure(const ITensor *input, ITensor *output, const FFT2DInfo & // Setup first pass FFT1DInfo first_pass_config; - first_pass_config.axis = config.axes.first; + first_pass_config.axis = config.axis0; first_pass_config.direction = config.direction; _memory_group.manage(&_first_pass_tensor); _first_pass_func.configure(input, &_first_pass_tensor, first_pass_config); // Setup second pass FFT1DInfo second_pass_config; - second_pass_config.axis = config.axes.second; + second_pass_config.axis = config.axis1; second_pass_config.direction = config.direction; _second_pass_func.configure(&_first_pass_tensor, output, second_pass_config); _first_pass_tensor.allocator()->allocate(); @@ -63,13 +63,13 @@ Status NEFFT2D::validate(const ITensorInfo *input, const ITensorInfo *output, co // Validate first pass FFT1DInfo first_pass_config; - first_pass_config.axis = config.axes.first; + first_pass_config.axis = config.axis0; first_pass_config.direction = config.direction; ARM_COMPUTE_RETURN_ON_ERROR(NEFFT1D::validate(input, &first_pass_tensor, first_pass_config)); // Validate second pass FFT1DInfo second_pass_config; - second_pass_config.axis = config.axes.second; + second_pass_config.axis = config.axis1; second_pass_config.direction = config.direction; ARM_COMPUTE_RETURN_ON_ERROR(NEFFT1D::validate(&first_pass_tensor, output, second_pass_config)); |