aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikhil Raj <nikhil.raj@arm.com>2020-05-19 15:55:25 +0100
committerJan Eilers <jan.eilers@arm.com>2020-05-20 15:58:12 +0100
commit5c24323614dcd62bda0a566f1358da62ca1f91b1 (patch)
tree71b2d42e51ad673d97da06ee6afde3419aaab96a
parent7bdcc2e3073accbd6e7884a4b7d0d016253e7412 (diff)
downloadarmnn-5c24323614dcd62bda0a566f1358da62ca1f91b1.tar.gz
Few minor updates to BuildGuideAndroidNDK.md file
Signed-off-by: Nikhil Raj <nikhil.raj@arm.com> Change-Id: I380862816cbc7ec509ff01791e77297b859f21ac
-rw-r--r--BuildGuideAndroidNDK.md29
-rw-r--r--BuildGuideCrossCompilation.md16
2 files changed, 43 insertions, 2 deletions
diff --git a/BuildGuideAndroidNDK.md b/BuildGuideAndroidNDK.md
index e1ec13ec47..70844564a7 100644
--- a/BuildGuideAndroidNDK.md
+++ b/BuildGuideAndroidNDK.md
@@ -48,7 +48,7 @@ All downloaded or generated files will be saved inside the `~/armnn-devenv` dire
* Build:
- (Requires gcc if not previously installed: `sudo apt install gcc`)
+ (Requires clang if not previously installed: `sudo apt-get install clang`)
```bash
echo "using clang : arm : aarch64-linux-android<Android_API>-clang++ ;" > $HOME/armnn-devenv/boost/user-config.jam
cd ~/armnn-devenv/boost/boost_1_64_0
@@ -69,11 +69,22 @@ All downloaded or generated files will be saved inside the `~/armnn-devenv` dire
git clone https://github.com/ARM-software/ComputeLibrary.git
```
+* Checkout ComputeLibrary branch:
+ ```bash
+ cd ComputeLibrary
+ git checkout <branch_name>
+ git pull
+ ```
+ For example, if you want to checkout release branch of 20.02:
+ ```bash
+ git checkout branches/arm_compute_20_02
+ git pull
+ ```
+
* Build:
(Requires SCons if not previously installed: `sudo apt install scons`)
```bash
- cd ComputeLibrary
scons arch=arm64-v8a neon=1 opencl=1 embed_kernels=1 extra_cxx_flags="-fPIC" \
benchmark_tests=0 validation_tests=0 os=android -j16
```
@@ -140,6 +151,20 @@ All downloaded or generated files will be saved inside the `~/armnn-devenv` dire
git clone https://github.com/ARM-software/armnn.git
```
+* Checkout ArmNN branch:
+
+ ```bash
+ cd armnn
+ git checkout <branch_name>
+ git pull
+ ```
+
+ For example, if you want to checkout release branch of 20.02:
+ ```bash
+ git checkout branches/armnn_20_02
+ git pull
+ ```
+
* Generate TensorFlow protobuf definitions:
```bash
diff --git a/BuildGuideCrossCompilation.md b/BuildGuideCrossCompilation.md
index 9baf20cb71..156488abca 100644
--- a/BuildGuideCrossCompilation.md
+++ b/BuildGuideCrossCompilation.md
@@ -109,9 +109,17 @@ The instructions show how to build the ArmNN core library and the Boost, Protobu
```bash
git clone https://github.com/ARM-software/ComputeLibrary.git
cd ComputeLibrary/
+ git checkout <branch_name>
+ git pull
scons arch=arm64-v8a neon=1 opencl=1 embed_kernels=1 extra_cxx_flags="-fPIC" -j8 internal_only=0
```
+ For example, if you want to checkout release branch of 20.02:
+ ```bash
+ git checkout branches/arm_compute_20_02
+ git pull
+ ```
+
#### <a name="buildtf">Build Tensorflow</a>
* Building Tensorflow version 1.15:
'''bash
@@ -171,10 +179,18 @@ The instructions show how to build the ArmNN core library and the Boost, Protobu
```bash
git clone https://github.com/ARM-software/armnn.git
cd armnn
+ git checkout <branch_name>
+ git pull
mkdir build
cd build
```
+ For example, if you want to checkout release branch of 20.02:
+ ```bash
+ git checkout branches/armnn_20_02
+ git pull
+ ```
+
* Use CMake to configure your build environment, update the following script and run it from the armnn/build directory to set up the armNN build:
```bash
#!/bin/bash