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)
{
diff --git a/ArmnnPreparedModel_1_2.cpp b/ArmnnPreparedModel_1_2.cpp
index 08790d3..29055a7 100644
--- a/ArmnnPreparedModel_1_2.cpp
+++ b/ArmnnPreparedModel_1_2.cpp
@@ -9,8 +9,6 @@
#include "Utils.hpp"
-#include <armnn/Types.hpp>
-
#include <log/log.h>
#include <OperationsUtils.h>
#include <ExecutionBurstServer.h>
@@ -530,12 +528,7 @@
else
{
ALOGW("ArmnnPreparedModel_1_2::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 (cb.ctx.measureTimings == V1_2::MeasureTiming::YES)
diff --git a/ArmnnPreparedModel_1_3.cpp b/ArmnnPreparedModel_1_3.cpp
index 236c4f2..abd135e 100644
--- a/ArmnnPreparedModel_1_3.cpp
+++ b/ArmnnPreparedModel_1_3.cpp
@@ -12,8 +12,6 @@
#include "ArmnnPreparedModel_1_3.hpp"
#include "Utils.hpp"
-#include <armnn/Types.hpp>
-
#include <Utils.h>
#include <android/sync.h>
#include <log/log.h>
@@ -823,12 +821,7 @@
else
{
ALOGW("ArmnnPreparedModel_1_3::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 (cb.ctx.measureTimings == V1_2::MeasureTiming::YES)