diff options
| author | James Conroy <james.conroy@arm.com> | 2021-04-27 17:13:27 +0100 |
|---|---|---|
| committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2021-05-06 14:40:40 +0000 |
| commit | 1f58f03d82c482626b1b4673b6c0e25da4338fb5 (patch) | |
| tree | e92451e00d459a2fc0d870694460f482aa4c77ae /src/armnn/LoadedNetwork.cpp | |
| parent | a7a12f5c3654da554ad6197beff0f0fc54681c92 (diff) | |
| download | armnn-1f58f03d82c482626b1b4673b6c0e25da4338fb5.tar.gz | |
IVGCVSW-5815 Generalise ConstCpuTensorHandle
* Generalises ConstCpuTensorHandle and inherited
classes by removing 'Cpu' from aliases.
* New renamed classes: ConstTensorHandle, TensorHandle,
ScopedTensorHandle, PassthroughTensorHandle,
ConstPassthroughTensorHandle.
Signed-off-by: James Conroy <james.conroy@arm.com>
Change-Id: I1824e0e134202735fb77051f20a7252f161dfe16
Diffstat (limited to 'src/armnn/LoadedNetwork.cpp')
| -rw-r--r-- | src/armnn/LoadedNetwork.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index 5c5a963212..46eb9883fb 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -16,7 +16,7 @@ #include <armnn/Logging.hpp> #include <armnn/utility/Assert.hpp> -#include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/TensorHandle.hpp> #include <armnn/backends/IMemoryManager.hpp> #include <backendsCommon/MemCopyWorkload.hpp> #include <backendsCommon/MemSyncWorkload.hpp> @@ -484,7 +484,7 @@ public: auto inputTensor = inputTensorPair.second; std::unique_ptr<ITensorHandle> tensorHandle = - std::make_unique<ConstPassthroughCpuTensorHandle>(inputTensor.GetInfo(),inputTensor.GetMemoryArea()); + std::make_unique<ConstPassthroughTensorHandle>(inputTensor.GetInfo(),inputTensor.GetMemoryArea()); LayerBindingId layerId = inputTensorPair.first; m_InputTensorPins.emplace_back(std::move(tensorHandle), inputTensor.GetInfo(), layerId); @@ -495,7 +495,7 @@ public: auto outputTensor = outputTensorPair.second; std::unique_ptr<ITensorHandle> tensorHandle = - std::make_unique<PassthroughCpuTensorHandle>(outputTensor.GetInfo(), outputTensor.GetMemoryArea()); + std::make_unique<PassthroughTensorHandle>(outputTensor.GetInfo(), outputTensor.GetMemoryArea()); LayerBindingId layerId = outputTensorPair.first; m_OutputTensorPins.emplace_back(std::move(tensorHandle), outputTensor.GetInfo(), layerId); @@ -864,7 +864,7 @@ void LoadedNetwork::EnqueueInput(const BindableLayer& layer, { // This assumes a CPU Tensor handle std::unique_ptr<ITensorHandle> tensorHandle = - std::make_unique<ConstPassthroughCpuTensorHandle>(inputTensor.GetInfo(), + std::make_unique<ConstPassthroughTensorHandle>(inputTensor.GetInfo(), inputTensor.GetMemoryArea()); void* mem = tensorHandle->Map(false); @@ -884,7 +884,7 @@ void LoadedNetwork::EnqueueInput(const BindableLayer& layer, else { std::unique_ptr<ITensorHandle> tensorHandle = - std::make_unique<ConstPassthroughCpuTensorHandle>(inputTensor.GetInfo(), inputTensor.GetMemoryArea()); + std::make_unique<ConstPassthroughTensorHandle>(inputTensor.GetInfo(), inputTensor.GetMemoryArea()); auto copyFunc = [](void* dst, const void* src, size_t size) { @@ -928,7 +928,7 @@ void LoadedNetwork::EnqueueOutput(const BindableLayer& layer, const Tensor& outp if (CheckFlag(importFlags, MemorySource::Malloc)) { std::unique_ptr<ITensorHandle> tensorHandle = - std::make_unique<PassthroughCpuTensorHandle>(outputTensor.GetInfo(), + std::make_unique<PassthroughTensorHandle>(outputTensor.GetInfo(), outputTensor.GetMemoryArea()); void* mem = tensorHandle->Map(false); @@ -964,7 +964,7 @@ void LoadedNetwork::EnqueueOutput(const BindableLayer& layer, const Tensor& outp }; std::unique_ptr<ITensorHandle> tensorHandle = - std::make_unique<PassthroughCpuTensorHandle>(outputTensor.GetInfo(), + std::make_unique<PassthroughTensorHandle>(outputTensor.GetInfo(), outputTensor.GetMemoryArea()); CopyTensorContentsGeneric(inputTensorHandle, tensorHandle.get(), copyFunc); |