diff options
-rw-r--r-- | include/armnn/backends/OptimizationViews.hpp | 7 | ||||
-rw-r--r-- | src/armnnTestUtils/MockBackend.cpp | 4 | ||||
-rw-r--r-- | src/backends/backendsCommon/IBackendInternal.cpp | 1 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/TestDynamicBackend.cpp | 2 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/mockBackend/MockImportBackend.hpp | 1 | ||||
-rw-r--r-- | src/backends/cl/test/ClBackendTests.cpp | 1 | ||||
-rw-r--r-- | src/backends/neon/test/NeonBackendTests.cpp | 1 | ||||
-rw-r--r-- | src/backends/reference/test/RefBackendTests.cpp | 2 |
8 files changed, 10 insertions, 9 deletions
diff --git a/include/armnn/backends/OptimizationViews.hpp b/include/armnn/backends/OptimizationViews.hpp index 59d71ca560..6f27345ca4 100644 --- a/include/armnn/backends/OptimizationViews.hpp +++ b/include/armnn/backends/OptimizationViews.hpp @@ -10,7 +10,6 @@ #include <armnn/INetwork.hpp> #include <armnn/backends/SubgraphView.hpp> #include <vector> -#include "Graph.hpp" namespace armnn { @@ -61,9 +60,6 @@ public: bool Validate(const SubgraphView& originalSubgraph) const; - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("GetGraph is deprecated. Use GetINetwork instead.", "23.08") - Graph& GetGraph() { return m_Graph; } - INetwork* GetINetwork() { return m_INetwork.get(); } INetwork& GetINetworkRef() { return *m_INetwork; } @@ -72,9 +68,6 @@ private: Subgraphs m_FailedOptimizations; ///< Subgraphs from the original subgraph which cannot be supported Subgraphs m_UntouchedSubgraphs; ///< Subgraphs from the original subgraph which remain unmodified - /// Graph object used only as a container for any layer generated by the optimization process - Graph m_Graph; - /// INetworkPtr object used only as a container for any layer generated by the optimization process /// Also, can use to AddPrecompiledLayer to the SubstitutionPair /// Use in favour of m_Graph which depreciates in 23.08 diff --git a/src/armnnTestUtils/MockBackend.cpp b/src/armnnTestUtils/MockBackend.cpp index 7441d0c487..d95459525a 100644 --- a/src/armnnTestUtils/MockBackend.cpp +++ b/src/armnnTestUtils/MockBackend.cpp @@ -11,6 +11,8 @@ #include <backendsCommon/test/MockBackendId.hpp> #include <SubgraphViewSelector.hpp> +#include "Layer.hpp" + namespace armnn { @@ -301,4 +303,4 @@ std::unique_ptr<ICustomAllocator> MockBackend::GetDefaultAllocator() const return std::make_unique<DefaultAllocator>(); } -} // namespace armnn
\ No newline at end of file +} // namespace armnn diff --git a/src/backends/backendsCommon/IBackendInternal.cpp b/src/backends/backendsCommon/IBackendInternal.cpp index ec1313df0c..4ce41fea73 100644 --- a/src/backends/backendsCommon/IBackendInternal.cpp +++ b/src/backends/backendsCommon/IBackendInternal.cpp @@ -5,6 +5,7 @@ #include <armnn/BackendOptions.hpp> #include <armnn/backends/IBackendInternal.hpp> +#include <armnn/backends/WorkloadFactory.hpp> namespace armnn { diff --git a/src/backends/backendsCommon/test/TestDynamicBackend.cpp b/src/backends/backendsCommon/test/TestDynamicBackend.cpp index 5018b4459d..b7c9b4fd88 100644 --- a/src/backends/backendsCommon/test/TestDynamicBackend.cpp +++ b/src/backends/backendsCommon/test/TestDynamicBackend.cpp @@ -6,7 +6,7 @@ #include "TestDynamicBackend.hpp" #include <armnn/backends/IBackendInternal.hpp> - +#include <armnn/backends/WorkloadFactory.hpp> #include <armnn/utility/IgnoreUnused.hpp> constexpr const char* TestDynamicBackendId() diff --git a/src/backends/backendsCommon/test/mockBackend/MockImportBackend.hpp b/src/backends/backendsCommon/test/mockBackend/MockImportBackend.hpp index c07a97c29e..ff1d69174c 100644 --- a/src/backends/backendsCommon/test/mockBackend/MockImportBackend.hpp +++ b/src/backends/backendsCommon/test/mockBackend/MockImportBackend.hpp @@ -5,6 +5,7 @@ #pragma once #include <armnn/backends/IBackendInternal.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> namespace armnn { diff --git a/src/backends/cl/test/ClBackendTests.cpp b/src/backends/cl/test/ClBackendTests.cpp index 33f321653c..e9614a7c62 100644 --- a/src/backends/cl/test/ClBackendTests.cpp +++ b/src/backends/cl/test/ClBackendTests.cpp @@ -3,6 +3,7 @@ // SPDX-License-Identifier: MIT // +#include <backendsCommon/TensorHandleFactoryRegistry.hpp> #include <cl/ClBackend.hpp> #include <cl/ClTensorHandleFactory.hpp> #include <cl/ClImportTensorHandleFactory.hpp> diff --git a/src/backends/neon/test/NeonBackendTests.cpp b/src/backends/neon/test/NeonBackendTests.cpp index 23f58a76fc..562a45eea3 100644 --- a/src/backends/neon/test/NeonBackendTests.cpp +++ b/src/backends/neon/test/NeonBackendTests.cpp @@ -3,6 +3,7 @@ // SPDX-License-Identifier: MIT // +#include <backendsCommon/TensorHandleFactoryRegistry.hpp> #include <neon/NeonBackend.hpp> #include <neon/NeonTensorHandleFactory.hpp> diff --git a/src/backends/reference/test/RefBackendTests.cpp b/src/backends/reference/test/RefBackendTests.cpp index 5154ea4c8f..4d55adfe63 100644 --- a/src/backends/reference/test/RefBackendTests.cpp +++ b/src/backends/reference/test/RefBackendTests.cpp @@ -3,9 +3,11 @@ // SPDX-License-Identifier: MIT // +#include <backendsCommon/TensorHandleFactoryRegistry.hpp> #include <reference/RefBackend.hpp> #include <reference/RefTensorHandleFactory.hpp> +#include <armnn/backends/WorkloadFactory.hpp> #include <doctest/doctest.h> using namespace armnn; |