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
diff --git a/ArmnnPreparedModel.cpp b/ArmnnPreparedModel.cpp
index ea48c0c..563abd4 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 @@
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 @@
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)
{