diff options
Diffstat (limited to 'src/armnn')
-rw-r--r-- | src/armnn/LoadedNetwork.cpp | 14 | ||||
-rw-r--r-- | src/armnn/test/RuntimeTests.cpp | 15 |
2 files changed, 18 insertions, 11 deletions
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index 46c1ce58aa..a720769873 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -6,22 +6,26 @@ #include "LoadedNetwork.hpp" #include "Layer.hpp" #include "Graph.hpp" -#include <Processes.hpp> #include "Profiling.hpp" #include "HeapProfiling.hpp" #include "WorkingMemHandle.hpp" +#include <armnn/BackendHelper.hpp> #include <armnn/BackendRegistry.hpp> #include <armnn/Logging.hpp> -#include <armnn/utility/Assert.hpp> #include <armnn/backends/TensorHandle.hpp> #include <armnn/backends/IMemoryManager.hpp> #include <armnn/backends/MemCopyWorkload.hpp> -#include <backendsCommon/MemSyncWorkload.hpp> -#include <armnn/BackendHelper.hpp> + #include <armnn/profiling/ArmNNProfiling.hpp> +#include <armnn/utility/Assert.hpp> + +#include <backendsCommon/MemSyncWorkload.hpp> + +#include <common/include/Processes.hpp> + #include <fmt/format.h> namespace armnn @@ -262,7 +266,7 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr<IOptimizedNetwork> net, // Mark the network with a start of life event timelineUtils->RecordEvent(networkGuid, LabelsAndEventClasses::ARMNN_PROFILING_SOL_EVENT_CLASS); // and with the process ID - int processID = armnnUtils::Processes::GetCurrentId(); + int processID = arm::pipe::GetCurrentId(); std::stringstream ss; ss << processID; timelineUtils->MarkEntityWithLabel(networkGuid, ss.str(), LabelsAndEventClasses::PROCESS_ID_GUID); diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp index 89a87197bd..fc16dbbad9 100644 --- a/src/armnn/test/RuntimeTests.cpp +++ b/src/armnn/test/RuntimeTests.cpp @@ -3,17 +3,20 @@ // SPDX-License-Identifier: MIT // -#include <armnn/Descriptors.hpp> -#include <armnn/IRuntime.hpp> -#include <armnn/INetwork.hpp> -#include <armnn/profiling/ArmNNProfiling.hpp> #include <ArmNNProfilingServiceInitialiser.hpp> #include <ProfilingOptionsConverter.hpp> -#include <Processes.hpp> #include <Runtime.hpp> + +#include <armnn/Descriptors.hpp> +#include <armnn/IRuntime.hpp> +#include <armnn/INetwork.hpp> #include <armnn/TypesUtils.hpp> +#include <armnn/profiling/ArmNNProfiling.hpp> + #include <common/include/LabelsAndEventClasses.hpp> +#include <common/include/Processes.hpp> + #include <test/ProfilingTestUtils.hpp> #include <HeapProfiling.hpp> @@ -733,7 +736,7 @@ TEST_CASE("ProfilingEnableCpuRef") offset); // Process ID Label - int processID = armnnUtils::Processes::GetCurrentId(); + int processID = arm::pipe::GetCurrentId(); std::stringstream ss; ss << processID; std::string processIdLabel = ss.str(); |