Package: guix-patches;
Reported by: Andy Tai <atai <at> atai.org>
Date: Sat, 9 Sep 2023 07:46:01 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: help-debbugs <at> gnu.org (GNU bug Tracking System) To: Ludovic Courtès <ludo <at> gnu.org> Cc: tracker <at> debbugs.gnu.org Subject: bug#65835: closed ([PATCH] gnu: tensorflow-lite: Update to 2.13.0) Date: Mon, 18 Sep 2023 21:31:01 +0000
[Message part 1 (text/plain, inline)]
Your message dated Mon, 18 Sep 2023 23:29:56 +0200 with message-id <87h6nrgoff.fsf_-_ <at> gnu.org> and subject line Re: bug#65835: [PATCH] gnu: tensorflow-lite: Update to 2.13.0 has caused the debbugs.gnu.org bug report #65835, regarding [PATCH] gnu: tensorflow-lite: Update to 2.13.0 to be marked as done. (If you believe you have received this mail in error, please contact help-debbugs <at> gnu.org.) -- 65835: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65835 GNU Bug Tracking System Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Andy Tai <atai <at> atai.org> To: guix-patches <at> gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH] gnu: tensorflow-lite: Update to 2.13.0 Date: Sat, 9 Sep 2023 00:44:48 -0700* gnu/packages/machine-learning.scm: (tensorflow-lite): Update to 2.13.0 [inputs]: Add gemmlowp [native-inputs]: Remove gemmlowp-src * gnu/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch: New file --- gnu/packages/machine-learning.scm | 48 +++++++++++-------- ...able-local-cmake-3rdparty-components.patch | 26 ++++++++++ 2 files changed, 55 insertions(+), 19 deletions(-) create mode 100644 gnu/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index fd0be8d500..e07e0e542a 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -2972,7 +2972,7 @@ (define-public tensorflow (define-public tensorflow-lite (package (name "tensorflow-lite") - (version "2.12.1") + (version "2.13.0") (source (origin (method git-fetch) @@ -2982,7 +2982,12 @@ (define-public tensorflow-lite (file-name (git-file-name name version)) (sha256 (base32 - "0jkgljdagdqllnxygl35r5bh3f9qmbczymfj357gm9krh59g2kmd")))) + "07g6vlrs0aayrg2mfdl15gxg5dy103wx2xlqkran15dib40nkbj6")) + (patches + (search-patches + ;; patch to disable local cmake build code for 3rdparty + ;; componentas + "tensorflow-lite-disable-local-cmake-3rdparty-components.patch")))) (build-system cmake-build-system) (arguments (list @@ -3025,6 +3030,7 @@ (define-public tensorflow-lite "-DTFLITE_ENABLE_XNNPACK=OFF" ;; Don't fetch the sources. We have these already + "-Dgemmlowp_POPULATED=TRUE" "-Degl_headers_POPULATED=TRUE" "-Dfp16_headers_POPULATED=TRUE" "-Dopencl_headers_POPULATED=TRUE" @@ -3037,7 +3043,9 @@ (define-public tensorflow-lite "-DFFT2D_SOURCE_DIR=/tmp/fft2d" "-DFARMHASH_SOURCE_DIR=/tmp/farmhash" - "-Dgemmlowp_SOURCE_DIR=/tmp/gemmlowp") + ;"-Dgemmlowp_SOURCE_DIR=/tmp/gemmlowp" + (string-append "-Dgemmlowp_ROOT=" #$(this-package-input "gemmlowp")) + ) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'chdir @@ -3069,8 +3077,10 @@ (define-public tensorflow-lite (invoke "tar" "--strip-components=1" "-xf" (assoc-ref inputs "fft2d-src"))) - (copy-recursively (assoc-ref inputs "gemmlowp-src") - "/tmp/gemmlowp/"))) + ;(copy-recursively (assoc-ref inputs "gemmlowp-src") + ; "/tmp/gemmlowp/") + + )) (add-after 'build 'build-shared-library (lambda* (#:key configure-flags #:allow-other-keys) @@ -3101,7 +3111,7 @@ (define-public tensorflow-lite ("eigen" ,eigen) ("fp16" ,fp16) ("flatbuffers-shared" ,flatbuffers-next-shared) - ;;("gemmlowp" ,gemmlowp) ; TODO + ("gemmlowp" ,gemmlowp) ("mesa-headers" ,mesa-headers) ("neon2sse" ,neon2sse) ("nsync" ,nsync) @@ -3117,19 +3127,19 @@ (define-public tensorflow-lite (native-inputs `(("pkg-config" ,pkg-config) ("googletest" ,googletest) - ("gemmlowp-src" - ;; The commit hash is taken from - ;; "tensorflow/lite/tools/cmake/modules/gemmlowp.cmake". - ,(let ((commit "fda83bdc38b118cc6b56753bd540caa49e570745")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/gemmlowp") - (commit commit))) - (file-name (git-file-name "gemmlowp" (string-take commit 8))) - (sha256 - (base32 - "1sbp8kmr2azwlvfbzryy1frxi99jhsh1nc93bdbxdf8zdgpv0kxl"))))) + ;("gemmlowp-src" + ; ;; The commit hash is taken from + ; ;; "tensorflow/lite/tools/cmake/modules/gemmlowp.cmake". + ; ,(let ((commit "fda83bdc38b118cc6b56753bd540caa49e570745")) + ; (origin + ; (method git-fetch) + ; (uri (git-reference + ; (url "https://github.com/google/gemmlowp") + ; (commit commit))) + ; (file-name (git-file-name "gemmlowp" (string-take commit 8))) + ; (sha256 + ; (base32 + ; "1sbp8kmr2azwlvfbzryy1frxi99jhsh1nc93bdbxdf8zdgpv0kxl"))))) ("farmhash-src" ,(let ((commit "816a4ae622e964763ca0862d9dbd19324a1eaf45")) (origin diff --git a/gnu/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch b/gnu/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch new file mode 100644 index 0000000000..c94540c3af --- /dev/null +++ b/gnu/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch @@ -0,0 +1,26 @@ +diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt +index 0476170e075..90abea00e8c 100644 +--- a/tensorflow/lite/CMakeLists.txt ++++ b/tensorflow/lite/CMakeLists.txt +@@ -564,7 +564,7 @@ set(_ALL_TFLITE_HDRS ${_ALL_TFLITE_SRCS}) + list(FILTER _ALL_TFLITE_HDRS INCLUDE REGEX ".*\\.h$") + target_include_directories(tensorflow-lite + PUBLIC $<BUILD_INTERFACE:${TENSORFLOW_SOURCE_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> +- ${CMAKE_BINARY_DIR}/gemmlowp ++ ${gemmlowp_ROOT}/include/gemmlowp + ) + target_link_libraries(tensorflow-lite + PUBLIC +diff --git a/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake b/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake +index 70331ad0a69..a9bd8a0f3bd 100644 +--- a/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake ++++ b/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake +@@ -18,7 +18,7 @@ + include(gemmlowp) + if(gemmlowp_POPULATED) + set(GEMMLOWP_FOUND TRUE) +- get_target_property(GEMMLOWP_INCLUDE_DIRS gemmlowp INTERFACE_DIRECTORIES) ++ #get_target_property(GEMMLOWP_INCLUDE_DIRS gemmlowp INTERFACE_DIRECTORIES) + set(GEMMLOWP_LIBRARIES + gemmlowp + gemmlowp_fixedpoint base-commit: e2e5df596f5e682d78043b12463cc47d14291ba9 -- 2.41.0
[Message part 3 (message/rfc822, inline)]
From: Ludovic Courtès <ludo <at> gnu.org> To: Andy Tai <atai <at> atai.org> Cc: 65835-done <at> debbugs.gnu.org Subject: Re: bug#65835: [PATCH] gnu: tensorflow-lite: Update to 2.13.0 Date: Mon, 18 Sep 2023 23:29:56 +0200[Message part 4 (text/plain, inline)]Hi, Andy Tai <atai <at> atai.org> skribis: > * gnu/packages/machine-learning.scm: (tensorflow-lite): > Update to 2.13.0 > [inputs]: Add gemmlowp > [native-inputs]: Remove gemmlowp-src > * gnu/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch: > New file > * gnu/local.mk (dist_patch_DATA): Add it. Applied with the changes below: shortening the patch file name (as reported by ‘guix lint’), fixing typos, removing leftover comments. Thanks, Ludo’.[Message part 5 (text/x-patch, inline)]diff --git a/gnu/local.mk b/gnu/local.mk index 85bdc19145..de3cb0332c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2003,7 +2003,7 @@ dist_patch_DATA = \ %D%/packages/patches/tcsh-fix-autotest.patch \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ - %D%/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch \ + %D%/packages/patches/tensorflow-lite-unbundle.patch \ %D%/packages/patches/texinfo-headings-single.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 23975dadf2..abba41626d 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3008,11 +3008,7 @@ (define-public tensorflow-lite (sha256 (base32 "07g6vlrs0aayrg2mfdl15gxg5dy103wx2xlqkran15dib40nkbj6")) - (patches - (search-patches - ;; patch to disable local cmake build code for 3rdparty - ;; componentas - "tensorflow-lite-disable-local-cmake-3rdparty-components.patch")))) + (patches (search-patches "tensorflow-lite-unbundle.patch")))) (build-system cmake-build-system) (arguments (list @@ -3068,7 +3064,6 @@ (define-public tensorflow-lite "-DFFT2D_SOURCE_DIR=/tmp/fft2d" "-DFARMHASH_SOURCE_DIR=/tmp/farmhash" - ;"-Dgemmlowp_SOURCE_DIR=/tmp/gemmlowp" (string-append "-Dgemmlowp_ROOT=" #$(this-package-input "gemmlowp"))) #:phases #~(modify-phases %standard-phases @@ -3145,19 +3140,6 @@ (define-public tensorflow-lite (native-inputs `(("pkg-config" ,pkg-config) ("googletest" ,googletest) - ;("gemmlowp-src" - ; ;; The commit hash is taken from - ; ;; "tensorflow/lite/tools/cmake/modules/gemmlowp.cmake". - ; ,(let ((commit "fda83bdc38b118cc6b56753bd540caa49e570745")) - ; (origin - ; (method git-fetch) - ; (uri (git-reference - ; (url "https://github.com/google/gemmlowp") - ; (commit commit))) - ; (file-name (git-file-name "gemmlowp" (string-take commit 8))) - ; (sha256 - ; (base32 - ; "1sbp8kmr2azwlvfbzryy1frxi99jhsh1nc93bdbxdf8zdgpv0kxl"))))) ("farmhash-src" ,(let ((commit "816a4ae622e964763ca0862d9dbd19324a1eaf45")) (origin diff --git a/gnu/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch b/gnu/packages/patches/tensorflow-lite-unbundle.patch similarity index 86% rename from gnu/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch rename to gnu/packages/patches/tensorflow-lite-unbundle.patch index 677a6be8c3..efd7d5bbc6 100644 --- a/gnu/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch +++ b/gnu/packages/patches/tensorflow-lite-unbundle.patch @@ -1,4 +1,4 @@ -Patch to disable local cmake build code for 3rdparty componentas +Disable local CMake build code for bundled 3rdparty components. diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt index 0476170e075..90abea00e8c 100644 @@ -17,12 +17,11 @@ diff --git a/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake b/tensorflow index 70331ad0a69..a9bd8a0f3bd 100644 --- a/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake +++ b/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake -@@ -18,7 +18,7 @@ +@@ -18,7 +18,6 @@ include(gemmlowp) if(gemmlowp_POPULATED) set(GEMMLOWP_FOUND TRUE) - get_target_property(GEMMLOWP_INCLUDE_DIRS gemmlowp INTERFACE_DIRECTORIES) -+ #get_target_property(GEMMLOWP_INCLUDE_DIRS gemmlowp INTERFACE_DIRECTORIES) set(GEMMLOWP_LIBRARIES gemmlowp gemmlowp_fixedpoint
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.