diff options
Diffstat (limited to 'arm_compute/runtime')
-rw-r--r-- | arm_compute/runtime/FunctionDescriptors.h | 7 | ||||
-rw-r--r-- | arm_compute/runtime/MemoryGroup.h | 12 |
2 files changed, 10 insertions, 9 deletions
diff --git a/arm_compute/runtime/FunctionDescriptors.h b/arm_compute/runtime/FunctionDescriptors.h index d523c56907..3706d0859f 100644 --- a/arm_compute/runtime/FunctionDescriptors.h +++ b/arm_compute/runtime/FunctionDescriptors.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -44,8 +44,9 @@ struct FFT1DInfo /** Descriptor used by the FFT2D function */ struct FFT2DInfo { - std::pair<unsigned int, unsigned int> axes{ 0, 1 }; /**< Axes to run on. If same, multiple transforms are performed on single axis*/ - FFTDirection direction{ FFTDirection::Forward }; /**< Direction of the FFT. */ + unsigned int axis0{ 0 }; /**< Axis to run first pass on. If same, multiple transforms are performed on single axis*/ + unsigned int axis1{ 1 }; /**< Axis to run second pass on. If same, multiple transforms are performed on single axis*/ + FFTDirection direction{ FFTDirection::Forward }; /**< Direction of the FFT. */ }; } // namespace arm_compute #endif /* ARM_COMPUTE_RUNTIME_FUNCTION_DESCRIPTORS_H */ diff --git a/arm_compute/runtime/MemoryGroup.h b/arm_compute/runtime/MemoryGroup.h index ba1dbc0a28..4d484954a1 100644 --- a/arm_compute/runtime/MemoryGroup.h +++ b/arm_compute/runtime/MemoryGroup.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -44,9 +44,7 @@ class MemoryGroup final : public IMemoryGroup { public: /** Default Constructor */ - MemoryGroup(IMemoryManager *memory_manager); - /** Default Constructor */ - MemoryGroup(std::shared_ptr<IMemoryManager> = nullptr); + MemoryGroup(std::shared_ptr<IMemoryManager> = nullptr) noexcept; /** Default destructor */ ~MemoryGroup() = default; /** Prevent instances of this class from being copied (As this class contains pointers) */ @@ -71,8 +69,10 @@ private: MemoryMappings _mappings; /**< Memory mappings of the group */ }; -inline MemoryGroup::MemoryGroup(std::shared_ptr<IMemoryManager> memory_manager) - : _memory_manager(memory_manager), _pool(nullptr), _mappings() +inline MemoryGroup::MemoryGroup(std::shared_ptr<IMemoryManager> memory_manager) noexcept + : _memory_manager(memory_manager), + _pool(nullptr), + _mappings() { } |