From 5aa9fd7ac6bf8dad576fa4a0a32aa3dae98d11ab Mon Sep 17 00:00:00 2001 From: Cathal Corbett Date: Fri, 25 Feb 2022 15:33:28 +0000 Subject: 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 Change-Id: I9c50007dcd5b5e792757e7bd1213606df5ffec36 --- src/armnnUtils/ProfilingOptionsConverter.cpp | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'src/armnnUtils/ProfilingOptionsConverter.cpp') 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 #include -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 -- cgit v1.2.1