From b179382bcb4944d0137aa9799c3c56a2102ecda2 Mon Sep 17 00:00:00 2001 From: Francis Murtagh Date: Thu, 27 Jul 2023 15:23:00 +0100 Subject: IVGCVSW-7635 Remove deprecated code due to be removed in 23.08 (INetworkProperties) * Remove INetworkProperties::m_ImportEnabled * Remove INetworkProperties::m_ExportEnabled Change-Id: I246fef76f186c3d54cc39e2b5bc09b738458fef3 Signed-off-by: Francis Murtagh --- include/armnn/IRuntime.hpp | 11 ++--------- src/armnn/LoadedNetwork.cpp | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/include/armnn/IRuntime.hpp b/include/armnn/IRuntime.hpp index 0da6d80f93..a97e44782f 100644 --- a/include/armnn/IRuntime.hpp +++ b/include/armnn/IRuntime.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once @@ -48,9 +48,7 @@ struct INetworkProperties bool profilingEnabled = false, ProfilingDetailsMethod detailsMethod = ProfilingDetailsMethod::Undefined, bool externalMemoryManagementEnabled = false) - : m_ImportEnabled(inputSource != MemorySource::Undefined), - m_ExportEnabled(outputSource != MemorySource::Undefined), - m_AsyncEnabled(asyncEnabled), + : m_AsyncEnabled(asyncEnabled), m_ProfilingEnabled(profilingEnabled), m_OutputNetworkDetailsMethod(detailsMethod), m_InputSource(inputSource), @@ -58,11 +56,6 @@ struct INetworkProperties m_ExternalMemoryManagementEnabled(externalMemoryManagementEnabled) {} - /// Deprecated and will be removed in future release. - const bool m_ImportEnabled; - /// Deprecated and will be removed in future release. - const bool m_ExportEnabled; - const bool m_AsyncEnabled; const bool m_ProfilingEnabled; diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index 5967685ebb..91113c5ecb 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -314,7 +314,8 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr net, // to false when creating TensorHandles layer->CreateTensorHandles(m_TensorHandleFactoryRegistry, workloadFactory, - !supportsExternalManager && !m_NetworkProperties.m_ImportEnabled); + !supportsExternalManager && + (m_NetworkProperties.m_InputSource == MemorySource::Undefined)); break; } case LayerType::Constant: @@ -332,7 +333,8 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr net, { layer->CreateTensorHandles(m_TensorHandleFactoryRegistry, workloadFactory, - !supportsExternalManager && !m_NetworkProperties.m_ExportEnabled); + !supportsExternalManager && + (m_NetworkProperties.m_OutputSource == MemorySource::Undefined)); } else { @@ -1067,7 +1069,7 @@ void LoadedNetwork::EnqueueInput(const BindableLayer& layer, ITensorHandle* tens MemorySourceFlags importFlags = outputTensorHandle->GetImportFlags(); bool needMemCopy = true; - if (m_NetworkProperties.m_ImportEnabled) // Try import the input tensor + if ((m_NetworkProperties.m_InputSource != MemorySource::Undefined)) // Try import the input tensor { if(CheckFlag(importFlags, m_NetworkProperties.m_InputSource)) { @@ -1136,9 +1138,9 @@ void LoadedNetwork::EnqueueOutput(const BindableLayer& layer, ITensorHandle* ten // b) The tensor has zero padding // c) There is only one connection to the OutputSlot and it is to an OutputLayer. // d) The output pointer is allocated via malloc. (Other types will be supported in a later release) - // e) m_IsExportEnabled must be set to true + // e) m_NetworkProperties.m_OutputSource != MemorySource::Undefined bool needMemCopy = true; - if (m_NetworkProperties.m_ExportEnabled && + if (m_NetworkProperties.m_OutputSource != MemorySource::Undefined && (layer.GetInputSlots()[0].GetConnectedOutputSlot()->GetNumConnections() == 1)) { if(layer.GetInputSlots()[0].GetConnectedOutputSlot()->GetOwningLayer().GetType() != LayerType::Input) @@ -1313,7 +1315,7 @@ bool LoadedNetwork::Execute(std::unique_ptr& timelineUti void LoadedNetwork::EnqueueInput(const ConstTensor& inputTensor, ITensorHandle* inputTensorHandle) { - if (m_NetworkProperties.m_ImportEnabled) // Try import the input tensor + if (m_NetworkProperties.m_InputSource != MemorySource::Undefined) // Try import the input tensor { MemorySourceFlags importFlags = inputTensorHandle->GetImportFlags(); if (CheckFlag(importFlags, m_NetworkProperties.m_InputSource) ) @@ -1874,7 +1876,7 @@ Status LoadedNetwork::Execute(const InputTensors& inputTensors, } { ARMNN_SCOPED_PROFILING_EVENT(Compute::Undefined, "PrepareOutputs"); - if (m_NetworkProperties.m_ExportEnabled) + if (m_NetworkProperties.m_OutputSource != MemorySource::Undefined) { for (auto pair: outputTensors) { @@ -1938,7 +1940,7 @@ Status LoadedNetwork::Execute(const InputTensors& inputTensors, throw; } - if (!m_NetworkProperties.m_ExportEnabled) + if (m_NetworkProperties.m_OutputSource == MemorySource::Undefined) { for (auto pair: outputTensors) { @@ -2024,7 +2026,7 @@ std::unique_ptr LoadedNetwork::CreateWorkingMemHandle(Network // Input layers/workloads will not be executed so the descriptor is not added to workingMemDescriptors // However we will still need to manage the tensorHandle isInputLayer = true; - isMemoryManaged = !m_NetworkProperties.m_ImportEnabled; + isMemoryManaged = m_NetworkProperties.m_InputSource == MemorySource::Undefined; } else if (layer->GetType() == LayerType::Output) { @@ -2044,7 +2046,7 @@ std::unique_ptr LoadedNetwork::CreateWorkingMemHandle(Network { isConnectedToOutputLayer = true; // If Export is enabled disable memory management, so we can export, otherwise we do a copy - isMemoryManaged = !m_NetworkProperties.m_ExportEnabled; + isMemoryManaged = m_NetworkProperties.m_OutputSource == MemorySource::Undefined; } else { -- cgit v1.2.1