Guillaume GARDET
6670a974c5
- Disable TensorFlow as on 15.1 only x86_64 succeed and on TW we have incompatibility with protobuf (3.8.0 in TW and Tensorflow uses 3.6.1 internally) - Update to 19.08: - Changelog: https://github.com/ARM-software/armnn/releases/tag/v19.08 - Remove upstreamed patch: * armnn-fix_quantizer_link.patch * armnn-fix_caffe_parser_with_new_protobuf.patch - Refresh patch: * armnn-generate-versioned-library.patch - Drop patches not needed anymore: * armnn-remove_broken_std_move.patch * armnn-fix_build_with_gcc9.patch - Disable LTO until lto link is fixed https://github.com/ARM-software/armnn/issues/251 - Fix build in Tumbleweed, with latest protobuf: * armnn-fix_caffe_parser_with_new_protobuf.patch - Enable Tensorflow parser - Fix link with Tensorflow: * armnn-fix_tensorflow_link.patch OBS-URL: https://build.opensuse.org/request/show/728506 OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=6
66 lines
3.0 KiB
Diff
66 lines
3.0 KiB
Diff
diff -purN armnn-19.08.orig/CMakeLists.txt armnn-19.08/CMakeLists.txt
|
|
--- armnn-19.08.orig/CMakeLists.txt 2019-08-30 07:49:26.000000000 +0000
|
|
+++ armnn-19.08/CMakeLists.txt 2019-09-05 08:13:37.958980306 +0000
|
|
@@ -95,6 +95,7 @@ if(BUILD_CAFFE_PARSER)
|
|
|
|
target_link_libraries(armnnCaffeParser armnn)
|
|
target_link_libraries(armnnCaffeParser ${PROTOBUF_LIBRARIES})
|
|
+ set_target_properties(armnnCaffeParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
|
|
|
|
endif()
|
|
|
|
@@ -119,6 +120,7 @@ if(BUILD_ONNX_PARSER)
|
|
|
|
# Protobuf
|
|
target_link_libraries(armnnOnnxParser ${PROTOBUF_LIBRARIES})
|
|
+ set_target_properties(armnnOnnxParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
|
|
endif()
|
|
|
|
if(BUILD_TF_PARSER)
|
|
@@ -142,6 +144,7 @@ if(BUILD_TF_PARSER)
|
|
|
|
# Protobuf (use the specific version tensorflow wants)
|
|
target_link_libraries(armnnTfParser ${PROTOBUF_LIBRARIES})
|
|
+ set_target_properties(armnnTfParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
|
|
endif()
|
|
|
|
if(BUILD_ARMNN_QUANTIZER AND ARMNNREF)
|
|
@@ -199,6 +202,8 @@ if(BUILD_ARMNN_QUANTIZER AND ARMNNREF)
|
|
if(Threads_FOUND AND (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android)))
|
|
target_link_libraries(ArmnnQuantizer pthread)
|
|
endif()
|
|
+
|
|
+ set_target_properties(ArmnnQuantizer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
|
|
|
|
endif()
|
|
|
|
@@ -484,6 +489,7 @@ endif()
|
|
if(PROFILING_BACKEND_STREAMLINE)
|
|
target_link_libraries(armnn pthread)
|
|
endif()
|
|
+set_target_properties( armnn PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
|
|
|
|
if(BUILD_UNIT_TESTS)
|
|
set(unittest_sources)
|
|
diff -purN armnn-19.08.orig/src/armnnSerializer/CMakeLists.txt armnn-19.08/src/armnnSerializer/CMakeLists.txt
|
|
--- armnn-19.08.orig/src/armnnSerializer/CMakeLists.txt 2019-08-30 07:49:26.000000000 +0000
|
|
+++ armnn-19.08/src/armnnSerializer/CMakeLists.txt 2019-09-05 08:18:41.108319913 +0000
|
|
@@ -43,4 +43,5 @@ if(BUILD_ARMNN_SERIALIZER)
|
|
|
|
install(TARGETS armnnSerializer
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+ set_target_properties(armnnSerializer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
|
|
endif()
|
|
diff -purN armnn-19.08.orig/src/armnnTfLiteParser/CMakeLists.txt armnn-19.08/src/armnnTfLiteParser/CMakeLists.txt
|
|
--- armnn-19.08.orig/src/armnnTfLiteParser/CMakeLists.txt 2019-08-30 07:49:26.000000000 +0000
|
|
+++ armnn-19.08/src/armnnTfLiteParser/CMakeLists.txt 2019-09-05 08:20:47.788043949 +0000
|
|
@@ -21,6 +21,8 @@ if(BUILD_TF_LITE_PARSER)
|
|
target_link_libraries(armnnTfLiteParser ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY})
|
|
target_link_libraries(armnnTfLiteParser armnn ${FLATBUFFERS_LIBRARY})
|
|
|
|
+ set_target_properties(armnnTfLiteParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
|
|
+
|
|
install(TARGETS armnnTfLiteParser
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|