From 8a6803a6fe27a5af2824b3f0ebb2839c515e3f38806124b8386aa8b646c72a4c Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Tue, 26 Nov 2019 14:25:49 +0000 Subject: [PATCH] Accepting request 750961 from home:Guillaume_G:branches:science:machinelearning - 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 --- armnn-fix_tensorflow_link.patch | 13 ------------- armnn.changes | 7 +++++++ armnn.spec | 4 ---- 3 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 armnn-fix_tensorflow_link.patch diff --git a/armnn-fix_tensorflow_link.patch b/armnn-fix_tensorflow_link.patch deleted file mode 100644 index 6420a04..0000000 --- a/armnn-fix_tensorflow_link.patch +++ /dev/null @@ -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() diff --git a/armnn.changes b/armnn.changes index 2cd0806..f44742c 100644 --- a/armnn.changes +++ b/armnn.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 25 14:16:29 UTC 2019 - Guillaume GARDET + +- 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 diff --git a/armnn.spec b/armnn.spec index b8a8961..8bc3e61 100644 --- a/armnn.spec +++ b/armnn.spec @@ -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