diff options
Diffstat (limited to 'src/armnn/layers')
-rw-r--r-- | src/armnn/layers/ConcatLayer.cpp | 13 | ||||
-rw-r--r-- | src/armnn/layers/ConcatLayer.hpp | 3 | ||||
-rw-r--r-- | src/armnn/layers/OutputLayer.hpp | 5 | ||||
-rw-r--r-- | src/armnn/layers/SplitterLayer.cpp | 13 | ||||
-rw-r--r-- | src/armnn/layers/SplitterLayer.hpp | 3 |
5 files changed, 8 insertions, 29 deletions
diff --git a/src/armnn/layers/ConcatLayer.cpp b/src/armnn/layers/ConcatLayer.cpp index 3a20e1b3f6..238fdb66d9 100644 --- a/src/armnn/layers/ConcatLayer.cpp +++ b/src/armnn/layers/ConcatLayer.cpp @@ -179,8 +179,7 @@ void ConcatLayer::CreateTensors(const TensorHandleFactoryRegistry& registry, void ConcatLayer::CreateTensorHandles(const TensorHandleFactoryRegistry& registry, const IWorkloadFactory& workloadFactory, - const bool isMemoryManaged, - MemorySource memSource) + const bool isMemoryManaged) { OutputSlot& slot = GetOutputSlot(0); ITensorHandleFactory::FactoryId factoryId = slot.GetTensorHandleFactoryId(); @@ -191,15 +190,7 @@ void ConcatLayer::CreateTensorHandles(const TensorHandleFactoryRegistry& registr } else { - ITensorHandleFactory* handleFactory; - if (memSource == MemorySource::Undefined) - { - handleFactory = registry.GetFactory(factoryId); - } - else - { - handleFactory = registry.GetFactory(factoryId, memSource); - } + ITensorHandleFactory* handleFactory = registry.GetFactory(factoryId); ARMNN_ASSERT(handleFactory); CreateTensors(registry, *handleFactory, isMemoryManaged); } diff --git a/src/armnn/layers/ConcatLayer.hpp b/src/armnn/layers/ConcatLayer.hpp index 6a43318382..4315d66436 100644 --- a/src/armnn/layers/ConcatLayer.hpp +++ b/src/armnn/layers/ConcatLayer.hpp @@ -27,8 +27,7 @@ public: /// @param [in] MemorySource Determine the source of memory e.g Malloc virtual void CreateTensorHandles(const TensorHandleFactoryRegistry& registry, const IWorkloadFactory& factory, - const bool IsMemoryManaged = true, - MemorySource memSource = MemorySource::Undefined) override; + const bool IsMemoryManaged = true) override; /// Creates a dynamically-allocated copy of this layer. /// @param [in] graph The graph into which this layer is being cloned. diff --git a/src/armnn/layers/OutputLayer.hpp b/src/armnn/layers/OutputLayer.hpp index fc6a8aa6b2..408a28a6f3 100644 --- a/src/armnn/layers/OutputLayer.hpp +++ b/src/armnn/layers/OutputLayer.hpp @@ -26,10 +26,9 @@ public: /// @param [in] IsMemoryManaged Determine whether or not to assign a memory manager during creation virtual void CreateTensorHandles(const TensorHandleFactoryRegistry& registry, const IWorkloadFactory& factory, - const bool isMemoryManaged = true, - MemorySource memSource = MemorySource::Undefined) override + const bool isMemoryManaged = true) override { - IgnoreUnused(registry, factory, isMemoryManaged, memSource); + IgnoreUnused(registry, factory, isMemoryManaged); } /// Creates a dynamically-allocated copy of this layer. diff --git a/src/armnn/layers/SplitterLayer.cpp b/src/armnn/layers/SplitterLayer.cpp index adef9aa1a2..5e6622e13a 100644 --- a/src/armnn/layers/SplitterLayer.cpp +++ b/src/armnn/layers/SplitterLayer.cpp @@ -177,8 +177,7 @@ void SplitterLayer::CreateTensors(const TensorHandleFactoryRegistry& registry, void SplitterLayer::CreateTensorHandles(const TensorHandleFactoryRegistry& registry, const IWorkloadFactory& workloadFactory, - const bool isMemoryManaged, - MemorySource memSource) + const bool isMemoryManaged) { OutputSlot& slot = GetOutputSlot(0); ITensorHandleFactory::FactoryId factoryId = slot.GetTensorHandleFactoryId(); @@ -189,15 +188,7 @@ void SplitterLayer::CreateTensorHandles(const TensorHandleFactoryRegistry& regis } else { - ITensorHandleFactory* handleFactory; - if (memSource == MemorySource::Undefined) - { - handleFactory = registry.GetFactory(factoryId); - } - else - { - handleFactory = registry.GetFactory(factoryId, memSource); - } + ITensorHandleFactory* handleFactory = registry.GetFactory(factoryId); ARMNN_ASSERT(handleFactory); CreateTensors(registry, *handleFactory, isMemoryManaged); } diff --git a/src/armnn/layers/SplitterLayer.hpp b/src/armnn/layers/SplitterLayer.hpp index 075b136da9..f90696b1ad 100644 --- a/src/armnn/layers/SplitterLayer.hpp +++ b/src/armnn/layers/SplitterLayer.hpp @@ -26,8 +26,7 @@ public: /// @param [in] IsMemoryManaged Determine whether or not to assign a memory manager during creation virtual void CreateTensorHandles(const TensorHandleFactoryRegistry& registry, const IWorkloadFactory& factory, - const bool IsMemoryManaged = true, - MemorySource memSource = MemorySource::Undefined) override; + const bool IsMemoryManaged = true) override; /// Creates a dynamically-allocated copy of this layer. /// @param [in] graph The graph into which this layer is being cloned. |