diff options
author | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2022-01-28 17:59:18 +0000 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2022-01-31 12:53:51 +0000 |
commit | e2af6f4322a1e2b8b3c391fb721a6a80c281477f (patch) | |
tree | b0dd53289e27304a6d724821459cb0f4b6343a39 /src/armnn/LoadedNetwork.hpp | |
parent | fd313fef775ed210f8dab84452ea382a0b4164b0 (diff) | |
download | armnn-e2af6f4322a1e2b8b3c391fb721a6a80c281477f.tar.gz |
IVGCVSW-6552 Add support of aligned host memory
* Add AllocatedData functions to OutputHandler
* Enable import aligned memory in ImportInputs
* Enable import aligned memory in ImportOutputs
* Allow to import input and output if the memory is aligned
* Implement Reconfigure function on ClConvolution2dWorkload
* End-to-end test on Ref and Cl to ensure that input and output memory
are imported when aligned
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I9e5e4c26d1ac2f1d806803ade5f64c6479c51718
Diffstat (limited to 'src/armnn/LoadedNetwork.hpp')
-rw-r--r-- | src/armnn/LoadedNetwork.hpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/armnn/LoadedNetwork.hpp b/src/armnn/LoadedNetwork.hpp index 9de6307938..f637dec8eb 100644 --- a/src/armnn/LoadedNetwork.hpp +++ b/src/armnn/LoadedNetwork.hpp @@ -55,14 +55,18 @@ public: TensorInfo GetInputTensorInfo(LayerBindingId layerId) const; TensorInfo GetOutputTensorInfo(LayerBindingId layerId) const; - std::vector<ImportedInputId> ImportInputs(const InputTensors& inputTensors); - std::vector<ImportedOutputId> ImportOutputs(const OutputTensors& outputTensors); + std::vector<ImportedInputId> ImportInputs(const InputTensors& inputTensors, + MemorySource forceImportMemorySource = MemorySource::Undefined); + std::vector<ImportedOutputId> ImportOutputs(const OutputTensors& outputTensors, + MemorySource forceImportMemorySource = MemorySource::Undefined); void ClearImportedInputs(const std::vector<ImportedInputId> inputIds); void ClearImportedOutputs(const std::vector<ImportedOutputId> outputIds); /// Single thread execution of the loaded network - Status EnqueueWorkload(const InputTensors& inputTensors, const OutputTensors& outputTensors); + Status EnqueueWorkload(const InputTensors& inputTensors, const OutputTensors& outputTensors, + std::vector<ImportedInputId> preImportedInputIds = {}, + std::vector<ImportedOutputId> preImportedOutputIds = {}); /// Thread safe execution of the loaded network Status Execute(const InputTensors& inputTensors, @@ -200,8 +204,9 @@ private: // A set of vectors to record the workload queue indexes and their corresponding Input/Output Slot indexes // which are connected to Inputs and Outputs for the network. - std::vector<std::pair<unsigned int, unsigned int>> m_InputWorkloadSlotPairs; - std::vector<std::pair<unsigned int, unsigned int>> m_OutputWorkloadSlotPairs; + std::unordered_map<LayerBindingId, std::pair<unsigned int, unsigned int>> m_InputWorkloadSlotPairs; + std::unordered_map<LayerBindingId, std::pair<unsigned int, unsigned int>> m_OutputWorkloadSlotPairs; + }; } |