diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-10-18 14:59:19 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-10-18 15:45:45 +0100 |
| commit | bccc3450179402ea0cf608171833dbc4f297056f (patch) | |
| tree | 26395c63d76518886f28a0778c7233f7526e9e0a /include | |
| parent | ed25e0e8932895686ffb5166966beb88ddcbd410 (diff) | |
| download | armnn-bccc3450179402ea0cf608171833dbc4f297056f.tar.gz | |
Github #275 Generate versionned libraries
* Improved parsing of the ArmNN's version at compile time
* Reading the version directly from the Version.hpp file, to
make sure not to break any build made with a different
build system than CMake (or Ninja)
* The version macro is set in the Version.hpp just like before,
so setting it from the command line is no longer necessary
!android-nn-driver:2126
Signed-off-by: Guillaume Gardet <guillaume.gardet@arm.com>
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Change-Id: I0820094607734d283ded030e4ded0ae6f5889c86
Diffstat (limited to 'include')
| -rw-r--r-- | include/armnn/Version.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/armnn/Version.hpp b/include/armnn/Version.hpp index 150d98b87e..2b2aaf854e 100644 --- a/include/armnn/Version.hpp +++ b/include/armnn/Version.hpp @@ -5,20 +5,20 @@ #pragma once -#if !defined(ARMNN_VERSION_FROM_FILE) -#error "A valid version of ArmNN must be provided at compile time" -#endif - +// Macro utils #define STRINGIFY_VALUE(s) STRINGIFY_MACRO(s) #define STRINGIFY_MACRO(s) #s +#define CONCAT_VALUE(a, b, c) CONCAT_MACRO(a, b, c) +#define CONCAT_MACRO(a, b, c) a ## b ## c + +// ArmNN version components +#define ARMNN_MAJOR_VERSION 19 +#define ARMNN_MINOR_VERSION 08 +#define ARMNN_PATCH_VERSION 00 -// YYYYMMPP +// ARMNN_VERSION: "YYYYMMPP" // where: // YYYY = 4-digit year number // MM = 2-digit month number // PP = 2-digit patch number -// Defined in ArmnnVersion.txt -#define ARMNN_VERSION STRINGIFY_VALUE(ARMNN_VERSION_FROM_FILE) - -// Check that the provided ArmNN version is valid -static_assert(sizeof(ARMNN_VERSION) == 9, "Invalid ArmNN version, a valid version should have exactly 8 digits"); +#define ARMNN_VERSION "20" STRINGIFY_VALUE(CONCAT_VALUE(ARMNN_MAJOR_VERSION, ARMNN_MINOR_VERSION, ARMNN_PATCH_VERSION)) |