rpm/armnn
SHA256
1
0
Fork 0
forked from pool/armnn
Code Pull Requests Activity

Accepting request 750961 from home:Guillaume_G:branches:science:machinelearning

Browse Source 
- tensorflow-devel package now includes *.pb.* files, so 
  remove TensorFlow parser build workaround:
  * armnn-fix_tensorflow_link.patch

OBS-URL: https://build.opensuse.org/request/show/750961
OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=12
This commit is contained in:
Guillaume GARDET 2019-11-26 14:25:49 +00:00 committed by Git OBS Bridge
parent 4487cb0d74
commit 8a6803a6fe
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
armnn-fix_tensorflow_link.patch
View File

@ -1,13 +0,0 @@
--- armnn-19.05.orig/CMakeLists.txt 2019-06-11 14:59:25.672794989 +0200
+++ armnn-19.05/CMakeLists.txt 2019-06-11 15:02:26.738442920 +0200
@@ -439,6 +439,10 @@ if(ARMCOMPUTECL)
target_link_libraries(armnn ${OPENCL_LIBRARIES})
endif()
+if(BUILD_TF_PARSER)
+ target_link_libraries(armnnTfParser tensorflow_cc tensorflow_framework)
+endif()
+
if(PROFILING_BACKEND_STREAMLINE)
target_link_libraries(armnn pthread)
endif()

7
armnn.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Nov 25 14:16:29 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- tensorflow-devel package now includes *.pb.* files, so
remove TensorFlow parser build workaround:
* armnn-fix_tensorflow_link.patch
-------------------------------------------------------------------
Mon Oct 28 15:38:27 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>

4
armnn.spec
View File

@ -100,9 +100,6 @@ Patch3: armnn-fix_boost.patch
# PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/266
Patch4: armnn-fix_arm32_dep.patch
Patch5: armnn-fix_arm32.patch
# https://github.com/ARM-software/armnn/issues/207
# FIXME: remove this patch once *.pb.cc files are packaged properly in tensorflow-devel - https://github.com/ARM-software/armnn/issues/269
Patch100: armnn-fix_tensorflow_link.patch
# PATCHES to add downstream ArmnnExamples binary - https://layers.openembedded.org/layerindex/recipe/87610/
Patch200: 0003-add-more-test-command-line-arguments.patch
Patch201: 0005-add-armnn-mobilenet-test-example.patch
@ -367,7 +364,6 @@ This package contains the libarmnnOnnxParser library from armnn.
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch100 -p1
%patch200 -p1
%patch201 -p1
%patch202 -p1