diff options
author | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-11-18 15:34:23 +0000 |
---|---|---|
committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-11-19 11:40:33 +0000 |
commit | 85ad78c1d44b749ad7a1d09c26c3d7f7f35a3f3d (patch) | |
tree | f0979eec4b3a558a79ebef07f0b5a62d31f9f0b7 /src/profiling | |
parent | 036f02d859c307f514c77e91665fbff05048ba11 (diff) | |
download | armnn-85ad78c1d44b749ad7a1d09c26c3d7f7f35a3f3d.tar.gz |
IVGCVSW-4068 Add Guid to Workload
* Add Guid to Workload
* Remove circular dependency
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Signed-off-by: janeil01 <jan.eilers@arm.com>
Change-Id: I15342fa7481c6bdc050e057dce2d74bba07fe2dd
Diffstat (limited to 'src/profiling')
-rw-r--r-- | src/profiling/IProfilingConnectionFactory.hpp | 4 | ||||
-rw-r--r-- | src/profiling/ProfilingConnectionFactory.hpp | 4 | ||||
-rw-r--r-- | src/profiling/ProfilingService.hpp | 2 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTests.hpp | 1 | ||||
-rw-r--r-- | src/profiling/test/SendTimelinePacketTests.cpp | 4 |
5 files changed, 6 insertions, 9 deletions
diff --git a/src/profiling/IProfilingConnectionFactory.hpp b/src/profiling/IProfilingConnectionFactory.hpp index 173421092e..c2bbc70d8b 100644 --- a/src/profiling/IProfilingConnectionFactory.hpp +++ b/src/profiling/IProfilingConnectionFactory.hpp @@ -7,7 +7,7 @@ #include "IProfilingConnection.hpp" -#include <Runtime.hpp> +#include <armnn/IRuntime.hpp> #include <memory> @@ -20,7 +20,7 @@ namespace profiling class IProfilingConnectionFactory { public: - using ExternalProfilingOptions = Runtime::CreationOptions::ExternalProfilingOptions; + using ExternalProfilingOptions = IRuntime::CreationOptions::ExternalProfilingOptions; using IProfilingConnectionPtr = std::unique_ptr<IProfilingConnection>; virtual ~IProfilingConnectionFactory() {} diff --git a/src/profiling/ProfilingConnectionFactory.hpp b/src/profiling/ProfilingConnectionFactory.hpp index b3a1658548..c6d4c6faf0 100644 --- a/src/profiling/ProfilingConnectionFactory.hpp +++ b/src/profiling/ProfilingConnectionFactory.hpp @@ -7,10 +7,6 @@ #include "IProfilingConnectionFactory.hpp" -#include <Runtime.hpp> - -#include <memory> - namespace armnn { diff --git a/src/profiling/ProfilingService.hpp b/src/profiling/ProfilingService.hpp index d4ff9085f5..ee199d55ab 100644 --- a/src/profiling/ProfilingService.hpp +++ b/src/profiling/ProfilingService.hpp @@ -30,7 +30,7 @@ namespace profiling class ProfilingService : public IReadWriteCounterValues, public IProfilingGuidGenerator { public: - using ExternalProfilingOptions = Runtime::CreationOptions::ExternalProfilingOptions; + using ExternalProfilingOptions = IRuntime::CreationOptions::ExternalProfilingOptions; using IProfilingConnectionFactoryPtr = std::unique_ptr<IProfilingConnectionFactory>; using IProfilingConnectionPtr = std::unique_ptr<IProfilingConnection>; using CounterIndices = std::vector<std::atomic<uint32_t>*>; diff --git a/src/profiling/test/ProfilingTests.hpp b/src/profiling/test/ProfilingTests.hpp index 21c98723be..86b5c315e2 100644 --- a/src/profiling/test/ProfilingTests.hpp +++ b/src/profiling/test/ProfilingTests.hpp @@ -12,6 +12,7 @@ #include <Logging.hpp> #include <ProfilingService.hpp> +#include <boost/polymorphic_cast.hpp> #include <boost/test/unit_test.hpp> #include <chrono> diff --git a/src/profiling/test/SendTimelinePacketTests.cpp b/src/profiling/test/SendTimelinePacketTests.cpp index 771e117955..8071eece7d 100644 --- a/src/profiling/test/SendTimelinePacketTests.cpp +++ b/src/profiling/test/SendTimelinePacketTests.cpp @@ -410,7 +410,7 @@ BOOST_AUTO_TEST_CASE(SendTimelinePacketTests3) BOOST_AUTO_TEST_CASE(GetGuidsFromProfilingService) { - armnn::Runtime::CreationOptions::ExternalProfilingOptions options; + armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; options.m_EnableProfiling = true; ProfilingService& profilingService = ProfilingService::Instance(); profilingService.ResetExternalProfilingOptions(options, true); @@ -429,7 +429,7 @@ BOOST_AUTO_TEST_CASE(GetGuidsFromProfilingService) BOOST_AUTO_TEST_CASE(GetTimelinePackerWriterFromProfilingService) { - armnn::Runtime::CreationOptions::ExternalProfilingOptions options; + armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; options.m_EnableProfiling = true; ProfilingService& profilingService = ProfilingService::Instance(); profilingService.ResetExternalProfilingOptions(options, true); |