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
diff --git a/include/armnn/backends/profiling/IBackendProfiling.hpp b/include/armnn/backends/profiling/IBackendProfiling.hpp
index beb7755..a04f3c1 100644
--- a/include/armnn/backends/profiling/IBackendProfiling.hpp
+++ b/include/armnn/backends/profiling/IBackendProfiling.hpp
@@ -12,10 +12,10 @@
#include <memory>
#include <vector>
-namespace armnn
+namespace arm
{
-namespace profiling
+namespace pipe
{
struct CounterValue
@@ -55,11 +55,13 @@
virtual uint16_t RegisterDevice(const std::string& deviceName,
uint16_t cores = 0,
- const Optional<std::string>& parentCategoryName = EmptyOptional()) = 0;
+ const armnn::Optional<std::string>& parentCategoryName
+ = armnn::EmptyOptional()) = 0;
virtual uint16_t RegisterCounterSet(const std::string& counterSetName,
uint16_t count = 0,
- const Optional<std::string>& parentCategoryName = EmptyOptional()) = 0;
+ const armnn::Optional<std::string>& parentCategoryName
+ = armnn::EmptyOptional()) = 0;
virtual uint16_t RegisterCounter(const uint16_t uid,
const std::string& parentCategoryName,
@@ -68,10 +70,10 @@
double multiplier,
const std::string& name,
const std::string& description,
- const Optional<std::string>& units = EmptyOptional(),
- const Optional<uint16_t>& numberOfCores = EmptyOptional(),
- const Optional<uint16_t>& deviceUid = EmptyOptional(),
- const Optional<uint16_t>& counterSetUid = EmptyOptional()) = 0;
+ const armnn::Optional<std::string>& units = armnn::EmptyOptional(),
+ const armnn::Optional<uint16_t>& numberOfCores = armnn::EmptyOptional(),
+ const armnn::Optional<uint16_t>& deviceUid = armnn::EmptyOptional(),
+ const armnn::Optional<uint16_t>& counterSetUid = armnn::EmptyOptional()) = 0;
virtual ~IRegisterBackendCounters() {}
};
@@ -99,6 +101,6 @@
};
-} // namespace profiling
+} // namespace pipe
-} // namespace armnn
\ No newline at end of file
+} // namespace arm
\ No newline at end of file