aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancis Murtagh <francis.murtagh@arm.com>2020-05-22 12:49:25 +0100
committerJan Eilers <jan.eilers@arm.com>2020-05-22 18:15:25 +0100
commitc18293ab10bfb02f0aba251254760814551fcfd4 (patch)
tree7a48928114a6b8366ebb5ccb1d42dd59940a10c4
parent48f9ac0ba3a08cec47857fcb78138cebbaf6088e (diff)
downloadarmnn-c18293ab10bfb02f0aba251254760814551fcfd4.tar.gz
Bugfix: Profiling use of substr() incorrectly parses semantic versioning
* With semantic versioning ARMNN_VERSION is changed from 20200500 to 21.0.0 causing this function to return "Armnn .0..0" instead of "Armnn 20.1" * Remove the use of substrings and instead use the Major/Minor macros to give the expected output format: "Armnn 21.0" compared to last release's "Armnn 20.02" Signed-off-by: Francis Murtagh <francis.murtagh@arm.com> Change-Id: Id255ff154f59e922434f72a68563ccc6126e187a
-rw-r--r--src/profiling/ProfilingUtils.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/profiling/ProfilingUtils.cpp b/src/profiling/ProfilingUtils.cpp
index 4e5fcf8e1a..f151dd6e4a 100644
--- a/src/profiling/ProfilingUtils.cpp
+++ b/src/profiling/ProfilingUtils.cpp
@@ -284,8 +284,7 @@ std::string GetHardwareVersion()
std::string GetSoftwareVersion()
{
- std::string armnnVersion(ARMNN_VERSION);
- std::string result = "Armnn " + armnnVersion.substr(2,2) + "." + armnnVersion.substr(4,2);
+ std::string result = "Armnn " + std::to_string(ARMNN_MAJOR_VERSION) + "." + std::to_string(ARMNN_MINOR_VERSION);
return result;
}