From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id kO8RI6TBCGV2qwAA9RJhRA:P1 (envelope-from ) for ; Mon, 18 Sep 2023 23:31:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id kO8RI6TBCGV2qwAA9RJhRA (envelope-from ) for ; Mon, 18 Sep 2023 23:31:16 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DEF9BE473 for ; Mon, 18 Sep 2023 23:31:15 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=BlZZyxZI; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695072676; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=9JMs+loSX0BV4zTqpO+tx0Ur0UoHPsVyMRQTe3rL5Gw=; b=ig7vfEjkM/cRO/Ob3Wl7wxxjduPYAOdetl6WP7QKNEmPbS5k6V7jyGEBsN9z58BZm0FxYS zaEgG+XZ6YJQtU1uOpKApnwtuOa5ROG3bjYCAp4lzCeoiwY6BOc7QVHPYgS6kIsXUZ/SQ+ mAObGwgl/fGVozh0mBfN2JzJqGzTqt3VcxBfU0+7jjo/FAQmjbvNy+d9VgiXQfBGbLY6fp D4KKjSovkslhzlE+bwo3W8lCWCvN88TyjgDwGMJlWQb95YsCtYjAM13dxIE63iwV4zC0YY K+QE1r57zRuMrfwovd+1tEcsPk2tJrk2zAXNcomTsbCUsdzSGAQilP5viUTkZg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695072676; a=rsa-sha256; cv=none; b=ddDasDB/PjYi655mgHhB8KeFzSazR+7gLHnAryZ9UkXF0pbeQMtqMYezfnsdI4VbvIA40B gWXfJYy7VUCPQlzDdgeg1KxsCMuzZH14oMAAT2zN7pkqXp+6DRfEP9T7eyJ32JscYirdAc daqzP+62iCbPKJ7Z1ZRoKEv0neJYRUeM1nkPuXDz4dHqd0h59aZSoBJTVVEaCzVGaZSuku E6ZD3xz2kBSss6gAZwrKJLRrUvvY1fRGsYAR+2g6eNJUbthnSfcZ+toqcihdzLidy71TfZ tvbCSBbEIrOb1yFHz+xjDAXZb8jsK3ukMdLNGD+3ZqC2zbOYq1CEXsuBXgBxUA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=BlZZyxZI; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiLpY-0001Zp-As; Mon, 18 Sep 2023 17:30:56 -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 1qiLpW-0001Yz-4F for guix-patches@gnu.org; Mon, 18 Sep 2023 17:30:54 -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 1qiLpV-0002S6-SX for guix-patches@gnu.org; Mon, 18 Sep 2023 17:30:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiLpd-0002QH-W6 for guix-patches@gnu.org; Mon, 18 Sep 2023 17:31:02 -0400 Subject: bug#65835: [PATCH] gnu: tensorflow-lite: Update to 2.13.0 Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 21:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 65835 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Andy Tai Cc: 65835-done@debbugs.gnu.org Mail-Followup-To: 65835@debbugs.gnu.org, ludo@gnu.org, atai@atai.org Received: via spool by 65835-done@debbugs.gnu.org id=D65835.16950726179244 (code D ref 65835); Mon, 18 Sep 2023 21:31:01 +0000 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= 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-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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.95 X-Spam-Score: -2.95 X-Migadu-Queue-Id: DEF9BE473 X-Migadu-Scanner: mx0.migadu.com X-TUID: m0QUfoTVFI6Y --=-=-= 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 --=-=-=--