From c18293ab10bfb02f0aba251254760814551fcfd4 Mon Sep 17 00:00:00 2001 From: Francis Murtagh Date: Fri, 22 May 2020 12:49:25 +0100 Subject: 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 Change-Id: Id255ff154f59e922434f72a68563ccc6126e187a --- src/profiling/ProfilingUtils.cpp | 3 +-- 1 file changed, 1 insertion(+), 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; } -- cgit v1.2.1