Integration of PyArmNN into CMake
Change-Id: Ice37e693f4598a6b3c38bd38d89f1d35cdaa8a18
Signed-off-by: Pavel Macenauer <pavel.macenauer@nxp.com>
diff --git a/python/pyarmnn/src/pyarmnn/_version.py b/python/pyarmnn/src/pyarmnn/_version.py
index c565520..e797248 100644
--- a/python/pyarmnn/src/pyarmnn/_version.py
+++ b/python/pyarmnn/src/pyarmnn/_version.py
@@ -1,8 +1,9 @@
# Copyright © 2020 Arm Ltd. All rights reserved.
+# Copyright 2020 NXP
# SPDX-License-Identifier: MIT
import os
-version_info = (20, 2, 0)
+version_info = (21, 0, 0)
__dev_version_env = os.getenv("PYARMNN_DEV_VER", "")
@@ -16,11 +17,22 @@
version_info = (*version_info, __dev_version)
__version__ = '.'.join(str(c) for c in version_info)
-__arm_ml_version__ = '2{:03d}{:02d}{:02d}'.format(version_info[0], version_info[1], version_info[2])
+__arm_ml_version__ = '{}.{}.{}'.format(version_info[0], version_info[1], version_info[2])
-def check_armnn_version(installed_armnn_version, expected_armnn_version=__arm_ml_version__):
- expected_armnn_version = expected_armnn_version[:-2] # cut off minor patch version
- installed_armnn_version = installed_armnn_version[:-2] # cut off minor patch version
- assert expected_armnn_version == installed_armnn_version, \
+def check_armnn_version(installed_armnn_version: str, expected_armnn_version: str = __arm_ml_version__):
+ """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. 21.0.0)
+ expected_armnn_version (str): Expected Arm NN version
+
+ Returns:
+ None
+ """
+ expected = expected_armnn_version.split('.', 2)
+ installed = installed_armnn_version.split('.', 2)
+
+ # only compare major and minor versions, not patch
+ assert (expected[0] == installed[0]) and (expected[1] == installed[1]), \
"Expected ArmNN version is {} but installed ArmNN version is {}".format(expected_armnn_version, installed_armnn_version)