IVGCVSW-5077 Ensure ArmNN builds successfully with latest protobuf

* Use the single parameter version of SetTotalBytesLimit()
* Update CMakeLists to turn off deprecated declarartions

Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: I2d360966743986872cfef40c2ab1a3505fc5d99a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06a9bb8..99e989b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,7 +145,7 @@ if(BUILD_TF_PARSER)
         )
     # The generated tensorflow protobuf .cc files are not warning clean and we can't fix them.
     if(COMPILER_IS_GNU_LIKE)
-        set_source_files_properties(${TF_PROTOBUFS} PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-parameter -Wno-conversion -Wno-sign-conversion")
+        set_source_files_properties(${TF_PROTOBUFS} PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-parameter -Wno-conversion -Wno-sign-conversion  -Wno-error=deprecated-declarations")
     endif()
 
     add_library_ex(armnnTfParser SHARED ${armnn_tf_parser_sources})

diff --git a/src/armnnCaffeParser/CaffeParser.cpp b/src/armnnCaffeParser/CaffeParser.cpp
index f95fe9c..d11da46 100644 (file)
--- a/src/armnnCaffeParser/CaffeParser.cpp
+++ b/src/armnnCaffeParser/CaffeParser.cpp
@@ -1731,7 +1731,7 @@ INetworkPtr CaffeParser::CreateNetworkFromBinaryFile(const char* graphFile,
 
     FileInputStream  inStream(fileno(fd));
     CodedInputStream codedStream(&inStream);
-    codedStream.SetTotalBytesLimit(INT_MAX, INT_MAX);
+    codedStream.SetTotalBytesLimit(INT_MAX);
     bool success = netParam.ParseFromCodedStream(&codedStream);
     fclose(fd);
 

diff --git a/src/armnnOnnxParser/OnnxParser.cpp b/src/armnnOnnxParser/OnnxParser.cpp
index 4ae6627..f3d0a73 100644 (file)
--- a/src/armnnOnnxParser/OnnxParser.cpp
+++ b/src/armnnOnnxParser/OnnxParser.cpp
@@ -546,7 +546,7 @@ ModelPtr OnnxParser::LoadModelFromBinaryFile(const char* graphFile)
 
     google::protobuf::io::FileInputStream  inStream(fileno(fd));
     google::protobuf::io::CodedInputStream codedStream(&inStream);
-    codedStream.SetTotalBytesLimit(INT_MAX, INT_MAX);
+    codedStream.SetTotalBytesLimit(INT_MAX);
     bool success = modelProto.get()->ParseFromCodedStream(&codedStream);
     fclose(fd);
 

diff --git a/src/armnnTfParser/TfParser.cpp b/src/armnnTfParser/TfParser.cpp
index 255233b..aec8df8 100755 (executable)
--- a/src/armnnTfParser/TfParser.cpp
+++ b/src/armnnTfParser/TfParser.cpp
@@ -3564,7 +3564,7 @@ INetworkPtr TfParser::CreateNetworkFromBinaryFile(const char* graphFile,
 
     google::protobuf::io::FileInputStream  inStream(fileno(fd));
     google::protobuf::io::CodedInputStream codedStream(&inStream);
-    codedStream.SetTotalBytesLimit(INT_MAX, INT_MAX);
+    codedStream.SetTotalBytesLimit(INT_MAX);
     bool success = graphDef.ParseFromCodedStream(&codedStream);
     fclose(fd);