diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/armnnCaffeParser/CaffeParser.cpp | 8 | ||||
-rw-r--r-- | src/armnnCaffeParser/CaffeParser.hpp | 3 | ||||
-rw-r--r-- | src/armnnOnnxParser/OnnxParser.cpp | 8 | ||||
-rw-r--r-- | src/armnnOnnxParser/OnnxParser.hpp | 3 | ||||
-rwxr-xr-x | src/armnnTfLiteParser/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/armnnTfLiteParser/TfLiteParser.cpp | 10 | ||||
-rw-r--r-- | src/armnnTfLiteParser/TfLiteParser.hpp | 3 | ||||
-rwxr-xr-x | src/armnnTfParser/TfParser.cpp | 8 | ||||
-rw-r--r-- | src/armnnTfParser/TfParser.hpp | 3 |
9 files changed, 47 insertions, 2 deletions
diff --git a/src/armnnCaffeParser/CaffeParser.cpp b/src/armnnCaffeParser/CaffeParser.cpp index dfb9cec206..463f3eb2a5 100644 --- a/src/armnnCaffeParser/CaffeParser.cpp +++ b/src/armnnCaffeParser/CaffeParser.cpp @@ -5,6 +5,8 @@ #include "CaffeParser.hpp" #include "RecordByRecordCaffeParser.hpp" +#include "armnnCaffeParser/Version.hpp" + #include "armnn/Descriptors.hpp" #include "armnn/INetwork.hpp" #include "armnn/Utils.hpp" @@ -35,6 +37,7 @@ #include <google/protobuf/wire_format.h> #include <cmath> +#include <iostream> #include <sstream> #include <queue> #include <fcntl.h> @@ -2250,6 +2253,11 @@ INetworkPtr ICaffeParser::CaffeParserImpl::CreateNetworkFromNetParameter(NetPara return move(m_Network); } +const std::string ICaffeParser::CaffeParserImpl::GetVersion() +{ + return CAFFE_PARSER_VERSION; +} + void ICaffeParser::CaffeParserImpl::Cleanup() { // cleanup, in case we reuse this parser m_InputShapes.clear(); diff --git a/src/armnnCaffeParser/CaffeParser.hpp b/src/armnnCaffeParser/CaffeParser.hpp index f369d5f2f9..9f93569742 100644 --- a/src/armnnCaffeParser/CaffeParser.hpp +++ b/src/armnnCaffeParser/CaffeParser.hpp @@ -54,6 +54,9 @@ public: /// Retrieves binding info (layer id and tensor info) for the network output identified by the given layer name. BindingPointInfo GetNetworkOutputBindingInfo(const std::string& name) const; + /// Retrieve version in X.Y.Z form + static const std::string GetVersion(); + CaffeParserImpl(); virtual ~CaffeParserImpl() = default; diff --git a/src/armnnOnnxParser/OnnxParser.cpp b/src/armnnOnnxParser/OnnxParser.cpp index b4e7133239..81d9e3d240 100644 --- a/src/armnnOnnxParser/OnnxParser.cpp +++ b/src/armnnOnnxParser/OnnxParser.cpp @@ -4,6 +4,8 @@ // #include "OnnxParser.hpp" +#include "armnnOnnxParser/Version.hpp" + #include <armnn/Descriptors.hpp> #include <armnn/utility/Assert.hpp> #include <armnn/utility/NumericCast.hpp> @@ -14,6 +16,7 @@ #include <google/protobuf/text_format.h> #include <google/protobuf/io/zero_copy_stream_impl.h> +#include <iostream> #include <numeric> using namespace armnn; @@ -1849,4 +1852,9 @@ std::vector<std::string> OnnxParserImpl::GetOutputs(ModelPtr& model) return outputNames; } +const std::string OnnxParserImpl::GetVersion() +{ + return ONNX_PARSER_VERSION; +} + } // namespace armnnOnnxParser diff --git a/src/armnnOnnxParser/OnnxParser.hpp b/src/armnnOnnxParser/OnnxParser.hpp index 0db93248bc..7716e50fff 100644 --- a/src/armnnOnnxParser/OnnxParser.hpp +++ b/src/armnnOnnxParser/OnnxParser.hpp @@ -61,6 +61,9 @@ public: /// Retrieve outputs names static std::vector<std::string> GetOutputs(ModelPtr& model); + /// Retrieve version in X.Y.Z form + static const std::string GetVersion(); + private: /// Parses a ModelProto loaded into memory from one of the other CreateNetwork* diff --git a/src/armnnTfLiteParser/CMakeLists.txt b/src/armnnTfLiteParser/CMakeLists.txt index 12f2127375..6a02c94b82 100755 --- a/src/armnnTfLiteParser/CMakeLists.txt +++ b/src/armnnTfLiteParser/CMakeLists.txt @@ -6,6 +6,7 @@ if(BUILD_TF_LITE_PARSER) set(armnn_tf_lite_parser_sources) list(APPEND armnn_tf_lite_parser_sources ../../include/armnnTfLiteParser/ITfLiteParser.hpp + ../../include/armnnTfLiteParser/Version.hpp TfLiteParser.hpp TfLiteParser.cpp ) @@ -33,7 +34,7 @@ if(BUILD_TF_LITE_PARSER) target_link_libraries(armnnTfLiteParser armnn debug ${FLATBUFFERS_LIBRARY_DEBUG} optimized ${FLATBUFFERS_LIBRARY_RELEASE}) endif() - set_target_properties(armnnTfLiteParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) + set_target_properties(armnnTfLiteParser PROPERTIES VERSION ${TFLITE_PARSER_LIB_VERSION} SOVERSION ${TFLITE_PARSER_LIB_SOVERSION} ) install(TARGETS armnnTfLiteParser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp index ac0e40eea6..1b9157618e 100644 --- a/src/armnnTfLiteParser/TfLiteParser.cpp +++ b/src/armnnTfLiteParser/TfLiteParser.cpp @@ -5,6 +5,8 @@ #include "TfLiteParser.hpp" +#include "armnnTfLiteParser/Version.hpp" + #include <armnn/BackendOptions.hpp> #include <armnn/Descriptors.hpp> #include <armnn/Exceptions.hpp> @@ -30,8 +32,9 @@ #include <fmt/format.h> -#include <fstream> #include <algorithm> +#include <fstream> +#include <iostream> #include <limits> #include <numeric> #include <sstream> @@ -3590,6 +3593,11 @@ std::vector<std::string> TfLiteParserImpl::GetSubgraphOutputTensorNames(size_t s return result; } +const std::string TfLiteParserImpl::GetVersion() +{ + return TFLITE_PARSER_VERSION; +} + TfLiteParserImpl::SupportedDataStorage::SupportedDataStorage(std::unique_ptr<float[]> && data) : m_FloatData(std::move(data)) , m_Uint8Data(nullptr) diff --git a/src/armnnTfLiteParser/TfLiteParser.hpp b/src/armnnTfLiteParser/TfLiteParser.hpp index 12a085d6ca..2603d9018a 100644 --- a/src/armnnTfLiteParser/TfLiteParser.hpp +++ b/src/armnnTfLiteParser/TfLiteParser.hpp @@ -79,6 +79,9 @@ public: static armnn::TensorInfo OutputShapeOfReshape(const armnn::TensorInfo & inputTensorInfo, const std::vector<int32_t> & targetDimsIn); + /// Retrieve version in X.Y.Z form + static const std::string GetVersion(); + private: // No copying allowed until it is wanted and properly implemented TfLiteParserImpl(const TfLiteParserImpl &) = delete; diff --git a/src/armnnTfParser/TfParser.cpp b/src/armnnTfParser/TfParser.cpp index d13a277924..1e566fe943 100755 --- a/src/armnnTfParser/TfParser.cpp +++ b/src/armnnTfParser/TfParser.cpp @@ -5,6 +5,8 @@ #include "TfParser.hpp" +#include "armnnTfParser/Version.hpp" + #include <armnn/TypesUtils.hpp> #include <armnn/Descriptors.hpp> @@ -25,6 +27,7 @@ #include <fmt/core.h> #include <fmt/format.h> +#include <iostream> #include <numeric> using namespace armnnUtils; @@ -3734,4 +3737,9 @@ void ITfParser::TfParserImpl::TrackBindingPoint(IConnectableLayer* layer, } } +const std::string ITfParser::TfParserImpl::GetVersion() +{ + return TF_PARSER_VERSION; +} + } // namespace armnnTfParser diff --git a/src/armnnTfParser/TfParser.hpp b/src/armnnTfParser/TfParser.hpp index 5c04cceb82..31e074de93 100644 --- a/src/armnnTfParser/TfParser.hpp +++ b/src/armnnTfParser/TfParser.hpp @@ -88,6 +88,9 @@ public: /// Retrieves binding info (layer id and tensor info) for the network output identified by the given layer name. BindingPointInfo GetNetworkOutputBindingInfo(const std::string& name) const; + /// Retrieve version in X.Y.Z form + static const std::string GetVersion(); + TfParserImpl(); ~TfParserImpl() = default; |