From unknown Mon Aug 18 11:19:01 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#65835 <65835@debbugs.gnu.org> To: bug#65835 <65835@debbugs.gnu.org> Subject: Status: [PATCH] gnu: tensorflow-lite: Update to 2.13.0 Reply-To: bug#65835 <65835@debbugs.gnu.org> Date: Mon, 18 Aug 2025 18:19:01 +0000 retitle 65835 [PATCH] gnu: tensorflow-lite: Update to 2.13.0 reassign 65835 guix-patches submitter 65835 Andy Tai severity 65835 normal tag 65835 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 09 03:45:13 2023 Received: (at submit) by debbugs.gnu.org; 9 Sep 2023 07:45:13 +0000 Received: from localhost ([127.0.0.1]:46015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeseX-00075S-7j for submit@debbugs.gnu.org; Sat, 09 Sep 2023 03:45:13 -0400 Received: from lists.gnu.org ([2001:470:142::17]:48626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeseQ-00074n-UI for submit@debbugs.gnu.org; Sat, 09 Sep 2023 03:45:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeseI-0003Z8-Ka for guix-patches@gnu.org; Sat, 09 Sep 2023 03:44:58 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeseF-0007wP-VU for guix-patches@gnu.org; Sat, 09 Sep 2023 03:44:58 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-68e4700c931so1696903b3a.3 for ; Sat, 09 Sep 2023 00:44:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694245494; x=1694850294; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=BzPfN4aHAWZwo7t9tUEz3IinqAtaOowwqxPi4bBijO0=; b=ZnbU6hJfl/dtW7W9X6asrAMQDsN6Mk0BH575JPsPLmkEKh38Pvv8HVFIkvT78IVmAr zHxxJ07dDml8x3SpMsW8RrUPf8xVMOTaO+6BHqBK3MfbRDiqf5k/0icpCJ9onNs4pFZ9 uMestmg4657IbwhqsZKTbEnWozsGAVgo/8zMUyn28kBWoLJizP9qZowFFC9I2+RRqntl Sh+63KWTy62eVM6zbdvdWBtw697l2Z0iqZHqK5OQU6P91eXXCyDXhsTxyHCvq5Y4z4Oz bbQxofWEt0IjTLJ7CfUApNxswNxZHRrgWgJSuCF67r33xF/SNKsLP4q+AGnz77QJUvgB l+OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694245494; x=1694850294; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=BzPfN4aHAWZwo7t9tUEz3IinqAtaOowwqxPi4bBijO0=; b=mGow+NZm0pHSsFrZjQbJgSPu8TPw9oWm/zymH7LVOVL5k22ZoBQ+nRfvVxZF1pI6IZ e+s2cn2RITqreui1I1ucBiVi/wo0Rjk2ky+c833ESozfPG4PgUjIsWFrP70i21djTORK bgtGGQFjbbCV3t7Gvt1oGy/cXO0JEKARo89Pb05NJrOP59gj+M3c7IUjSPTmysLfGrs+ Pe6O8yrBJvyGBTO5df4pEVBkVKvpZXNruvoUJ1w5SrXIe83z7NXQqLyBa/62puFWnp1o 8Ww2yz1y14tOp390poTF9ftV/t22llg4P+duJI23rflEOSYtB9pa3SGgkBqmk2JgXIdx kdww== X-Gm-Message-State: AOJu0YyHO9ZM+/nLswCLgNsV462fYHZmf+9TgJfqfBB8kKSoJNlR4ypU 1AJvEhdJGmSEutYogXb79dtOQyEsczy+7g== X-Google-Smtp-Source: AGHT+IE3Gw4hunzQTfjc1I90KELxuP4XxzCKculyZPrSXBPx1zwjkdk7NG0tju1XMNt5mau0D27Gng== X-Received: by 2002:a05:6a00:2290:b0:68e:4a09:2d29 with SMTP id f16-20020a056a00229000b0068e4a092d29mr5146369pfe.22.1694245494066; Sat, 09 Sep 2023 00:44:54 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id fa5-20020a056a002d0500b0068fadc52a98sm28689pfb.30.2023.09.09.00.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Sep 2023 00:44:53 -0700 (PDT) From: Andy Tai To: guix-patches@gnu.org Subject: [PATCH] gnu: tensorflow-lite: Update to 2.13.0 Date: Sat, 9 Sep 2023 00:44:48 -0700 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=lichengtai@gmail.com; helo=mail-pf1-x42e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 [...] Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lichengtai[at]gmail.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different X-Debbugs-Envelope-To: submit Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) * 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 $ $ +- ${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 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 10 03:24:02 2023 Received: (at 65835) by debbugs.gnu.org; 10 Sep 2023 07:24:02 +0000 Received: from localhost ([127.0.0.1]:48872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfEnZ-0003lV-6n for submit@debbugs.gnu.org; Sun, 10 Sep 2023 03:24:02 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:42095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfEnV-0003lB-KC for 65835@debbugs.gnu.org; Sun, 10 Sep 2023 03:24:00 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-271b102659fso2282833a91.0 for <65835@debbugs.gnu.org>; Sun, 10 Sep 2023 00:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694330628; x=1694935428; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=A0bBpa+rf/wBMGQ3E/hp6kj2J5QSTRzrFC14YffPiAQ=; b=DnAlI8doYY2eJokzJ0TZdsGNu/1rf+o11ctr92LDtwqT0TA7AUA7nqyuH9h8zE+vGl +Hp5jEYP4NXdswGLsUzk30v9AX4VJLPTYvKC1m8Zu3IawaPvWVzR/Xadfpli/r388Ujl HUNQJyN/tIucrav3hThwnDSIbZSbtKjEoYXyhseU4dfhjWYby9WbkfF1UdAtjtpF9wga 4J5LMgwVUwE7Ix8KXTraXG3BsF5geASecMBPApgmu7b7suzbMqSun7G7HjT6YZIuV6n7 1wwqeR8myHRydWrhhq3EmSuH3N/DQjHAMOtD+Qzw7alGTZhNqUxtDRS1MvoXuZLZsxda Crxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694330628; x=1694935428; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=A0bBpa+rf/wBMGQ3E/hp6kj2J5QSTRzrFC14YffPiAQ=; b=qbcBM4OwpRzHw8jnCaudbIXnndTIjnhI9os5NwzXB7CahNaVOJHLaIDlfW4annCbTm ODZzOhriY4dRRQ2lGv1OPEhecofM+x8l8TGm/1tIC2tXDbhMpw5NZKHVIJjyVkT0CWkh FCgR4ISndx239rGvn80ay8Y8qEvgoFAhhXkg3hOOWPWgH+wZhYJPaka390MOGwT7TGF7 Cz5J1NvONCPw4GB75Kj+bI/O6g56bsiy9DyAiBqgFs1YJiiYF9CcUGk4GHiRsNgz/zR2 KvXdslfZZL+PgvgF+KQ06NVHqZnJ9mJUDLxu4zdNhcw6h9voShNQ/cJr7Rx2W8M8rhmJ wtgw== X-Gm-Message-State: AOJu0YwuJCvCZROyqb2mFQoFDci0CD+rAj87t6sYLy3k9FGmVEWcdwKw T0g85dMo1Wz3xp3RLhxd+0FtPlsP5TyHaA== X-Google-Smtp-Source: AGHT+IGoGc7zmKtnLAGBQRKHjZkypqMv+4tKsYoWZ2E3kUZGZDdCeC8Lo39kSJVoaiUDKKjhl51TwA== X-Received: by 2002:a17:90a:17c9:b0:263:f521:da3e with SMTP id q67-20020a17090a17c900b00263f521da3emr8836943pja.2.1694330627821; Sun, 10 Sep 2023 00:23:47 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id i8-20020a17090a2ac800b002696aeb72e5sm5930025pjg.2.2023.09.10.00.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Sep 2023 00:23:47 -0700 (PDT) From: Andy Tai To: 65835@debbugs.gnu.org Subject: [PATCH v2] gnu: tensorflow-lite: Update to 2.13.0 Date: Sun, 10 Sep 2023 00:23:42 -0700 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 65835 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * 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 | 47 +++++++------- ...able-local-cmake-3rdparty-components.patch | 62 +++++++++++++++++++ 2 files changed, 85 insertions(+), 24 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..fd6089a525 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,11 +2982,15 @@ (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 - #:tests? #false ;tests are not building now #:build-type "Release" #:modules '((ice-9 match) (guix build utils) @@ -3005,11 +3009,11 @@ (define-public tensorflow-lite ;; TODO: turn on Farmhash ;;"-DSYSTEM_FARMHASH=ON" - (string-append "-Dabsl_DIR=" #$(this-package-input "abseil-cpp") + (string-append "-Dabseil-cpp_DIR=" #$(this-package-input "abseil-cpp") "/lib/cmake/absl") (string-append "-DEigen3_DIR=" #$(this-package-input "eigen") "/share/eigen3/cmake") - (string-append "-DFlatBuffers_DIR=" + (string-append "-Dflatbuffers_DIR=" #$(this-package-input "flatbuffers-shared") "/lib/cmake/flatbuffers") (string-append "-DNEON_2_SSE_DIR=" #$(this-package-input "neon2sse") @@ -3025,6 +3029,9 @@ (define-public tensorflow-lite "-DTFLITE_ENABLE_XNNPACK=OFF" ;; Don't fetch the sources. We have these already + "-Dabseil-cpp_POPULATED=TRUE" + "-Dflatbuffers_POPULATED=TRUE" + "-Dgemmlowp_POPULATED=TRUE" "-Degl_headers_POPULATED=TRUE" "-Dfp16_headers_POPULATED=TRUE" "-Dopencl_headers_POPULATED=TRUE" @@ -3037,7 +3044,10 @@ (define-public tensorflow-lite "-DFFT2D_SOURCE_DIR=/tmp/fft2d" "-DFARMHASH_SOURCE_DIR=/tmp/farmhash" - "-Dgemmlowp_SOURCE_DIR=/tmp/gemmlowp") + (string-append "-Dabseil-cpp_ROOT=" #$(this-package-input "abseil-cpp")) + (string-append "-Dflatbuffers_ROOT=" #$(this-package-input "flatbuffers-shared")) + (string-append "-Dgemmlowp_ROOT=" #$(this-package-input "gemmlowp")) + ) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'chdir @@ -3069,8 +3079,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) @@ -3096,12 +3108,12 @@ (define-public tensorflow-lite (when tests? (invoke "ctest" "-L" "plain"))))))) (inputs - `(("abseil-cpp" ,abseil-cpp-20200923.3) + `(("abseil-cpp" ,abseil-cpp) ("cpuinfo" ,cpuinfo) ("eigen" ,eigen) ("fp16" ,fp16) ("flatbuffers-shared" ,flatbuffers-next-shared) - ;;("gemmlowp" ,gemmlowp) ; TODO + ("gemmlowp" ,gemmlowp) ("mesa-headers" ,mesa-headers) ("neon2sse" ,neon2sse) ("nsync" ,nsync) @@ -3117,21 +3129,8 @@ (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")) + ,(let ((commit "0d859a811870d10f53a594927d0d0b97573ad06d")) (origin (method url-fetch) (uri (string-append 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..eb1cc76db6 --- /dev/null +++ b/gnu/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch @@ -0,0 +1,62 @@ +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 $ $ +- ${CMAKE_BINARY_DIR}/gemmlowp ++ ${gemmlowp_ROOT}/include/gemmlowp + ) + target_link_libraries(tensorflow-lite + PUBLIC +diff --git a/tensorflow/lite/kernels/CMakeLists.txt b/tensorflow/lite/kernels/CMakeLists.txt +index 57ed10d7e64..b45b5d1df82 100644 +--- a/tensorflow/lite/kernels/CMakeLists.txt ++++ b/tensorflow/lite/kernels/CMakeLists.txt +@@ -25,11 +25,13 @@ set(SCHEMA_GENERATED_PATH ${SCHEMA_GENERATED_ROOT}/tensorflow/lite/schema/mutabl + set(SCHEMA_GENERATED_FILE ${SCHEMA_GENERATED_PATH}/schema_generated.h) + + # Use the util function in flatbuffer to generate the schema header. ++list(APPEND CMAKE_MODULE_PATH "${flatbuffers_DIR}") + include(BuildFlatBuffers) + + # For cross-compilation purposes a natively compiled 'flatc' compiler is required + if(${CMAKE_CROSSCOMPILING}) + set(FLATC_PATHS ++ ${flatbuffers_ROOT}/bin + ${TFLITE_HOST_TOOLS_DIR} + ${TFLITE_HOST_TOOLS_DIR}/bin + ${TFLITE_HOST_TOOLS_DIR}/flatbuffers-flatc/bin +@@ -43,7 +45,7 @@ if(${CMAKE_CROSSCOMPILING}) + set(FLATBUFFERS_FLATC_EXECUTABLE ${FLATC_BIN}) + endif() + else() +- set(FLATBUFFERS_FLATC_EXECUTABLE ${CMAKE_BINARY_DIR}/flatbuffers-flatc/bin/flatc) ++ set(FLATBUFFERS_FLATC_EXECUTABLE ${flatbuffers_ROOT}/bin/flatc) + endif() + + set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS +@@ -55,7 +57,7 @@ build_flatbuffers( + "${SCHEMA_FILE}" + "" + mutable_schema_file +- flatbuffers-flatc ++ ${FLATBUFFERS_FLATC_EXECUTABLE} + "${SCHEMA_GENERATED_PATH}" + "" + "" +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: 5db78e7c1b06d1b4892bdb3e153b95b21577271e -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 14 17:42:57 2023 Received: (at 65835) by debbugs.gnu.org; 14 Sep 2023 21:42:57 +0000 Received: from localhost ([127.0.0.1]:41377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgu6z-0002qI-75 for submit@debbugs.gnu.org; Thu, 14 Sep 2023 17:42:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgu6v-0002q2-D5 for 65835@debbugs.gnu.org; Thu, 14 Sep 2023 17:42:55 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgu6h-0003YB-Lq; Thu, 14 Sep 2023 17:42:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=Jw9jP6CH2Eb0tDmj+DVYdbpfz2KM+E+eVxvIsx/kNrI=; b=rUe/J+ItRyAOSAKb1dNj ytQeoKRH+QxDXE4c8/SELRYxMdEWTisaNjFk9YtktfowH5zwA3O/twmD1w3mbYWAMnY4nmud8Z9sC X0Wf3G3mXcn6iuZayi4VJdsiWEZXJyoJedlh4thMvw0p3kA5JX/rwfUgh0DGmC0G8znc8EJ90ke+x dyhWnePsb0NUlAUFPNuHuluUWsq43Hb+77c53IrHthilErCx0YCnUEAyF51RT5uZd8ekeIRfd+94e sxB9ZnoxA+7vwWfhvT5nNi01bV66DoRhq8tRfuUHSk7U95zWdyu1Br2LyxoQ4QjyQc5Sfw/MvfvKk u5qp1OzHlKocEw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Andy Tai Subject: Re: bug#65835: [PATCH] gnu: tensorflow-lite: Update to 2.13.0 References: Date: Thu, 14 Sep 2023 23:42:18 +0200 In-Reply-To: (Andy Tai's message of "Sun, 10 Sep 2023 00:23:42 -0700") Message-ID: <87ttrw3005.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65835 Cc: 65835@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Andy Tai 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-compo= nents.patch: > New file Overall LGTM. Some comments=E2=80=A6 Could you add the patch to =E2=80=98gnu/local.mk=E2=80=99? > + (patches > + (search-patches > + ;; patch to disable local cmake build code for 3rdparty > + ;; componentas > + "tensorflow-lite-disable-local-cmake-3rdparty-components= .patch")))) Please add the comment at the top of the patch itself, as reported by =E2=80=98guix lint=E2=80=99; also adjust indentation here as in the other f= iles. > + (string-append "-Dgemmlowp_ROOT=3D" #$(this-package-input "gemm= lowp")) > + ) Please move paren to the previous line. > (invoke "tar" "--strip-components=3D1" > "-xf" (assoc-ref inputs "fft2d-src"))) >=20=20 > - (copy-recursively (assoc-ref inputs "gemmlowp-src") > - "/tmp/gemmlowp/"))) > + ;(copy-recursively (assoc-ref inputs "gemmlowp-src") > + ; "/tmp/gemmlowp/") > + > + )) Leftover? You can remove these two lines. Could you send an updated patch? Thanks in advance, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 14 17:50:22 2023 Received: (at 65835) by debbugs.gnu.org; 14 Sep 2023 21:50:22 +0000 Received: from localhost ([127.0.0.1]:41388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qguE9-0005mD-H0 for submit@debbugs.gnu.org; Thu, 14 Sep 2023 17:50:21 -0400 Received: from mail-ot1-x32f.google.com ([2607:f8b0:4864:20::32f]:61864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qguE4-0005lt-50 for 65835@debbugs.gnu.org; Thu, 14 Sep 2023 17:50:19 -0400 Received: by mail-ot1-x32f.google.com with SMTP id 46e09a7af769-6c0c6370e5eso846210a34.3 for <65835@debbugs.gnu.org>; Thu, 14 Sep 2023 14:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atai-org.20230601.gappssmtp.com; s=20230601; t=1694728204; x=1695333004; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=5GzvHwKQzkyF9e6i3zzQxwFk3n2kT+WLFiY2ycgMZTY=; b=Jbmd6qDiAIgfDyiqBWJTYSHkyUtxTdlnOEIysX8Lmauko2cLdDK3NOTjRXyrtUWZR9 oolaAYhUv7KRaVRV7mU7zEwzxmr2zhLLpEuz1JuB0C0/gL3z/xKSrgXmqeYl2TdfVK+K byuCryYc+vrO+5/Jedjk3wobOJbJgQRJPGso8aOdZjyjh8BKneCLcj0YJChepHW+exsK 57QCkTy35t+Slsf0soN1IcGuHJAxwU00Upc9ZJ5mxnKPu2ogj//Iqd7AxMgYlgaQcuAc Z6Rsmx9RTVq7dcMN/aVWj6JTH2QiHkOrptAnVvuy+LVErLGz+xfa8rLK2Jk92/v9V548 +QnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694728204; x=1695333004; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5GzvHwKQzkyF9e6i3zzQxwFk3n2kT+WLFiY2ycgMZTY=; b=fSr9xd9uRST9P9OcqN1pHCvTN3bxfvXQKX6mmh0eon78s6SlXOf65tUTt6Yg7cqqKn cpWQg7pvCPLhoB8m3V8dPk00nwUkRxIvpFZT1EYh0uNBCfRh53FFuyI5G7lXKVVC/Qkm Xh2gNh77ZHL5sXEhONnoo5dg2diwmQu9bvlLNuawbVg6qrvfCAwlMU6ESosGuwPzx++V WrA6gkmX80IIQg1WgRoP7ldNmvTlNEkcS8NP/bOrkLq3wUMnt3XMFGnof14BdkTj7/DA 6uU0IxfQ9nIqAdlp/agoBIKikRiHwZbbbd81FvjRwp13ditfYpORPZyqGAdJ7/VIVGit 0B1w== X-Gm-Message-State: AOJu0YwvgcNKu8XU8lhlElLh0bQRpMXaQozjjAtqaus71cx0VxYUKusV pD96JsZOhE57NnFSH5u7pNTmfFZp5uZa/dADGTRq6ngfzNE= X-Google-Smtp-Source: AGHT+IGlMe1Smjw693whqb/eyx9G4ASL9Qg4tIMT0qQujTMddIhMNZem3P2WforJkT7JcVuGU81107gXMVTWtizi/NM= X-Received: by 2002:a05:6830:e86:b0:6b9:b226:d08e with SMTP id dp6-20020a0568300e8600b006b9b226d08emr6734928otb.34.1694728204419; Thu, 14 Sep 2023 14:50:04 -0700 (PDT) MIME-Version: 1.0 References: <87ttrw3005.fsf_-_@gnu.org> In-Reply-To: <87ttrw3005.fsf_-_@gnu.org> From: Andy Tai Date: Thu, 14 Sep 2023 14:49:28 -0700 Message-ID: Subject: Re: bug#65835: [PATCH] gnu: tensorflow-lite: Update to 2.13.0 To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Content-Type: multipart/alternative; boundary="0000000000009d86cd060558a876" X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 65835 Cc: 65835@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) --0000000000009d86cd060558a876 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable will do. On Thu, Sep 14, 2023 at 2:42=E2=80=AFPM Ludovic Court=C3=A8s = wrote: > Hi, > > Andy Tai 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-compone= nts.patch: > > New file > > Overall LGTM. Some comments=E2=80=A6 > > Could you add the patch to =E2=80=98gnu/local.mk=E2=80=99? > > > + (patches > > + (search-patches > > + ;; patch to disable local cmake build code for 3rdpart= y > > + ;; componentas > > + > "tensorflow-lite-disable-local-cmake-3rdparty-components.patch")))) > > Please add the comment at the top of the patch itself, as reported by > =E2=80=98guix lint=E2=80=99; also adjust indentation here as in the other= files. > > > + (string-append "-Dgemmlowp_ROOT=3D" #$(this-package-input > "gemmlowp")) > > + ) > > Please move paren to the previous line. > > > (invoke "tar" "--strip-components=3D1" > > "-xf" (assoc-ref inputs "fft2d-src"))) > > > > - (copy-recursively (assoc-ref inputs "gemmlowp-src") > > - "/tmp/gemmlowp/"))) > > + ;(copy-recursively (assoc-ref inputs "gemmlowp-src") > > + ; "/tmp/gemmlowp/") > > + > > + )) > > Leftover? You can remove these two lines. > > Could you send an updated patch? > > Thanks in advance, > Ludo=E2=80=99. > --=20 Andy Tai, atai@atai.org, Skype: licheng.tai, Line: andy_tai, WeChat: andytai1010 Year 2023 =E6=B0=91=E5=9C=8B112=E5=B9=B4 =E8=87=AA=E5=8B=95=E7=9A=84=E7=B2=BE=E7=A5=9E=E5=8A=9B=E6=98=AF=E4=BF=A1=E4= =BB=B0=E8=88=87=E8=A6=BA=E6=82=9F =E8=87=AA=E5=8B=95=E7=9A=84=E8=A1=8C=E7=82=BA=E5=8A=9B=E6=98=AF=E5=8B=9E=E5= =8B=95=E8=88=87=E6=8A=80=E8=83=BD --0000000000009d86cd060558a876 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
will do.

