aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikhil Raj <nikhil.raj@arm.com>2021-02-11 17:39:47 +0000
committerKeithARM <keith.davis@arm.com>2021-02-15 15:55:14 +0000
commit3390e252e8978ade2113a6de86ffdce18b16a187 (patch)
treed54215a6571472bee8bb4ef705c7b2b84795f901
parent33199c25e5af1553e474a6f6eede07e888cd45ee (diff)
downloadarmnn-3390e252e8978ade2113a6de86ffdce18b16a187.tar.gz
IVGCVSW-5694 Update Major, Minor release versions
* Update Arm NN version in Version.hpp and all guides * Change Project Version in Doxyfile Signed-off-by: Nikhil Raj <nikhil.raj@arm.com> Change-Id: I05ab20a1ae5d0376a641df68a5877f97e7609052
-rw-r--r--BuildGuideAndroidNDK.md6
-rw-r--r--BuildGuideCrossCompilation.md10
-rw-r--r--delegate/include/Version.hpp2
-rw-r--r--docs/Doxyfile2
-rw-r--r--include/armnn/Version.hpp2
-rw-r--r--include/armnnCaffeParser/Version.hpp2
-rw-r--r--include/armnnOnnxParser/Version.hpp2
-rw-r--r--include/armnnTfLiteParser/Version.hpp2
-rw-r--r--include/armnnTfParser/Version.hpp2
-rw-r--r--python/pyarmnn/README.md14
-rw-r--r--python/pyarmnn/examples/image_classification/README.md2
-rw-r--r--python/pyarmnn/examples/object_detection/README.md2
-rw-r--r--python/pyarmnn/examples/speech_recognition/README.md2
-rw-r--r--python/pyarmnn/src/pyarmnn/_version.py4
-rw-r--r--python/pyarmnn/test/test_setup.py8
-rw-r--r--python/pyarmnn/test/test_version.py4
-rw-r--r--samples/ObjectDetection/Readme.md6
17 files changed, 36 insertions, 36 deletions
diff --git a/BuildGuideAndroidNDK.md b/BuildGuideAndroidNDK.md
index 96e0ca86da..94a23cb51e 100644
--- a/BuildGuideAndroidNDK.md
+++ b/BuildGuideAndroidNDK.md
@@ -239,9 +239,9 @@ adb push libarmnn.so /data/local/tmp/
adb push libtimelineDecoder.so /data/local/tmp/
adb push UnitTests /data/local/tmp/
adb push $NDK/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so /data/local/tmp/
-adb push $HOME/armnn-devenv/google/arm64_pb_install/lib/libprotobuf.so /data/local/tmp/libprotobuf.so.23.0.0
-adb shell 'ln -s libprotobuf.so.23.0.0 /data/local/tmp/libprotobuf.so.23'
-adb shell 'ln -s libprotobuf.so.23.0.0 /data/local/tmp/libprotobuf.so'
+adb push $HOME/armnn-devenv/google/arm64_pb_install/lib/libprotobuf.so /data/local/tmp/libprotobuf.so.24.0.0
+adb shell 'ln -s libprotobuf.so.24.0.0 /data/local/tmp/libprotobuf.so.24'
+adb shell 'ln -s libprotobuf.so.24.0.0 /data/local/tmp/libprotobuf.so'
```
* Push the files needed for the unit tests (they are a mix of files, directories and symbolic links):
diff --git a/BuildGuideCrossCompilation.md b/BuildGuideCrossCompilation.md
index 8a926c943c..0303a3f102 100644
--- a/BuildGuideCrossCompilation.md
+++ b/BuildGuideCrossCompilation.md
@@ -222,8 +222,8 @@ cmake .. \
-DFLATC_DIR=$HOME/flatbuffers-1.12.0/build \
-DPROTOBUF_ROOT=$HOME/google/x86_64_pb_install \
-DPROTOBUF_ROOT=$HOME/armnn-devenv/google/x86_64_pb_install/ \
--DPROTOBUF_LIBRARY_DEBUG=$HOME/armnn-devenv/google/arm64_pb_install/lib/libprotobuf.so.23.0.0 \
--DPROTOBUF_LIBRARY_RELEASE=$HOME/armnn-devenv/google/arm64_pb_install/lib/libprotobuf.so.23.0.0
+-DPROTOBUF_LIBRARY_DEBUG=$HOME/armnn-devenv/google/arm64_pb_install/lib/libprotobuf.so.24.0.0 \
+-DPROTOBUF_LIBRARY_RELEASE=$HOME/armnn-devenv/google/arm64_pb_install/lib/libprotobuf.so.24.0.0
```
* If you want to include standalone sample dynamic backend tests, add the argument to enable the tests and the dynamic backend path to the CMake command:
@@ -271,10 +271,10 @@ cd build/
export LD_LIBRARY_PATH=<current_working_directory>
```
-* Create a symbolic link to libprotobuf.so.23.0.0:
+* Create a symbolic link to libprotobuf.so.24.0.0:
```bash
-ln -s libprotobuf.so.23.0.0 ./libprotobuf.so.23
+ln -s libprotobuf.so.24.0.0 ./libprotobuf.so.24
```
* Run the UnitTests:
@@ -330,7 +330,7 @@ sudo ./b2 clean
### Missing libz.so.1
* When compiling armNN:
```bash
-/usr/lib/gcc-cross/aarch64-linux-gnu/5/../../../../aarch64-linux-gnu/bin/ld: warning: libz.so.1, needed by /home/<username>/armNN/usr/lib64/libprotobuf.so.23.0.0, not found (try using -rpath or -rpath-link)
+/usr/lib/gcc-cross/aarch64-linux-gnu/5/../../../../aarch64-linux-gnu/bin/ld: warning: libz.so.1, needed by /home/<username>/armNN/usr/lib64/libprotobuf.so.24.0.0, not found (try using -rpath or -rpath-link)
```
* Missing arm64 libraries for libz.so.1, these can be added by adding a second architecture to dpkg and explicitly installing them:
diff --git a/delegate/include/Version.hpp b/delegate/include/Version.hpp
index f1ac1fe111..8b831f92cf 100644
--- a/delegate/include/Version.hpp
+++ b/delegate/include/Version.hpp
@@ -13,7 +13,7 @@ namespace armnnDelegate
#define STRINGIFY_MACRO(s) #s
// ArmNN Delegate version components
-#define DELEGATE_MAJOR_VERSION 23
+#define DELEGATE_MAJOR_VERSION 24
#define DELEGATE_MINOR_VERSION 0
#define DELEGATE_PATCH_VERSION 0
diff --git a/docs/Doxyfile b/docs/Doxyfile
index cfd2e670bc..31f06f70a5 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -61,7 +61,7 @@ PROJECT_NAME = "ArmNN"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 20.11
+PROJECT_NUMBER = 21.02
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/include/armnn/Version.hpp b/include/armnn/Version.hpp
index 20b842d96e..d8c14ab262 100644
--- a/include/armnn/Version.hpp
+++ b/include/armnn/Version.hpp
@@ -10,7 +10,7 @@
#define STRINGIFY_MACRO(s) #s
// ArmNN version components
-#define ARMNN_MAJOR_VERSION 23
+#define ARMNN_MAJOR_VERSION 24
#define ARMNN_MINOR_VERSION 0
#define ARMNN_PATCH_VERSION 0
diff --git a/include/armnnCaffeParser/Version.hpp b/include/armnnCaffeParser/Version.hpp
index 0894182f80..d7135bf158 100644
--- a/include/armnnCaffeParser/Version.hpp
+++ b/include/armnnCaffeParser/Version.hpp
@@ -13,7 +13,7 @@ namespace armnnCaffeParser
#define STRINGIFY_MACRO(s) #s
// CaffeParser version components
-#define CAFFE_PARSER_MAJOR_VERSION 23
+#define CAFFE_PARSER_MAJOR_VERSION 24
#define CAFFE_PARSER_MINOR_VERSION 0
#define CAFFE_PARSER_PATCH_VERSION 0
diff --git a/include/armnnOnnxParser/Version.hpp b/include/armnnOnnxParser/Version.hpp
index 6c08c69f07..e42adf711d 100644
--- a/include/armnnOnnxParser/Version.hpp
+++ b/include/armnnOnnxParser/Version.hpp
@@ -13,7 +13,7 @@ namespace armnnOnnxParser
#define STRINGIFY_MACRO(s) #s
// OnnxParser version components
-#define ONNX_PARSER_MAJOR_VERSION 23
+#define ONNX_PARSER_MAJOR_VERSION 24
#define ONNX_PARSER_MINOR_VERSION 0
#define ONNX_PARSER_PATCH_VERSION 0
diff --git a/include/armnnTfLiteParser/Version.hpp b/include/armnnTfLiteParser/Version.hpp
index 6c443d1782..7d239bba38 100644
--- a/include/armnnTfLiteParser/Version.hpp
+++ b/include/armnnTfLiteParser/Version.hpp
@@ -13,7 +13,7 @@ namespace armnnTfLiteParser
#define STRINGIFY_MACRO(s) #s
// TfLiteParser version components
-#define TFLITE_PARSER_MAJOR_VERSION 23
+#define TFLITE_PARSER_MAJOR_VERSION 24
#define TFLITE_PARSER_MINOR_VERSION 0
#define TFLITE_PARSER_PATCH_VERSION 0
diff --git a/include/armnnTfParser/Version.hpp b/include/armnnTfParser/Version.hpp
index 44c4a25cda..6f6aac9b38 100644
--- a/include/armnnTfParser/Version.hpp
+++ b/include/armnnTfParser/Version.hpp
@@ -13,7 +13,7 @@ namespace armnnTfParser
#define STRINGIFY_MACRO(s) #s
// tfParser version components
-#define TF_PARSER_MAJOR_VERSION 23
+#define TF_PARSER_MAJOR_VERSION 24
#define TF_PARSER_MINOR_VERSION 0
#define TF_PARSER_PATCH_VERSION 0
diff --git a/python/pyarmnn/README.md b/python/pyarmnn/README.md
index aea2e42377..0c4a313d09 100644
--- a/python/pyarmnn/README.md
+++ b/python/pyarmnn/README.md
@@ -91,14 +91,14 @@ This step will put all generated files under `./src/pyarmnn/_generated` folder a
```bash
$ python setup.py sdist
```
-As the result you will get `./dist/pyarmnn-23.0.0.tar.gz` file. As you can see it is platform independent.
+As the result you will get `./dist/pyarmnn-24.0.0.tar.gz` file. As you can see it is platform independent.
##### 5. Build the binary package
```bash
$ python setup.py bdist_wheel
```
-As the result you will get something like `./dist/pyarmnn-23.0.0-cp36-cp36m-linux_x86_64.whl` file. As you can see it
+As the result you will get something like `./dist/pyarmnn-24.0.0-cp36-cp36m-linux_x86_64.whl` file. As you can see it
is platform dependent.
# PyArmNN installation
@@ -107,8 +107,8 @@ PyArmNN can be distributed as a source package or a binary package (wheel).
Binary package is platform dependent, the name of the package will indicate the platform it was built for, e.g.:
-* Linux x86 64bit machine: pyarmnn-23.0.0-cp36-cp36m-*linux_x86_64*.whl
-* Linux Aarch 64 bit machine: pyarmnn-23.0.0-cp36-cp36m-*linux_aarch64*.whl
+* Linux x86 64bit machine: pyarmnn-24.0.0-cp36-cp36m-*linux_x86_64*.whl
+* Linux Aarch 64 bit machine: pyarmnn-24.0.0-cp36-cp36m-*linux_aarch64*.whl
The source package is platform independent but installation involves compilation of Arm NN python extension. You will need to have g++ compatible with C++ 14 standard and a python development library installed on the build machine.
@@ -126,7 +126,7 @@ $ gcc --print-search-dirs
```
Install PyArmNN from binary by pointing to the wheel file:
```bash
-$ pip install /path/to/pyarmnn-23.0.0-cp36-cp36m-linux_aarch64.whl
+$ pip install /path/to/pyarmnn-24.0.0-cp36-cp36m-linux_aarch64.whl
```
## Installing from source package
@@ -143,7 +143,7 @@ $ export ARMNN_INCLUDE=/path/to/headers
Install PyArmNN as follows:
```bash
-$ pip install /path/to/pyarmnn-23.0.0.tar.gz
+$ pip install /path/to/pyarmnn-24.0.0.tar.gz
```
If PyArmNN installation script fails to find Arm NN libraries it will raise an error like this
@@ -157,7 +157,7 @@ $ pip show pyarmnn
You can also verify it by running the following and getting output similar to below:
```bash
$ python -c "import pyarmnn as ann;print(ann.GetVersion())"
-'23.0.0'
+'24.0.0'
```
# PyArmNN API overview
diff --git a/python/pyarmnn/examples/image_classification/README.md b/python/pyarmnn/examples/image_classification/README.md
index 61efbc421f..3d2cbabca8 100644
--- a/python/pyarmnn/examples/image_classification/README.md
+++ b/python/pyarmnn/examples/image_classification/README.md
@@ -20,7 +20,7 @@ $ pip show pyarmnn
You can also verify it by running the following and getting output similar to below:
```bash
$ python -c "import pyarmnn as ann;print(ann.GetVersion())"
-'22.0.0'
+'24.0.0'
```
##### Dependencies
diff --git a/python/pyarmnn/examples/object_detection/README.md b/python/pyarmnn/examples/object_detection/README.md
index ea00a36002..38f0630fdf 100644
--- a/python/pyarmnn/examples/object_detection/README.md
+++ b/python/pyarmnn/examples/object_detection/README.md
@@ -23,7 +23,7 @@ $ pip show pyarmnn
You can also verify it by running the following and getting output similar to below:
```bash
$ python -c "import pyarmnn as ann;print(ann.GetVersion())"
-'22.0.0'
+'24.0.0'
```
##### Dependencies
diff --git a/python/pyarmnn/examples/speech_recognition/README.md b/python/pyarmnn/examples/speech_recognition/README.md
index 10a583f123..2323eac656 100644
--- a/python/pyarmnn/examples/speech_recognition/README.md
+++ b/python/pyarmnn/examples/speech_recognition/README.md
@@ -18,7 +18,7 @@ You can also verify it by running the following and getting output similar to be
```bash
$ python -c "import pyarmnn as ann;print(ann.GetVersion())"
-'22.0.0'
+'24.0.0'
```
### Dependencies
diff --git a/python/pyarmnn/src/pyarmnn/_version.py b/python/pyarmnn/src/pyarmnn/_version.py
index f78d0630ec..58e3954ea5 100644
--- a/python/pyarmnn/src/pyarmnn/_version.py
+++ b/python/pyarmnn/src/pyarmnn/_version.py
@@ -3,7 +3,7 @@
# SPDX-License-Identifier: MIT
import os
-version_info = (23, 0, 0)
+version_info = (24, 0, 0)
__dev_version_env = os.getenv("PYARMNN_DEV_VER", "")
@@ -24,7 +24,7 @@ def check_armnn_version(installed_armnn_version: str, expected_armnn_version: st
"""Compares expected Arm NN version and Arm NN version used to build the package.
Args:
- installed_armnn_version (str): Arm NN version used to generate the package (e.g. 23.0.0)
+ installed_armnn_version (str): Arm NN version used to generate the package (e.g. 24.0.0)
expected_armnn_version (str): Expected Arm NN version
Returns:
diff --git a/python/pyarmnn/test/test_setup.py b/python/pyarmnn/test/test_setup.py
index 34d4b3a9cd..19fd5f7c15 100644
--- a/python/pyarmnn/test/test_setup.py
+++ b/python/pyarmnn/test/test_setup.py
@@ -87,15 +87,15 @@ def test_gcc_serch_path():
def test_armnn_version():
- check_armnn_version('23.0.0', '23.0.0')
+ check_armnn_version('24.0.0', '24.0.0')
def test_incorrect_armnn_version():
with pytest.raises(AssertionError) as err:
- check_armnn_version('23.0.0', '23.1.0')
+ check_armnn_version('24.0.0', '24.1.0')
- assert 'Expected ArmNN version is 23.1.0 but installed ArmNN version is 23.0.0' in str(err.value)
+ assert 'Expected ArmNN version is 24.1.0 but installed ArmNN version is 24.0.0' in str(err.value)
def test_armnn_version_patch_does_not_matter():
- check_armnn_version('23.0.0', '23.0.1')
+ check_armnn_version('24.0.0', '24.0.1')
diff --git a/python/pyarmnn/test/test_version.py b/python/pyarmnn/test/test_version.py
index 57dbd74e8c..cfd8c88908 100644
--- a/python/pyarmnn/test/test_version.py
+++ b/python/pyarmnn/test/test_version.py
@@ -18,7 +18,7 @@ def test_dev_version():
importlib.reload(v)
- assert "23.0.0.dev1" == v.__version__
+ assert "24.0.0.dev1" == v.__version__
del os.environ["PYARMNN_DEV_VER"]
del v
@@ -30,7 +30,7 @@ def test_arm_version_not_affected():
importlib.reload(v)
- assert "23.0.0" == v.__arm_ml_version__
+ assert "24.0.0" == v.__arm_ml_version__
del os.environ["PYARMNN_DEV_VER"]
del v
diff --git a/samples/ObjectDetection/Readme.md b/samples/ObjectDetection/Readme.md
index 835bf3adeb..59b4594130 100644
--- a/samples/ObjectDetection/Readme.md
+++ b/samples/ObjectDetection/Readme.md
@@ -168,10 +168,10 @@ From the build directory, copy the following to the host platform:
The full list of libs after cross-compilation to copy on your board:
```
libarmnn.so
-libarmnn.so.22
-libarmnn.so.23.0
+libarmnn.so.24
+libarmnn.so.24.0
libarmnnTfLiteParser.so
-libarmnnTfLiteParser.so.22.0
+libarmnnTfLiteParser.so.24.0
libavcodec.so
libavcodec.so.58
libavcodec.so.58.54.100