diff options
| author | David Monahan <david.monahan@arm.com> | 2022-02-02 12:17:46 +0000 |
|---|---|---|
| committer | David Monahan <david.monahan@arm.com> | 2022-02-02 12:17:59 +0000 |
| commit | 8069603dc44b7673b356f66517cd8b25af8080f0 (patch) | |
| tree | b78b54221f2b80bf59c29d79dc78ff7f3af7ca4c /ArmnnPreparedModel.cpp | |
| parent | 20c6225496526143489312e8afb45c801c465d8d (diff) | |
| download | android-nn-driver-8069603dc44b7673b356f66517cd8b25af8080f0.tar.gz | |
Revert "IVGCVSW-6700 Enable import aligned host memory in android-nn-driver"
This reverts commit 8509422e1e7d629f88d6a5e4e4bded8a682f435b.
Reason for revert: Reverting as this might be the cause of several segfaults on CI
Change-Id: I902b4ddaec23dc46a2459f8512ec458e1aa722f3
Diffstat (limited to 'ArmnnPreparedModel.cpp')
| -rw-r--r-- | ArmnnPreparedModel.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/ArmnnPreparedModel.cpp b/ArmnnPreparedModel.cpp index ea48c0cc..563abd44 100644 --- a/ArmnnPreparedModel.cpp +++ b/ArmnnPreparedModel.cpp @@ -8,8 +8,6 @@ #include "ArmnnPreparedModel.hpp" #include "Utils.hpp" -#include <armnn/Types.hpp> - #include <log/log.h> #include <OperationsUtils.h> #include <ValidateHal.h> @@ -307,12 +305,7 @@ void ArmnnPreparedModel<HalVersion>::ExecuteGraph( else { ALOGW("ArmnnPreparedModel::ExecuteGraph m_AsyncModelExecutionEnabled false"); - std::vector<armnn::ImportedInputId> importedInputIds = - m_Runtime->ImportInputs(m_NetworkId, inputTensors, armnn::MemorySource::Malloc); - std::vector<armnn::ImportedOutputId> importedOutputIds = - m_Runtime->ImportOutputs(m_NetworkId, outputTensors, armnn::MemorySource::Malloc); - status = m_Runtime->EnqueueWorkload(m_NetworkId, inputTensors, outputTensors, - importedInputIds, importedOutputIds); + status = m_Runtime->EnqueueWorkload(m_NetworkId, inputTensors, outputTensors); } if (status != armnn::Status::Success) @@ -393,12 +386,7 @@ bool ArmnnPreparedModel<HalVersion>::ExecuteWithDummyInputs() else { ALOGW("ArmnnPreparedModel::ExecuteGraph m_AsyncModelExecutionEnabled false"); - std::vector<armnn::ImportedInputId> importedInputIds = - m_Runtime->ImportInputs(m_NetworkId, inputTensors, armnn::MemorySource::Malloc); - std::vector<armnn::ImportedOutputId> importedOutputIds = - m_Runtime->ImportOutputs(m_NetworkId, outputTensors, armnn::MemorySource::Malloc); - status = m_Runtime->EnqueueWorkload(m_NetworkId, inputTensors, outputTensors, - importedInputIds, importedOutputIds); + status = m_Runtime->EnqueueWorkload(m_NetworkId, inputTensors, outputTensors); } if (status != armnn::Status::Success) { |