From 807509a974561dfadb0f6b74540b3adcded6247c Mon Sep 17 00:00:00 2001 From: Nikhil Raj Date: Tue, 9 Aug 2022 15:16:46 +0100 Subject: Fixing documents for 22.08 * Fixed broken links * Updated link to bazel guide * Fixed versioning issues in packaging doc * Updated paths to binary files Signed-off-by: Nikhil Raj Change-Id: I6120bb2dd56d55a994cd12d99bed054ce4d7c058 --- InstallationViaAptRepository.md | 16 +++++++++------- README.md | 10 +++++----- delegate/BuildGuideNative.md | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/InstallationViaAptRepository.md b/InstallationViaAptRepository.md index dbdd0c2028..3fa36f62a7 100644 --- a/InstallationViaAptRepository.md +++ b/InstallationViaAptRepository.md @@ -3,11 +3,11 @@ * [Introduction](#introduction) * [Add the Ubuntu Launchpad PPA to your system](#add-the-ubuntu-launchpad-ppa-to-your-system) * [Outline of available packages](#outline-of-available-packages) - + [x86_64](#x86-64) + + [x86_64](#x86_64) + [arm64](#arm64) + [armhf](#armhf) -* [Check latest version of packages](#check-latest-version-of-packages) * [Install desired combination of packages](#install-desired-combination-of-packages) +* [Installation of specific ABI versioned packages](#installation-of-specific-abi-versioned-packages) * [Uninstall packages](#uninstall-packages) @@ -117,7 +117,7 @@ The easiest way to install all of the available packages for your systems archit sudo apt-get install -y python3-pyarmnn armnn-latest-all # Verify installation via python: python3 -c "import pyarmnn as ann;print(ann.GetVersion())" - # Returns '{ARMNN_MAJOR_VERSION}.0.0' e.g. 27.0.0 + # Returns '{ARMNN_MAJOR_VERSION}.0.0' e.g. 30.0.0 ``` This will install PyArmNN and the three backends for Neon (CpuAcc), OpenCL (GpuAcc) and our Reference Backend. It will also install their dependencies including the arm-compute-library package along with the Tensorflow Lite Parser @@ -156,9 +156,11 @@ In order to check for the latest available Arm NN version use apt-cache search: libarmnntfliteparser-dev - Arm NN is an inference engine for CPUs, GPUs and NPUs # Note: removal of dash to suit debian naming conventions libarmnn-tfliteparser23 - Arm NN is an inference engine for CPUs, GPUs and NPUs libarmnntfliteparser24 - Arm NN is an inference engine for CPUs, GPUs and NPUs # Note: removal of dash to suit debian naming conventions + libarmnntfliteparser24.5 - Arm NN is an inference engine for CPUs, GPUs and NPUs # Note: removal of dash to suit debian naming conventions libarmnn23 - Arm NN is an inference engine for CPUs, GPUs and NPUs libarmnn24 - Arm NN is an inference engine for CPUs, GPUs and NPUs libarmnn25 - Arm NN is an inference engine for CPUs, GPUs and NPUs + libarmnn30 - Arm NN is an inference engine for CPUs, GPUs and NPUs libarmnn-aclcommon23 - Arm NN is an inference engine for CPUs, GPUs and NPUs libarmnnaclcommon24 - Arm NN is an inference engine for CPUs, GPUs and NPUs # Note: removal of dash to suit debian naming conventions libarmnn-cpuacc-backend23 - Arm NN is an inference engine for CPUs, GPUs and NPUs @@ -167,13 +169,13 @@ In order to check for the latest available Arm NN version use apt-cache search: libarmnn-gpuacc-backend24 - Arm NN is an inference engine for CPUs, GPUs and NPUs - # Export the ARMNN_MAJOR_VERSION to the latest visible e.g. libarmnn25 to allow installation using the below examples - export ARMNN_MAJOR_VERSION=27 + # Export the ARMNN_MAJOR_VERSION to the latest visible e.g. libarmnn30 to allow installation using the below examples + export ARMNN_MAJOR_VERSION=30 # As the Tensorflow Lite Parser is now ABI stable it will have a different version to ARMNN_MAJOR_VERSION please choose latest version: apt-cache search libarmnntfliteparser - # Returns e.g. libarmnntfliteparser24 so we then export that version, for reference this comes from include/armnnTfLiteParser/Version.hpp: - export TFLITE_PARSER_VERSION=24 + # Returns e.g. libarmnntfliteparser24.5 so we then export that version, for reference this comes from include/armnnTfLiteParser/Version.hpp: + export TFLITE_PARSER_VERSION=24.5 sudo apt-get install -y libarmnntfliteparser${TFLITE_PARSER_VERSION} libarmnn-cpuacc-backend${ARMNN_MAJOR_VERSION} ``` diff --git a/README.md b/README.md index 2531e99074..ac3c332e54 100644 --- a/README.md +++ b/README.md @@ -54,11 +54,11 @@ Parser for Ubuntu 20.04. | 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/v22.05.01/ArmnnDelegate-release.aar) | -| Android 8.1 "O/Oreo" (API level 27) | [![](https://img.shields.io/badge/download-arm64--v8.2a-blue)](https://github.com/ARM-software/armnn/releases/download/v22.05.01/ArmNN-android-27-arm64-v8.2-a.tar.gz) [![](https://img.shields.io/badge/download-arm64--v8a-red)](https://github.com/ARM-software/armnn/releases/download/v22.05.01/ArmNN-android-27-arm64-v8a.tar.gz) | -| Android 9 "P/Pie" (API level 28) | [![](https://img.shields.io/badge/download-arm64--v8.2a-blue)](https://github.com/ARM-software/armnn/releases/download/v22.05.01/ArmNN-android-28-arm64-v8.2-a.tar.gz) [![](https://img.shields.io/badge/download-arm64--v8a-red)](https://github.com/ARM-software/armnn/releases/download/v22.05.01/ArmNN-android-28-arm64-v8a.tar.gz) | -| Android 10 "Q/Quince Tart" (API level 29) | [![](https://img.shields.io/badge/download-arm64--v8.2a-blue)](https://github.com/ARM-software/armnn/releases/download/v22.05.01/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/v22.05.01/ArmNN-android-29-arm64-v8a.tar.gz) | -| Linux | [![](https://img.shields.io/badge/download-aarch64-green)](https://github.com/ARM-software/armnn/releases/download/v22.05.01/ArmNN-linux-aarch64.tar.gz) [![](https://img.shields.io/badge/download-x86__64-yellow)](https://github.com/ARM-software/armnn/releases/download/v22.05.01/ArmNN-linux-x86_64.tar.gz) | +| Android (AAR) | [![](https://img.shields.io/badge/download-android--aar-orange)](https://github.com/ARM-software/armnn/releases/download/v22.08/ArmnnDelegate-release.aar) | +| Android 8.1 "O/Oreo" (API level 27) | [![](https://img.shields.io/badge/download-arm64--v8.2a-blue)](https://github.com/ARM-software/armnn/releases/download/v22.08/ArmNN-android-27-arm64-v8.2-a.tar.gz) [![](https://img.shields.io/badge/download-arm64--v8a-red)](https://github.com/ARM-software/armnn/releases/download/v22.08/ArmNN-android-27-arm64-v8a.tar.gz) | +| Android 9 "P/Pie" (API level 28) | [![](https://img.shields.io/badge/download-arm64--v8.2a-blue)](https://github.com/ARM-software/armnn/releases/download/v22.08/ArmNN-android-28-arm64-v8.2-a.tar.gz) [![](https://img.shields.io/badge/download-arm64--v8a-red)](https://github.com/ARM-software/armnn/releases/download/v22.08/ArmNN-android-28-arm64-v8a.tar.gz) | +| Android 10 "Q/Quince Tart" (API level 29) | [![](https://img.shields.io/badge/download-arm64--v8.2a-blue)](https://github.com/ARM-software/armnn/releases/download/v22.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/v22.08/ArmNN-android-29-arm64-v8a.tar.gz) | +| Linux | [![](https://img.shields.io/badge/download-aarch64-green)](https://github.com/ARM-software/armnn/releases/download/v22.08/ArmNN-linux-aarch64.tar.gz) [![](https://img.shields.io/badge/download-x86__64-yellow)](https://github.com/ARM-software/armnn/releases/download/v22.08/ArmNN-linux-x86_64.tar.gz) | ## Software Overview diff --git a/delegate/BuildGuideNative.md b/delegate/BuildGuideNative.md index d8f0369285..1d7e265eb9 100644 --- a/delegate/BuildGuideNative.md +++ b/delegate/BuildGuideNative.md @@ -61,7 +61,7 @@ git checkout # e.g. branches/armnn_21_11 ## Build Tensorflow Lite for C++ Tensorflow has a few dependencies on it's own. It requires the python packages pip3, numpy, and also Bazel or CMake which are used to compile Tensorflow. A description on how to build bazel can be -found [here](https://docs.bazel.build/versions/master/install-compile-source.html). But for this guide, we will +found [here](https://bazel.build/install/compile-source). But for this guide, we will compile with CMake. Depending on your operating system and architecture there might be an easier way. ```bash wget -O cmake-3.16.0.tar.gz https://cmake.org/files/v3.16/cmake-3.16.0.tar.gz -- cgit v1.2.1