aboutsummaryrefslogtreecommitdiff
path: root/delegate
diff options
context:
space:
mode:
authorMatthew Sloyan <matthew.sloyan@arm.com>2021-02-03 10:43:04 +0000
committerFrancis Murtagh <francis.murtagh@arm.com>2021-02-08 16:25:54 +0000
commitac001eebca101f2df4973d2f1d8cfca026e07419 (patch)
treed8f3b0203a279e777fd27fd33a50282cd5adbc0f /delegate
parentd92a6e4c19567cb03de76963068c002353cea528 (diff)
downloadarmnn-ac001eebca101f2df4973d2f1d8cfca026e07419.tar.gz
IVGCVSW-4901 Add semantic versioning to Parsers and TfLite Delegate
* Added Version.hpp to all Parsers * Added Version.hpp to TfLite Delegate * Updated CMakeLists to use new versions * Added GetVersion method to parsers and TfLite Delegate Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com> Change-Id: If29e1e6d9e615f9095ec1c01ad47acfff40b1dd5
Diffstat (limited to 'delegate')
-rw-r--r--delegate/CMakeLists.txt3
-rw-r--r--delegate/include/Version.hpp29
-rw-r--r--delegate/include/armnn_delegate.hpp3
-rw-r--r--delegate/src/armnn_delegate.cpp8
4 files changed, 43 insertions, 0 deletions
diff --git a/delegate/CMakeLists.txt b/delegate/CMakeLists.txt
index eda5b935e3..777702e0b4 100644
--- a/delegate/CMakeLists.txt
+++ b/delegate/CMakeLists.txt
@@ -14,6 +14,7 @@ set(armnnDelegate_sources)
list(APPEND armnnDelegate_sources
include/armnn_delegate.hpp
include/DelegateOptions.hpp
+ include/Version.hpp
src/armnn_delegate.cpp
src/armnn_external_delegate.cpp
src/DelegateOptions.cpp
@@ -103,6 +104,8 @@ target_include_directories(thirdparty_headers INTERFACE $<BUILD_INTERFACE:${ARMN
target_compile_options(thirdparty_headers INTERFACE -Wno-old-style-cast)
+set_target_properties(armnnDelegate PROPERTIES VERSION ${DELEGATE_LIB_VERSION} SOVERSION ${DELEGATE_LIB_SOVERSION})
+
option(BUILD_UNIT_TESTS "Build unit tests" ON)
if(BUILD_UNIT_TESTS)
set(armnnDelegate_unittest_sources)
diff --git a/delegate/include/Version.hpp b/delegate/include/Version.hpp
new file mode 100644
index 0000000000..f1ac1fe111
--- /dev/null
+++ b/delegate/include/Version.hpp
@@ -0,0 +1,29 @@
+//
+// Copyright © 2021 Arm Ltd and Contributors. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+namespace armnnDelegate
+{
+
+/// Macro utils
+#define STRINGIFY_VALUE(s) STRINGIFY_MACRO(s)
+#define STRINGIFY_MACRO(s) #s
+
+// ArmNN Delegate version components
+#define DELEGATE_MAJOR_VERSION 23
+#define DELEGATE_MINOR_VERSION 0
+#define DELEGATE_PATCH_VERSION 0
+
+/// DELEGATE_VERSION: "X.Y.Z"
+/// where:
+/// X = Major version number
+/// Y = Minor version number
+/// Z = Patch version number
+#define DELEGATE_VERSION STRINGIFY_VALUE(DELEGATE_MAJOR_VERSION) "." \
+ STRINGIFY_VALUE(DELEGATE_MINOR_VERSION) "." \
+ STRINGIFY_VALUE(DELEGATE_PATCH_VERSION)
+
+} //namespace armnnDelegate \ No newline at end of file
diff --git a/delegate/include/armnn_delegate.hpp b/delegate/include/armnn_delegate.hpp
index adf264aabb..b213211ae9 100644
--- a/delegate/include/armnn_delegate.hpp
+++ b/delegate/include/armnn_delegate.hpp
@@ -47,6 +47,9 @@ public:
TfLiteDelegate* GetDelegate();
+ /// Retrieve version in X.Y.Z form
+ static const std::string GetVersion();
+
private:
TfLiteDelegate m_Delegate = {
reinterpret_cast<void*>(this), // .data_
diff --git a/delegate/src/armnn_delegate.cpp b/delegate/src/armnn_delegate.cpp
index 639e514a78..3ebc0cc6b5 100644
--- a/delegate/src/armnn_delegate.cpp
+++ b/delegate/src/armnn_delegate.cpp
@@ -5,6 +5,8 @@
#include <armnn_delegate.hpp>
+#include "Version.hpp"
+
#include "Activation.hpp"
#include "ArgMinMax.hpp"
#include "BatchSpace.hpp"
@@ -35,6 +37,7 @@
#include <tensorflow/lite/context_util.h>
#include <algorithm>
+#include <iostream>
#include <sstream>
namespace armnnDelegate
@@ -217,6 +220,11 @@ TfLiteDelegate* Delegate::GetDelegate()
return &m_Delegate;
}
+const std::string Delegate::GetVersion()
+{
+ return DELEGATE_VERSION;
+}
+
TfLiteStatus ArmnnSubgraph::AddInputLayer(DelegateData& delegateData,
TfLiteContext* tfLiteContext,
const TfLiteIntArray* inputs,