aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ArmnnPreparedModel.cpp6
-rw-r--r--ArmnnPreparedModel_1_2.cpp4
-rw-r--r--ArmnnPreparedModel_1_3.cpp4
-rw-r--r--README.md9
4 files changed, 19 insertions, 4 deletions
diff --git a/ArmnnPreparedModel.cpp b/ArmnnPreparedModel.cpp
index d87f9f82..f0a09bf5 100644
--- a/ArmnnPreparedModel.cpp
+++ b/ArmnnPreparedModel.cpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2017-2024 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
@@ -329,8 +329,10 @@ void ArmnnPreparedModel<HalVersion>::ExecuteGraph(
armnn::Status status;
if (m_AsyncModelExecutionEnabled)
{
+ARMNN_NO_DEPRECATE_WARN_BEGIN
ALOGW("ArmnnPreparedModel::ExecuteGraph m_AsyncModelExecutionEnabled true");
status = m_Runtime->Execute(*m_WorkingMemHandle, inputTensors, outputTensors);
+ARMNN_NO_DEPRECATE_WARN_END
}
else
{
@@ -427,8 +429,10 @@ bool ArmnnPreparedModel<HalVersion>::ExecuteWithDummyInputs()
armnn::Status status;
if (m_AsyncModelExecutionEnabled)
{
+ARMNN_NO_DEPRECATE_WARN_BEGIN
ALOGW("ArmnnPreparedModel::ExecuteGraph m_AsyncModelExecutionEnabled true");
status = m_Runtime->Execute(*m_WorkingMemHandle, inputTensors, outputTensors);
+ARMNN_NO_DEPRECATE_WARN_END
}
else
{
diff --git a/ArmnnPreparedModel_1_2.cpp b/ArmnnPreparedModel_1_2.cpp
index a401b30e..43b127b6 100644
--- a/ArmnnPreparedModel_1_2.cpp
+++ b/ArmnnPreparedModel_1_2.cpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2017-2024 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
@@ -556,8 +556,10 @@ bool ArmnnPreparedModel_1_2<HalVersion>::ExecuteGraph(
armnn::Status status;
if (m_AsyncModelExecutionEnabled)
{
+ARMNN_NO_DEPRECATE_WARN_BEGIN
ALOGW("ArmnnPreparedModel_1_2::ExecuteGraph m_AsyncModelExecutionEnabled true");
status = m_Runtime->Execute(*m_WorkingMemHandle, inputTensors, outputTensors);
+ARMNN_NO_DEPRECATE_WARN_END
}
else
{
diff --git a/ArmnnPreparedModel_1_3.cpp b/ArmnnPreparedModel_1_3.cpp
index 1827d900..9ab4cdc0 100644
--- a/ArmnnPreparedModel_1_3.cpp
+++ b/ArmnnPreparedModel_1_3.cpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2020-2023 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2020-2024 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
// Note: the ArmnnFencedExecutionCallback and code snippet in the executeFenced() function
@@ -864,8 +864,10 @@ Return <V1_3::ErrorStatus> ArmnnPreparedModel_1_3<HalVersion>::ExecuteGraph(
armnn::Status status;
if (m_AsyncModelExecutionEnabled)
{
+ARMNN_NO_DEPRECATE_WARN_BEGIN
ALOGW("ArmnnPreparedModel_1_3::ExecuteGraph m_AsyncModelExecutionEnabled true");
status = m_Runtime->Execute(*m_WorkingMemHandle, inputTensors, outputTensors);
+ARMNN_NO_DEPRECATE_WARN_BEGIN
}
else
{
diff --git a/README.md b/README.md
index 9d5bfdd3..9637b3df 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,13 @@
# Arm NN Android Neural Networks driver
-This directory contains the Arm NN driver for the Android Neural Networks API, implementing the android.hardware.neuralnetworks@1.0, android.hardware.neuralnetworks@1.1, android.hardware.neuralnetworks@1.2 and android.hardware.neuralnetworks@1.3 HALs.
+This directory contains the Arm NN driver for the Android Neural Networks API, implementing the HIDL based android.hardware.neuralnetworks@1.0, android.hardware.neuralnetworks@1.1, android.hardware.neuralnetworks@1.2 and android.hardware.neuralnetworks@1.3 HALs.
+
+For Android 11 and lower, the NNAPI uses HIDL based HALs.
+
+For Android 12 and Android 13, the NNAPI HAL revision uses AIDL instead of HIDL, and HIDL is deprecated.
+
+For Android 14 the compatibility matrix no longer includes support for HIDL HAL revisions:
+https://android.googlesource.com/platform/hardware/interfaces/+/refs/heads/android14-qpr1-release/compatibility_matrices/compatibility_matrix.8.xml
For more information about supported operations and configurations, see [NnapiSupport.txt](NnapiSupport.txt)