diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-06-09 10:08:27 +0100 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-06-15 17:57:39 +0000 |
commit | 08302c17cd57356b35d46e17dc8d8f76672da5cf (patch) | |
tree | 3fed9bea3586bc140cc953e935f6ed55e8692dac /arm_compute/runtime | |
parent | 450dfb1b4d719d60295bfae56f4c46dcaf044d72 (diff) | |
download | ComputeLibrary-08302c17cd57356b35d46e17dc8d8f76672da5cf.tar.gz |
Add CPU discovery capabilities.
Resolves: COMPMID-4500
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I008c51934ef813fb1f489b531288c4419e701955
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5799
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'arm_compute/runtime')
-rw-r--r-- | arm_compute/runtime/DeviceProperties.h | 41 | ||||
-rw-r--r-- | arm_compute/runtime/IRuntimeContext.h | 8 | ||||
-rw-r--r-- | arm_compute/runtime/IScheduler.h | 9 | ||||
-rw-r--r-- | arm_compute/runtime/RuntimeContext.h | 9 |
4 files changed, 9 insertions, 58 deletions
diff --git a/arm_compute/runtime/DeviceProperties.h b/arm_compute/runtime/DeviceProperties.h deleted file mode 100644 index 807b53eae4..0000000000 --- a/arm_compute/runtime/DeviceProperties.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2019 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. - */ -#ifndef ARM_COMPUTE_DEVICE_PROPERTIES_H -#define ARM_COMPUTE_DEVICE_PROPERTIES_H - -#include "arm_compute/core/CPP/CPPTypes.h" - -namespace arm_compute -{ -/** Device properties */ -struct DeviceProperties -{ - std::string name{ "unknown" }; - CPUInfo cpu_info{}; // initialised upon creating in the constructor - - DeviceProperties(); -}; - -} // namespace arm_compute -#endif /*ARM_COMPUTE_DEVICE_PROPERTIES_H */ diff --git a/arm_compute/runtime/IRuntimeContext.h b/arm_compute/runtime/IRuntimeContext.h index 4751fc2ddc..8e61cfb8a8 100644 --- a/arm_compute/runtime/IRuntimeContext.h +++ b/arm_compute/runtime/IRuntimeContext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Arm Limited. + * Copyright (c) 2019, 2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -29,7 +29,6 @@ namespace arm_compute // Forward declarations class IScheduler; class IAssetManager; -struct DeviceProperties; /** Context interface */ class IRuntimeContext @@ -51,11 +50,6 @@ public: * @return The asset manager registered to the context */ virtual IAssetManager *asset_manager() = 0; - /** Device propertied accessor - * - * @return Device properties - */ - virtual const DeviceProperties &properties() = 0; }; } // namespace arm_compute #endif /*ARM_COMPUTE_IRUNTIME_CONTEXT_H */ diff --git a/arm_compute/runtime/IScheduler.h b/arm_compute/runtime/IScheduler.h index d3ba86a67b..417c62cc9c 100644 --- a/arm_compute/runtime/IScheduler.h +++ b/arm_compute/runtime/IScheduler.h @@ -127,9 +127,9 @@ public: } private: - unsigned int _split_dimension; - StrategyHint _strategy; - int _threshold; + unsigned int _split_dimension{}; + StrategyHint _strategy{}; + int _threshold{}; }; /** Signature for the workloads to execute */ using Workload = std::function<void(const ThreadInfo &)>; @@ -205,7 +205,6 @@ protected: * @param[in] workloads Array of workloads to run */ virtual void run_workloads(std::vector<Workload> &workloads) = 0; - CPUInfo _cpu_info; /** Common scheduler logic to execute the given kernel * @@ -216,6 +215,8 @@ protected: */ void schedule_common(ICPPKernel *kernel, const Hints &hints, const Window &window, ITensorPack &tensors); + CPUInfo _cpu_info{}; + private: unsigned int _num_threads_hint = {}; }; diff --git a/arm_compute/runtime/RuntimeContext.h b/arm_compute/runtime/RuntimeContext.h index 31e2d6939a..23bd267375 100644 --- a/arm_compute/runtime/RuntimeContext.h +++ b/arm_compute/runtime/RuntimeContext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Arm Limited. + * Copyright (c) 2019, 2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -24,7 +24,6 @@ #ifndef ARM_COMPUTE_RUNTIME_CONTEXT_H #define ARM_COMPUTE_RUNTIME_CONTEXT_H -#include "arm_compute/runtime/DeviceProperties.h" #include "arm_compute/runtime/IRuntimeContext.h" #include <memory> @@ -51,14 +50,12 @@ public: void set_scheduler(IScheduler *scheduler); // Inherited overridden methods - IScheduler *scheduler() override; - IAssetManager *asset_manager() override; - const DeviceProperties &properties() override; + IScheduler *scheduler() override; + IAssetManager *asset_manager() override; private: std::unique_ptr<IScheduler> _owned_scheduler{ nullptr }; IScheduler *_scheduler{ nullptr }; - DeviceProperties _device_props{}; }; } // namespace arm_compute #endif /*ARM_COMPUTE_RUNTIME_CONTEXT_H */ |