=
On Thu, Sep 14, 2023 at 2:42=E2=80=AF= PM Ludovic Court=C3=A8s <ludo@gnu.org> wrote:
Hi,=

Andy Tai <atai@atai.o= rg> 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-co= mponents.patch:
> New file

Overall LGTM.=C2=A0 Some comments=E2=80=A6

Could you add the patch to =E2=80=98gnu/local.mk=E2=80=99?

> +=C2=A0 =C2=A0 =C2=A0 =C2=A0(patches
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(search-patche= s
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ;; patch to d= isable local cmake build code for 3rdparty
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ;; componenta= s
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "tensorf= low-lite-disable-local-cmake-3rdparty-components.patch"))))

Please add the comment at the top of the patch itself, as reported by
=E2=80=98guix lint=E2=80=99; also adjust indentation here as in the other f= iles.

> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(string-append "-Dgemmlowp_ROO= T=3D" #$(this-package-input "gemmlowp"))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0)

Please move paren to the previous line.

>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (invoke = "tar" "--strip-components=3D1"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 "-xf" (assoc-ref inputs "fft2d-src"= ;)))
>=C2=A0
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (copy-recursively (a= ssoc-ref inputs "gemmlowp-src")
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "/tmp/gemmlowp/"))) > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ;(copy-recursively (= assoc-ref inputs "gemmlowp-src")
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ;=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "/tmp/gemmlowp/") > +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ))

