diff options
author | Jim Flynn <jim.flynn@arm.com> | 2020-01-22 15:18:49 +0000 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2020-01-23 15:55:02 +0000 |
commit | 6b1bf1a40bebf4cc108d39f8b8e0c29bdfc51ce1 (patch) | |
tree | bd3ed8cfa0f04ea619beb5e4380051f8c051a6e9 /src | |
parent | 2210a5334bbd7d09f11db08a2a7a941a088a0f61 (diff) | |
download | armnn-19.11.1.tar.gz |
IVGCVSW-4156 Remove backend dependency on ProfilingService.hppv19.11.1branches/armnn_19_11
Change-Id: I3b18ede85408bdfbc5147396e183e87bdabd3754
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/backends/backendsCommon/Workload.hpp | 4 | ||||
-rw-r--r-- | src/profiling/IProfilingGuidGenerator.hpp | 32 | ||||
-rw-r--r-- | src/profiling/ProfilingGuidGenerator.hpp | 2 | ||||
-rw-r--r-- | src/profiling/ProfilingService.cpp | 5 |
4 files changed, 8 insertions, 35 deletions
diff --git a/src/backends/backendsCommon/Workload.hpp b/src/backends/backendsCommon/Workload.hpp index b5851ad7b9..e3905804a8 100644 --- a/src/backends/backendsCommon/Workload.hpp +++ b/src/backends/backendsCommon/Workload.hpp @@ -8,8 +8,8 @@ #include "WorkloadInfo.hpp" #include <armnn/Types.hpp> +#include <armnn/IProfilingGuidGenerator.hpp> #include <Profiling.hpp> -#include <ProfilingService.hpp> #include <algorithm> @@ -45,7 +45,7 @@ public: BaseWorkload(const QueueDescriptor& descriptor, const WorkloadInfo& info) : m_Data(descriptor), - m_Guid(profiling::ProfilingService::Instance().NextGuid()) + m_Guid(profiling::IProfilingGuidGenerator::Instance().NextGuid()) { m_Data.Validate(info); } diff --git a/src/profiling/IProfilingGuidGenerator.hpp b/src/profiling/IProfilingGuidGenerator.hpp deleted file mode 100644 index fb9f7401fb..0000000000 --- a/src/profiling/IProfilingGuidGenerator.hpp +++ /dev/null @@ -1,32 +0,0 @@ -// -// Copyright © 2019 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include <armnn/Types.hpp> - -#include <string> - -namespace armnn -{ - -namespace profiling -{ - -class IProfilingGuidGenerator -{ -public: - /// Return the next random Guid in the sequence - virtual ProfilingDynamicGuid NextGuid() = 0; - - /// Create a ProfilingStaticGuid based on a hash of the string - virtual ProfilingStaticGuid GenerateStaticId(const std::string& str) = 0; - - virtual ~IProfilingGuidGenerator() {} -}; - -} // namespace profiling - -} // namespace armnn diff --git a/src/profiling/ProfilingGuidGenerator.hpp b/src/profiling/ProfilingGuidGenerator.hpp index 97de4a88e5..45f523c980 100644 --- a/src/profiling/ProfilingGuidGenerator.hpp +++ b/src/profiling/ProfilingGuidGenerator.hpp @@ -5,7 +5,7 @@ #pragma once -#include "IProfilingGuidGenerator.hpp" +#include "armnn/IProfilingGuidGenerator.hpp" #include <functional> diff --git a/src/profiling/ProfilingService.cpp b/src/profiling/ProfilingService.cpp index c4063a583c..cbd8d6bde8 100644 --- a/src/profiling/ProfilingService.cpp +++ b/src/profiling/ProfilingService.cpp @@ -14,6 +14,11 @@ namespace armnn namespace profiling { +IProfilingGuidGenerator& IProfilingGuidGenerator::Instance() +{ + return ProfilingService::Instance(); +} + void ProfilingService::ResetExternalProfilingOptions(const ExternalProfilingOptions& options, bool resetProfilingService) { |