diff options
author | Cathal Corbett <cathal.corbett@arm.com> | 2022-02-25 15:33:28 +0000 |
---|---|---|
committer | Cathal Corbett <cathal.corbett@arm.com> | 2022-03-01 11:44:14 +0000 |
commit | 5aa9fd7ac6bf8dad576fa4a0a32aa3dae98d11ab (patch) | |
tree | 23a3a0d5ca5143924277f34c98d36cf7b99430a7 /src/armnnUtils | |
parent | 1fc448ad2455ad31b96a3891f847125a3295d75a (diff) | |
download | armnn-5aa9fd7ac6bf8dad576fa4a0a32aa3dae98d11ab.tar.gz |
IVGCVSW-6704 Change the namespace from armnn::profiling to arm::pipe
* Updated ABI version to 29 due to being the first ABI break in 22.05
!android-nn-driver:7226
Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: I9c50007dcd5b5e792757e7bd1213606df5ffec36
Diffstat (limited to 'src/armnnUtils')
-rw-r--r-- | src/armnnUtils/ProfilingOptionsConverter.cpp | 27 | ||||
-rw-r--r-- | src/armnnUtils/ProfilingOptionsConverter.hpp | 13 |
2 files changed, 25 insertions, 15 deletions
diff --git a/src/armnnUtils/ProfilingOptionsConverter.cpp b/src/armnnUtils/ProfilingOptionsConverter.cpp index 6d5b35134a..9a256db47c 100644 --- a/src/armnnUtils/ProfilingOptionsConverter.cpp +++ b/src/armnnUtils/ProfilingOptionsConverter.cpp @@ -8,23 +8,28 @@ #include <algorithm> #include <iterator> -namespace armnn +namespace arm { -profiling::ProfilingOptions ConvertExternalProfilingOptions( - const IRuntime::CreationOptions::ExternalProfilingOptions& options) +namespace pipe { - profiling::ProfilingOptions convertedOptions; - convertedOptions.m_EnableProfiling = options.m_EnableProfiling; - convertedOptions.m_TimelineEnabled = options.m_TimelineEnabled; + +ProfilingOptions ConvertExternalProfilingOptions( + const armnn::IRuntime::CreationOptions::ExternalProfilingOptions& options) +{ + ProfilingOptions convertedOptions; + convertedOptions.m_EnableProfiling = options.m_EnableProfiling; + convertedOptions.m_TimelineEnabled = options.m_TimelineEnabled; convertedOptions.m_OutgoingCaptureFile = options.m_OutgoingCaptureFile; convertedOptions.m_IncomingCaptureFile = options.m_IncomingCaptureFile; - convertedOptions.m_FileOnly = options.m_FileOnly; - convertedOptions.m_CapturePeriod = options.m_CapturePeriod; - convertedOptions.m_FileFormat = options.m_FileFormat; + convertedOptions.m_FileOnly = options.m_FileOnly; + convertedOptions.m_CapturePeriod = options.m_CapturePeriod; + convertedOptions.m_FileFormat = options.m_FileFormat; std::copy(options.m_LocalPacketHandlers.begin(), options.m_LocalPacketHandlers.end(), - std::back_inserter(convertedOptions.m_LocalPacketHandlers)); + std::back_inserter(convertedOptions.m_LocalPacketHandlers)); return convertedOptions; } -} // namespace armnn +} // namespace arm + +} // namespace pipe diff --git a/src/armnnUtils/ProfilingOptionsConverter.hpp b/src/armnnUtils/ProfilingOptionsConverter.hpp index 02be849816..3bf1f1920d 100644 --- a/src/armnnUtils/ProfilingOptionsConverter.hpp +++ b/src/armnnUtils/ProfilingOptionsConverter.hpp @@ -8,10 +8,15 @@ #include <armnn/IRuntime.hpp> #include <armnn/profiling/ProfilingOptions.hpp> -namespace armnn +namespace arm { -profiling::ProfilingOptions ConvertExternalProfilingOptions( - const IRuntime::CreationOptions::ExternalProfilingOptions& options); +namespace pipe +{ + +ProfilingOptions ConvertExternalProfilingOptions( + const armnn::IRuntime::CreationOptions::ExternalProfilingOptions& options); + +} // namespace pipe -} // namespace armnn +} // namespace arm |