commit 9937f9359ac4eeefc3535b66eddddd1b4f067c54
author Finn Williams <Finn.Williams@arm.com> Wed Apr 29 12:00:24 2020 +0100
committer finn.williams <finn.williams@arm.com> Thu Apr 30 10:09:59 2020 +0000
tree e10ef064afea0ab59198cec63af34f439dcd13a0
parent be7e35c5994c379e165fb1b7053301afb5d52e04

IVGCVSW-4732 Move NetworkSockets class needs to profiling/common

Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: Ie1bd73e6c1818277943e70eaf73b4d9a26da4758

Android.mk

diff --git a/Android.mk b/Android.mk
index 9ae4a99..99b1694 100644
--- a/Android.mk
+++ b/Android.mk
@@ -86,6 +86,7 @@
 
 LOCAL_SRC_FILES := \
         $(ARMNN_BACKEND_SOURCES) \
+        profiling/common/src/NetworkSockets.cpp \
         src/armnn/BackendHelper.cpp \
         src/armnn/BackendRegistry.cpp \
         src/armnn/Descriptors.cpp \
@@ -122,7 +123,6 @@
         src/armnnUtils/Permute.cpp \
         src/armnnUtils/TensorUtils.cpp \
         src/armnnUtils/VerificationHelpers.cpp \
-        src/armnnUtils/NetworkSockets.cpp \
         src/armnnUtils/Filesystem.cpp \
         src/armnnUtils/Processes.cpp \
         src/armnnUtils/Transpose.cpp \

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 586d64c..dba41a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,8 +72,6 @@
     src/armnnUtils/TensorIOUtils.hpp
     src/armnnUtils/TensorUtils.cpp
     src/armnnUtils/Transpose.cpp
-    src/armnnUtils/NetworkSockets.hpp
-    src/armnnUtils/NetworkSockets.cpp
     )
 
 add_library_ex(armnnUtils STATIC ${armnnUtils_sources})
@@ -254,6 +252,8 @@
     include/armnn/utility/StringUtils.hpp
     profiling/common/include/ProfilingException.hpp
     profiling/common/include/SocketConnectionException.hpp
+    profiling/common/include/NetworkSockets.hpp
+    profiling/common/src/NetworkSockets.cpp
     src/armnn/layers/LayerCloneBase.hpp
     src/armnn/layers/LayerWithParameters.hpp
     src/armnn/layers/ActivationLayer.hpp

profiling/common/include/NetworkSockets.hpp

diff --git a/src/armnnUtils/NetworkSockets.hpp b/profiling/common/include/NetworkSockets.hpp
similarity index 100%
rename from src/armnnUtils/NetworkSockets.hpp
rename to profiling/common/include/NetworkSockets.hpp

profiling/common/src/NetworkSockets.cpp

diff --git a/src/armnnUtils/NetworkSockets.cpp b/profiling/common/src/NetworkSockets.cpp
similarity index 97%
rename from src/armnnUtils/NetworkSockets.cpp
rename to profiling/common/src/NetworkSockets.cpp
index 3f17a1b..8ce5f19 100644
--- a/src/armnnUtils/NetworkSockets.cpp
+++ b/profiling/common/src/NetworkSockets.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include "NetworkSockets.hpp"
+#include "common/include/NetworkSockets.hpp"
 
 #if defined(__unix__)
 #include <unistd.h>

profiling/server/src/basePipeServer/BasePipeServer.cpp

diff --git a/profiling/server/src/basePipeServer/BasePipeServer.cpp b/profiling/server/src/basePipeServer/BasePipeServer.cpp
index fde5684..1d5e0b6 100644
--- a/profiling/server/src/basePipeServer/BasePipeServer.cpp
+++ b/profiling/server/src/basePipeServer/BasePipeServer.cpp
@@ -3,11 +3,12 @@
 // SPDX-License-Identifier: MIT
 //
 
+#include "BasePipeServer.hpp"
+
 #include <iostream>
 #include <boost/cast.hpp>
 #include <vector>
 #include <iomanip>
-#include "BasePipeServer.hpp"
 
 using namespace armnnUtils;
 

profiling/server/src/basePipeServer/BasePipeServer.hpp

diff --git a/profiling/server/src/basePipeServer/BasePipeServer.hpp b/profiling/server/src/basePipeServer/BasePipeServer.hpp
index a150d76..c03774e 100644
--- a/profiling/server/src/basePipeServer/BasePipeServer.hpp
+++ b/profiling/server/src/basePipeServer/BasePipeServer.hpp
@@ -5,13 +5,13 @@
 
 #pragma once
 
-//#include <NetworkSockets>
-#include <string>
-#include <atomic>
-#include "../../../../src/armnnUtils/NetworkSockets.hpp"
+#include "common/include/NetworkSockets.hpp"
 #include "../../../../src/profiling/Packet.hpp"
 #include "common/include/SocketConnectionException.hpp"
 
+#include <string>
+#include <atomic>
+
 namespace armnnProfiling
 {
 

profiling/server/src/basePipeServer/ConnectionHandler.hpp

diff --git a/profiling/server/src/basePipeServer/ConnectionHandler.hpp b/profiling/server/src/basePipeServer/ConnectionHandler.hpp
index e7317dc..661935b 100644
--- a/profiling/server/src/basePipeServer/ConnectionHandler.hpp
+++ b/profiling/server/src/basePipeServer/ConnectionHandler.hpp
@@ -5,7 +5,6 @@
 
 #pragma once
 
-#include "../../../../src/armnnUtils/NetworkSockets.hpp"
 #include "BasePipeServer.hpp"
 #include <string>
 

src/profiling/SocketProfilingConnection.hpp

diff --git a/src/profiling/SocketProfilingConnection.hpp b/src/profiling/SocketProfilingConnection.hpp
index 05c7130..259ee13 100644
--- a/src/profiling/SocketProfilingConnection.hpp
+++ b/src/profiling/SocketProfilingConnection.hpp
@@ -6,7 +6,7 @@
 #include "IProfilingConnection.hpp"
 
 #include <Runtime.hpp>
-#include <NetworkSockets.hpp>
+#include <common/include/NetworkSockets.hpp>
 
 #pragma once
 

tests/profiling/gatordmock/GatordMockService.cpp

diff --git a/tests/profiling/gatordmock/GatordMockService.cpp b/tests/profiling/gatordmock/GatordMockService.cpp
index 13f6882..53974fe 100644
--- a/tests/profiling/gatordmock/GatordMockService.cpp
+++ b/tests/profiling/gatordmock/GatordMockService.cpp
@@ -8,7 +8,7 @@
 #include <CommandHandlerRegistry.hpp>
 #include <PacketVersionResolver.hpp>
 #include <ProfilingUtils.hpp>
-#include <NetworkSockets.hpp>
+#include <common/include/NetworkSockets.hpp>
 
 #include <armnn/utility/Assert.hpp>