IVGCVSW-5833 Move the ProfilingGuid out of Types.hpp to its own header in profiling common

!android-nn-driver:5691


Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: Ib71af0831e324ac6bd27b1a36f4a6ec1a703b14a

8 files changed, 27 insertions, 7 deletions

diff --git a/python/pyarmnn/CMakeLists.txt b/python/pyarmnn/CMakeLists.txt
index 2ef81d9ab7..4823c4db92 100644
--- a/python/pyarmnn/CMakeLists.txt
+++ b/python/pyarmnn/CMakeLists.txt
@@ -13,7 +13,7 @@ configure_file(${SWIG_GENERATE_IN} ${SWIG_GENERATE} COPYONLY)
 
 # local env variables passed down to the python scripts
 # scripts can thus be used standalone
-set(ARMNN_ENV ARMNN_INCLUDE=${PROJECT_SOURCE_DIR}/include 
+set(ARMNN_ENV ARMNN_INCLUDE="${PROJECT_SOURCE_DIR}/include,${PROJECT_SOURCE_DIR}/profiling/common/include"
               ARMNN_LIB=${PROJECT_BINARY_DIR}
               SWIG_EXECUTABLE=${SWIG_EXECUTABLE})
 
diff --git a/python/pyarmnn/setup.py b/python/pyarmnn/setup.py
index 78868549f3..7bc4a47619 100755
--- a/python/pyarmnn/setup.py
+++ b/python/pyarmnn/setup.py
@@ -124,12 +124,25 @@ def find_includes(armnn_include_env: str = INCLUDE_ENV_NAME):
     Returns:
         list: A list of paths to include.
     """
-    armnn_include_path = os.getenv(armnn_include_env)
-    if armnn_include_path is not None and os.path.exists(armnn_include_path):
-        armnn_include_path = [armnn_include_path]
-    else:
-        armnn_include_path = ['/usr/local/include', '/usr/include']
-    return armnn_include_path
+
+    # split multiple paths
+    global armnn_include_path
+    armnn_include_path_raw = os.getenv(armnn_include_env)
+    if not armnn_include_path_raw == None:
+        armnn_include_path = armnn_include_path_raw.split(",")
+
+    # validate input paths
+    armnn_include_path_result = []
+    for path in armnn_include_path:
+        if path is not None and os.path.exists(path):
+            armnn_include_path_result = armnn_include_path_result + [path]
+
+
+    # if none exist revert to default
+    if len(armnn_include_path_result) == 0:
+        armnn_include_path_result = ['/usr/local/include', '/usr/include']
+    return armnn_include_path_result
+
 
 
 @lru_cache(maxsize=1)
diff --git a/python/pyarmnn/src/pyarmnn/swig/armnn.i b/python/pyarmnn/src/pyarmnn/swig/armnn.i
index 2227c9b20a..172d2d80cf 100644
--- a/python/pyarmnn/src/pyarmnn/swig/armnn.i
+++ b/python/pyarmnn/src/pyarmnn/swig/armnn.i
@@ -6,6 +6,7 @@
 %{
 #define SWIG_FILE_WITH_INIT
 #include "armnn/Types.hpp"
+#include "ProfilingGuid.hpp"
 %}
 
 //typemap definitions and other common stuff
diff --git a/python/pyarmnn/src/pyarmnn/swig/armnn_deserializer.i b/python/pyarmnn/src/pyarmnn/swig/armnn_deserializer.i
index bc8228a5eb..073fadaba9 100644
--- a/python/pyarmnn/src/pyarmnn/swig/armnn_deserializer.i
+++ b/python/pyarmnn/src/pyarmnn/swig/armnn_deserializer.i
@@ -6,6 +6,7 @@
 %{
 #include "armnnDeserializer/IDeserializer.hpp"
 #include "armnn/Types.hpp"
+#include "ProfilingGuid.hpp"
 #include "armnn/INetwork.hpp"
 #include "armnn/Exceptions.hpp"
 #include <string>
diff --git a/python/pyarmnn/src/pyarmnn/swig/armnn_tfliteparser.i b/python/pyarmnn/src/pyarmnn/swig/armnn_tfliteparser.i
index 3ed5d6b8fd..d2d79cc627 100644
--- a/python/pyarmnn/src/pyarmnn/swig/armnn_tfliteparser.i
+++ b/python/pyarmnn/src/pyarmnn/swig/armnn_tfliteparser.i
@@ -6,6 +6,7 @@
 %{
 #include "armnnTfLiteParser/ITfLiteParser.hpp"
 #include "armnn/Types.hpp"
+#include "ProfilingGuid.hpp"
 #include "armnn/INetwork.hpp"
 %}
 
diff --git a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_descriptors.i b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_descriptors.i
index a050722bb9..00b835bfb3 100644
--- a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_descriptors.i
+++ b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_descriptors.i
@@ -5,6 +5,7 @@
 %{
 #include "armnn/Descriptors.hpp"
 #include "armnn/Types.hpp"
+#include "ProfilingGuid.hpp"
 %}
 
 namespace std {
diff --git a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i
index 57bf355253..7dc88ac176 100644
--- a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i
+++ b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i
@@ -6,6 +6,7 @@
 #include "armnn/INetwork.hpp"
 #include "armnn/BackendId.hpp"
 #include "armnn/Types.hpp"
+#include "ProfilingGuid.hpp"
 #include "armnn/Optional.hpp"
 #include <fstream>
 %}
diff --git a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_types.i b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_types.i
index e0ad174440..b838fce53d 100644
--- a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_types.i
+++ b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_types.i
@@ -4,6 +4,7 @@
 //
 %{
 #include "armnn/Types.hpp"
+#include "ProfilingGuid.hpp"
 %}
 
 %include <typemaps/permutation_vector.i>
@@ -110,6 +111,7 @@ Returns:
 #define ARMNN_DEPRECATED_ENUM  // SWIG does not support C++ attributes, need this to help generate from Deprecated.hpp.
 #define ARMNN_DEPRECATED_ENUM_MSG(message)  // SWIG does not support C++ attributes, need this to help generate from Deprecated.hpp.
 %include "armnn/Types.hpp"
+%include "ProfilingGuid.hpp"