From f63da3f57fd6ad79b4052b5cb6d5b2ae1224ccc3 Mon Sep 17 00:00:00 2001 From: Nikhil Raj Date: Thu, 16 Nov 2023 15:56:07 +0000 Subject: Remove Android 10 testing warning from readme and update buildtool * Removes warning we had given to users last release about Android 10 (Q) testing * Reverts the patch where we were checking out main branch of Arm NN instead of latest release branch in Buildtool * Updated Android API level in the bianry table in readme Signed-off-by: Nikhil Raj Change-Id: I1e497b7d0ecf8fa7d9dd7262ca740052c0db444e --- README.md | 18 ++++++++---------- build-tool/scripts/build-armnn.sh | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 0f1562b8a4..ea1a14b94b 100644 --- a/README.md +++ b/README.md @@ -59,16 +59,14 @@ Arm NN from scratch is the ability to **exactly choose which components to build ## Pre-Built Binaries -| Operating System | Architecture-specific Release Archive (Download) | -|-----------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Android (AAR) | [![](https://img.shields.io/badge/download-android--aar-orange)](https://github.com/ARM-software/armnn/releases/download/v23.08/armnn_delegate_jni-23.08.aar) | -| Android 10 "Q/Quince Tart" (API level 29) | [![](https://img.shields.io/badge/download-arm64--v8.2-a-blue)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-android-29-arm64-v8.2-a.tar.gz) [![](https://img.shields.io/badge/download-arm64--v8a-red)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-android-29-arm64-v8a.tar.gz) | -| Android 11 "R/Red Velvet Cake" (API level 30) | [![](https://img.shields.io/badge/download-arm64--v8.2-a-blue)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-android-30-arm64-v8.2-a.tar.gz) [![](https://img.shields.io/badge/download-arm64--v8a-red)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-android-30-arm64-v8a.tar.gz) | -| Android 12 "S/Snow Cone" (API level 31) | [![](https://img.shields.io/badge/download-arm64--v8.2-a-blue)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-android-31-arm64-v8.2-a.tar.gz) [![](https://img.shields.io/badge/download-arm64--v8a-red)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-android-31-arm64-v8a.tar.gz) [![](https://img.shields.io/badge/download-arm64--v8.6-a-purple)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-android-31-arm64-v8.6-a.tar.gz) [![](https://img.shields.io/badge/download-arm64--v8.6-a-sve-grey)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-android-31-arm64-v8.6-a-sve.tar.gz) [![](https://img.shields.io/badge/download-arm64--v8.6-a-sve2-grey)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-android-31-arm64-v8.6-a-sve2.tar.gz) | -| Android 13 "T/Tiramisu" (API level 32) | [![](https://img.shields.io/badge/download-arm64--v8.2-a-blue)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-android-32-arm64-v8.2-a.tar.gz) [![](https://img.shields.io/badge/download-arm64--v8a-red)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-android-32-arm64-v8a.tar.gz) | -| Linux | [![](https://img.shields.io/badge/download-aarch64-green)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-linux-aarch64.tar.gz) [![](https://img.shields.io/badge/download-x86__64-yellow)](https://github.com/ARM-software/armnn/releases/download/v23.08/ArmNN-linux-x86_64.tar.gz) | - -**Note: Android 10 testing will be dropped from next release onwards.** +| Operating System | Architecture-specific Release Archive (Download) | +|-----------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Android (AAR) | [![](https://img.shields.io/badge/download-android--aar-orange)](https://github.com/ARM-software/armnn/releases/download/v23.11/armnn_delegate_jni-23.11.aar) | +| Android 11 "R/Red Velvet Cake" (API level 30) | [![](https://img.shields.io/badge/download-arm64--v8.2-a-orange)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-android-30-arm64-v8.2-a.tar.gz) [![](https://img.shields.io/badge/download-arm64--v8a-orange)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-android-30-arm64-v8a.tar.gz) | +| Android 12 "S/Snow Cone" (API level 31) | [![](https://img.shields.io/badge/download-arm64--v8.2-a-yellow)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-android-31-arm64-v8.2-a.tar.gz) [![](https://img.shields.io/badge/download-arm64-v8a-yellow)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-android-31-arm64-v8a.tar.gz) [![](https://img.shields.io/badge/download-arm64-v8.6-a-yellow)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-android-31-arm64-v8.6-a.tar.gz) [![](https://img.shields.io/badge/download-arm64-v8.6-a-sve-yellow)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-android-31-arm64-v8.6-a-sve.tar.gz) [![](https://img.shields.io/badge/download-arm64-v8.6-a-sve2-yellow)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-android-31-arm64-v8.6-a-sve2.tar.gz) | +| Android 13 "T/Tiramisu" (API level 33) | [![](https://img.shields.io/badge/download-arm64-v8.2-a-red)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-android-32-arm64-v8.2-a.tar.gz) [![](https://img.shields.io/badge/download-arm64-v8.6-a-red)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-android-32-arm64-v8.6-a.tar.gz) [![](https://img.shields.io/badge/download-arm64-v8.6-a-sve-red)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-android-32-arm64-v8.6-a-sve.tar.gz) [![](https://img.shields.io/badge/download-arm64-v8.6-a-sve2-red)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-android-32-arm64-v8.6-a-sve2.tar.gz) | +| Linux | [![](https://img.shields.io/badge/download-aarch64-green)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-linux-aarch64.tar.gz) [![](https://img.shields.io/badge/download-x86__64-green)](https://github.com/ARM-software/armnn/releases/download/v23.11/ArmNN-linux-x86_64.tar.gz) | + ## Software Overview The Arm NN SDK supports ML models in **TensorFlow Lite** (TF Lite) and **ONNX** formats. diff --git a/build-tool/scripts/build-armnn.sh b/build-tool/scripts/build-armnn.sh index 0075bbad31..147aedfd55 100755 --- a/build-tool/scripts/build-armnn.sh +++ b/build-tool/scripts/build-armnn.sh @@ -190,8 +190,8 @@ download_armnn() rm -rf "$ARMNN_SRC" - # Main branch of Arm NN is checked out - git clone --branch main https://github.com/ARM-software/armnn.git armnn + # Latest release branch of Arm NN is checked out by default + git clone https://github.com/ARM-software/armnn.git armnn cd "$ARMNN_SRC" local armnn_branch="$(git rev-parse --abbrev-ref HEAD)" -- cgit v1.2.1