Leftover?=C2=A0 You can remove these two lines.

Could you send an updated patch?

Thanks in advance,
Ludo=E2=80=99.


--
=
Andy Tai, atai@atai.org, Skype: li= cheng.tai, Line: andy_tai, WeChat: andytai1010
Year 2023 =E6=B0=91=E5=9C= =8B112=E5=B9=B4
=E8=87=AA=E5=8B=95=E7=9A=84=E7=B2=BE=E7=A5=9E=E5=8A=9B= =E6=98=AF=E4=BF=A1=E4=BB=B0=E8=88=87=E8=A6=BA=E6=82=9F
=E8=87=AA=E5=8B= =95=E7=9A=84=E8=A1=8C=E7=82=BA=E5=8A=9B=E6=98=AF=E5=8B=9E=E5=8B=95=E8=88=87= =E6=8A=80=E8=83=BD
--0000000000009d86cd060558a876-- From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 15 01:21:16 2023 Received: (at 65835) by debbugs.gnu.org; 15 Sep 2023 05:21:16 +0000 Received: from localhost ([127.0.0.1]:41798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh1GV-0003Hg-ER for submit@debbugs.gnu.org; Fri, 15 Sep 2023 01:21:15 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:62864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh1GS-0003HA-BF for 65835@debbugs.gnu.org; Fri, 15 Sep 2023 01:21:14 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-68cbbff84f6so2072608b3a.1 for <65835@debbugs.gnu.org>; Thu, 14 Sep 2023 22:21:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694755260; x=1695360060; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=hG9cck9mSvBxpZ0rJlSJKrOC+BXK/eYQKlsn/uH+iac=; b=NtiI2xhUM0aayBi552IM6/EMwKULMsJYil8CSoRHBDVr4aBCu+4TqqZmonwp2W/MiU EE1gW/z2f58EitKyR6v66LfX/+uBWENJy50/6Df7FfO+BAEOp0BcMhpoxFcKWTEStRn1 uk8SyvPEQnCBFPBDyX4HbCHcIKo1amoDgfHvmTvOK3ajLSKri+lrR9XLEWdifAPJ4Iav 5IskTVhLIW4l98cTcG7GL/ivifve3WiZelxi2XfRcFCPjc01MKminQ2YOvEuYhSJ9JWQ u92kH50uyQKKLScHmnvFr/gamv4DKo5V5C0FRXLr9lcHbfbfhbaRnpWAsV2nNSQqmZcS loJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694755260; x=1695360060; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=hG9cck9mSvBxpZ0rJlSJKrOC+BXK/eYQKlsn/uH+iac=; b=hbcreQQkzZmwLYn5DNPQjSFykOTB5t2BZHUuN0ytzp6GubeTJ8Nn7aKRDFbck8cI4t 2HB3hw1adim48LYsDEYC+FSOMm7qn4SdGQxX2+yHLZaEL8Dx52sUd5FyRPiIzcoah3Ga dXuApeLcilZGHCKjDPOBcyHUJTEqmqSE7yF9t4Y2620sKFFRDi5813UmdXJQrm3Ekont a33mb2doqJKsThPeTftBk9eQxxg62m06pXgb0RnG3fnHjBQ5SAlmhTom1aAP9niHcC0v wYVGgGi2XA3u5MfOHER8WJEiNJvieVQunyEASwaToMVPvUhKfI8AyJg9l0zdfqnc+aqS XN3w== X-Gm-Message-State: AOJu0YwRu7JA2u1k9v4M1KbIrh3teO3h1WwwXEnGQlJ2bqp1f9zfhk19 2TG6ij5em9hTaOaGjxNYtnhZl0syaKggiw== X-Google-Smtp-Source: AGHT+IFubpmqPPYEsDBWQAENyjDag2FhB3c31KqOWJMiZNq5M9Ezj4WHYb5hEehd52wG8aR40z628w== X-Received: by 2002:a17:903:32c4:b0:1bb:c896:1d91 with SMTP id i4-20020a17090332c400b001bbc8961d91mr5382090plr.31.1694755259874; Thu, 14 Sep 2023 22:20:59 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id l21-20020a170902d35500b001ab39cd875csm2497965plk.133.2023.09.14.22.20.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 22:20:59 -0700 (PDT) From: Andy Tai To: 65835@debbugs.gnu.org, ludo@gnu.org Subject: [PATCH v2] gnu: tensorflow-lite: Update to 2.13.0 Date: Thu, 14 Sep 2023 22:20:55 -0700 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 65835 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * 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. --- gnu/local.mk | 1 + gnu/packages/machine-learning.scm | 49 ++++++++++--------- ...able-local-cmake-3rdparty-components.patch | 28 +++++++++++ 3 files changed, 55 insertions(+), 23 deletions(-) create mode 100644 gnu/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8862fbfbb9..0af5e1498b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2002,6 +2002,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/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 fd0be8d500..bd94c9a540 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,8 @@ (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 @@ -3067,11 +3074,7 @@ (define-public tensorflow-lite (mkdir-p "/tmp/fft2d") (with-directory-excursion "/tmp/fft2d" (invoke "tar" "--strip-components=1" - "-xf" (assoc-ref inputs "fft2d-src"))) - - (copy-recursively (assoc-ref inputs "gemmlowp-src") - "/tmp/gemmlowp/"))) - + "-xf" (assoc-ref inputs "fft2d-src"))))) (add-after 'build 'build-shared-library (lambda* (#:key configure-flags #:allow-other-keys) (mkdir-p "c") @@ -3101,7 +3104,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 +3120,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 @@ -3151,7 +3154,7 @@ (define-public tensorflow-lite (sha256 (base32 "1jfflzi74fag9z4qmgwvp90aif4dpbr1657izmxlgvf4hy8fk9xd")))))) - (home-page "https://tensorflow.org") + (home-page "https://www.tensorflow.org") (synopsis "Machine learning framework") (description "TensorFlow is a flexible platform for building and training machine 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..677a6be8c3 --- /dev/null +++ b/gnu/packages/patches/tensorflow-lite-disable-local-cmake-3rdparty-components.patch @@ -0,0 +1,28 @@ +Patch to disable local cmake build code for 3rdparty componentas + +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 $ $ +- ${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: 0c1aa354048f82023e6d2043bfecc4fd58bc9b58 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 18 17:30:17 2023 Received: (at 65835-done) by debbugs.gnu.org; 18 Sep 2023 21:30:17 +0000 Received: from localhost ([127.0.0.1]:54816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiLou-0002P2-Sd for submit@debbugs.gnu.org; Mon, 18 Sep 2023 17:30:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiLos-0002Oh-3f for 65835-done@debbugs.gnu.org; Mon, 18 Sep 2023 17:30:15 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiLod-0001re-KQ; Mon, 18 Sep 2023 17:29:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=9JMs+loSX0BV4zTqpO+tx0Ur0UoHPsVyMRQTe3rL5Gw=; b=BlZZyxZI7AFmXuCZX8qu 3JEtg7oF0i7vz7s6HBRrcZJE6p/BTJ44GoGC6YFvVZGz3F/6KlX3ovCcW1GKSDe9m38C+fPX14n03 vmNkjMoO3HnIeE4aHt9QmqtvSeynes3oCIxflhvDON/FKkz6vVd9Bj+D1PVM7dlTLCvlOUO1Eoj0e HqvvkQ8s386EToxyRa/hJ8vPVXqZivsdQx+3uxFo7wuUTotqyqLjx4f5Am+p0hQQWPhRdumr/RHfZ kdISHGSfkQJvdU5cneqgiUib0mXw9Y+lwPSE24lJ+BdOe5x2gZ7WlQg7xgX9JQdtmOleqfMunoOQz tboxO/dGFLloXw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Andy Tai Subject: Re: bug#65835: [PATCH] gnu: tensorflow-lite: Update to 2.13.0 References: Date: Mon, 18 Sep 2023 23:29:56 +0200 In-Reply-To: (Andy Tai's message of "Thu, 14 Sep 2023 22:20:55 -0700") Message-ID: <87h6nrgoff.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65835-done Cc: 65835-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Andy Tai 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-compo= nents.patch: > New file > * gnu/local.mk (dist_patch_DATA): Add it. Applied with the changes below: shortening the patch file name (as reported by =E2=80=98guix lint=E2=80=99), fixing typos, removing leftover c= omments. Thanks, Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: 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 --=-=-=-- From unknown Mon Aug 18 11:19:01 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 17 Oct 2023 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator