IVGCVSW-6852 Break the remaining dependencies on Arm NN in the profiling code

Change-Id: I18b8ca22896567904768170350ee5eb22edd4a22
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

2 files changed, 8 insertions, 16 deletions

diff --git a/include/armnn/profiling/ArmNNProfiling.hpp b/include/armnn/profiling/ArmNNProfiling.hpp
index 39d4a6bfcc..72fefe1cab 100644
--- a/include/armnn/profiling/ArmNNProfiling.hpp
+++ b/include/armnn/profiling/ArmNNProfiling.hpp
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include <armnn/Version.hpp>
+
 namespace arm
 {
 
@@ -17,6 +19,12 @@ static const uint16_t REGISTERED_BACKENDS   = 2;
 static const uint16_t UNREGISTERED_BACKENDS = 3;
 static const uint16_t INFERENCES_RUN        = 4;
 static const uint16_t MAX_ARMNN_COUNTER     = INFERENCES_RUN;
+
+// Static holding Arm NN's software descriptions
+static std::string ARMNN_SOFTWARE_INFO("ArmNN");
+static std::string ARMNN_HARDWARE_VERSION;
+static std::string ARMNN_SOFTWARE_VERSION = "Armnn " + std::to_string(ARMNN_MAJOR_VERSION) + "." +
+                                                       std::to_string(ARMNN_MINOR_VERSION);
 } // namespace pipe
 
 } // namespace arm
diff --git a/include/armnnUtils/Threads.hpp b/include/armnnUtils/Threads.hpp
deleted file mode 100644
index 4cecfd5079..0000000000
--- a/include/armnnUtils/Threads.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma once
-
-namespace armnnUtils
-{
-namespace Threads
-{
-
-int GetCurrentThreadId();
-
-}
-}