Guillaume GARDET
f0ef77ff1d
- Build and package libarmnnTfLiteParser - Fix libarmnnQuantizer build with: * armnn-fix_quantizer_link.patch - Add _constraints to avoid OOM errors - Update to 19.05: - Changelog: https://github.com/ARM-software/armnn/releases/tag/v19.05 - Remove upstreamed patch: * armnn-fix_stb_include.patch - Rebase patch: * armnn-generate-versioned-library.patch - Update patch: * armnn-remove_broken_std_move.patch - Fix build on Tumbleweed with: * armnn-fix_build_with_gcc9.patch - Fix build on Tumbleweed with: * armnn-remove_broken_std_move.patch OBS-URL: https://build.opensuse.org/request/show/707891 OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=4
67 lines
3.0 KiB
Diff
67 lines
3.0 KiB
Diff
diff -purN armnn-19.05.orig/CMakeLists.txt armnn-19.05/CMakeLists.txt
|
|
--- armnn-19.05.orig/CMakeLists.txt 2019-05-28 10:59:44.000000000 +0200
|
|
+++ armnn-19.05/CMakeLists.txt 2019-06-03 13:55:21.502978565 +0200
|
|
@@ -88,6 +88,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()
|
|
|
|
@@ -112,6 +113,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)
|
|
@@ -135,6 +137,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)
|
|
@@ -191,6 +194,8 @@ if(BUILD_ARMNN_QUANTIZER)
|
|
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()
|
|
|
|
@@ -441,6 +446,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.05.orig/src/armnnSerializer/CMakeLists.txt armnn-19.05/src/armnnSerializer/CMakeLists.txt
|
|
--- armnn-19.05.orig/src/armnnSerializer/CMakeLists.txt 2019-05-28 10:59:44.000000000 +0200
|
|
+++ armnn-19.05/src/armnnSerializer/CMakeLists.txt 2019-06-03 13:57:41.984333057 +0200
|
|
@@ -34,4 +34,5 @@ if(BUILD_ARMNN_SERIALIZER)
|
|
target_include_directories(armnnSerializer SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
target_link_libraries(armnnSerializer armnn ${FLATBUFFERS_LIBRARY})
|
|
-endif()
|
|
\ Pas de fin de ligne à la fin du fichier
|
|
+ set_target_properties(armnnSerializer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
|
|
+endif()
|
|
diff -purN armnn-19.05.orig/src/armnnTfLiteParser/CMakeLists.txt armnn-19.05/src/armnnTfLiteParser/CMakeLists.txt
|
|
--- armnn-19.05.orig/src/armnnTfLiteParser/CMakeLists.txt 2019-05-28 10:59:44.000000000 +0200
|
|
+++ armnn-19.05/src/armnnTfLiteParser/CMakeLists.txt 2019-06-03 13:58:00.216523255 +0200
|
|
@@ -20,4 +20,5 @@ if(BUILD_TF_LITE_PARSER)
|
|
|
|
target_link_libraries(armnnTfLiteParser ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY})
|
|
target_link_libraries(armnnTfLiteParser armnn ${FLATBUFFERS_LIBRARY})
|
|
-endif()
|
|
\ Pas de fin de ligne à la fin du fichier
|
|
+ set_target_properties(armnnTfLiteParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
|
|
+endif()
|