diff options
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | profiling/common/include/NetworkSockets.hpp (renamed from src/armnnUtils/NetworkSockets.hpp) | 0 | ||||
-rw-r--r-- | profiling/common/src/NetworkSockets.cpp (renamed from src/armnnUtils/NetworkSockets.cpp) | 2 | ||||
-rw-r--r-- | profiling/server/src/basePipeServer/BasePipeServer.cpp | 3 | ||||
-rw-r--r-- | profiling/server/src/basePipeServer/BasePipeServer.hpp | 8 | ||||
-rw-r--r-- | profiling/server/src/basePipeServer/ConnectionHandler.hpp | 1 | ||||
-rw-r--r-- | src/profiling/SocketProfilingConnection.hpp | 2 | ||||
-rw-r--r-- | tests/profiling/gatordmock/GatordMockService.cpp | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk index 9ae4a993b9..99b169471e 100644 --- a/Android.mk +++ b/Android.mk @@ -86,6 +86,7 @@ LOCAL_C_INCLUDES := \ 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 @@ LOCAL_SRC_FILES := \ 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 \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 586d64c89c..dba41a3f55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,8 +72,6 @@ list(APPEND armnnUtils_sources 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 @@ list(APPEND armnn_sources 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 diff --git a/src/armnnUtils/NetworkSockets.hpp b/profiling/common/include/NetworkSockets.hpp index b9e58aac1d..b9e58aac1d 100644 --- a/src/armnnUtils/NetworkSockets.hpp +++ b/profiling/common/include/NetworkSockets.hpp diff --git a/src/armnnUtils/NetworkSockets.cpp b/profiling/common/src/NetworkSockets.cpp index 3f17a1bcb3..8ce5f197c1 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> diff --git a/profiling/server/src/basePipeServer/BasePipeServer.cpp b/profiling/server/src/basePipeServer/BasePipeServer.cpp index fde5684160..1d5e0b6414 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; diff --git a/profiling/server/src/basePipeServer/BasePipeServer.hpp b/profiling/server/src/basePipeServer/BasePipeServer.hpp index a150d76278..c03774e452 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 { diff --git a/profiling/server/src/basePipeServer/ConnectionHandler.hpp b/profiling/server/src/basePipeServer/ConnectionHandler.hpp index e7317dc355..661935b885 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> diff --git a/src/profiling/SocketProfilingConnection.hpp b/src/profiling/SocketProfilingConnection.hpp index 05c7130de7..259ee131f1 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 diff --git a/tests/profiling/gatordmock/GatordMockService.cpp b/tests/profiling/gatordmock/GatordMockService.cpp index 13f688225b..53974fec3f 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> |