From patchwork Sat Sep 9 07:44:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 53683 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6B37027BBE9; Sat, 9 Sep 2023 08:46:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D49427BBE2 for ; Sat, 9 Sep 2023 08:46:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qesfK-0003fM-P8; Sat, 09 Sep 2023 03:46:02 -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 1qesfI-0003f7-7C for guix-patches@gnu.org; Sat, 09 Sep 2023 03:46:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qesfH-0008CE-OW for guix-patches@gnu.org; Sat, 09 Sep 2023 03:45:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qesfK-00076Y-4E for guix-patches@gnu.org; Sat, 09 Sep 2023 03:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65835] [PATCH] gnu: tensorflow-lite: Update to 2.13.0 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Sep 2023 07:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65835 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65835@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169424551327251 (code B ref -1); Sat, 09 Sep 2023 07:46:01 +0000 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 Date: Sat, 9 Sep 2023 00:44:48 -0700 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 base-commit: e2e5df596f5e682d78043b12463cc47d14291ba9 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