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/profiling/CounterDirectory.cpp | |
| 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/profiling/CounterDirectory.cpp')
| -rw-r--r-- | src/profiling/CounterDirectory.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/profiling/CounterDirectory.cpp b/src/profiling/CounterDirectory.cpp index 9ef379a04e..5a7d8c6165 100644 --- a/src/profiling/CounterDirectory.cpp +++ b/src/profiling/CounterDirectory.cpp @@ -14,10 +14,10 @@ #include <fmt/format.h> -namespace armnn +namespace arm { -namespace profiling +namespace pipe { const Category* CounterDirectory::RegisterCategory(const std::string& categoryName) @@ -52,7 +52,7 @@ const Category* CounterDirectory::RegisterCategory(const std::string& categoryNa const Device* CounterDirectory::RegisterDevice(const std::string& deviceName, uint16_t cores, - const Optional<std::string>& parentCategoryName) + const armnn::Optional<std::string>& parentCategoryName) { // Check that the given device name is valid if (deviceName.empty() || @@ -113,7 +113,7 @@ const Device* CounterDirectory::RegisterDevice(const std::string& deviceName, const CounterSet* CounterDirectory::RegisterCounterSet(const std::string& counterSetName, uint16_t count, - const Optional<std::string>& parentCategoryName) + const armnn::Optional<std::string>& parentCategoryName) { // Check that the given counter set name is valid if (counterSetName.empty() || @@ -178,7 +178,7 @@ const CounterSet* CounterDirectory::RegisterCounterSet(const std::string& counte return counterSetPtr; } -const Counter* CounterDirectory::RegisterCounter(const BackendId& backendId, +const Counter* CounterDirectory::RegisterCounter(const armnn::BackendId& backendId, const uint16_t uid, const std::string& parentCategoryName, uint16_t counterClass, @@ -186,10 +186,10 @@ const Counter* CounterDirectory::RegisterCounter(const BackendId& backendId, double multiplier, const std::string& name, const std::string& description, - const Optional<std::string>& units, - const Optional<uint16_t>& numberOfCores, - const Optional<uint16_t>& deviceUid, - const Optional<uint16_t>& counterSetUid) + const armnn::Optional<std::string>& units, + const armnn::Optional<uint16_t>& numberOfCores, + const armnn::Optional<uint16_t>& deviceUid, + const armnn::Optional<uint16_t>& counterSetUid) { IgnoreUnused(backendId); @@ -502,7 +502,7 @@ CountersIt CounterDirectory::FindCounter(const std::string& counterName) const }); } -uint16_t CounterDirectory::GetNumberOfCores(const Optional<uint16_t>& numberOfCores, +uint16_t CounterDirectory::GetNumberOfCores(const armnn::Optional<uint16_t>& numberOfCores, uint16_t deviceUid) { // To get the number of cores, apply the following rules: @@ -544,6 +544,6 @@ uint16_t CounterDirectory::GetNumberOfCores(const Optional<uint16_t>& numberOfCo return 0; } -} // namespace profiling +} // namespace pipe -} // namespace armnn +} // namespace arm |