From patchwork Sat Mar 23 22:04:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 62174 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 8B96F27BBE9; Sat, 23 Mar 2024 22:24:49 +0000 (GMT) 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,URIBL_BLOCKED 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 CD6F227BBE2 for ; Sat, 23 Mar 2024 22:24:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ro9mv-0000gE-E9; Sat, 23 Mar 2024 18:24:29 -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 1ro9mq-0000fD-KU for guix-patches@gnu.org; Sat, 23 Mar 2024 18:24:24 -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 1ro9mm-0003LD-Ol for guix-patches@gnu.org; Sat, 23 Mar 2024 18:24:23 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ro9nR-0007Cm-Si for guix-patches@gnu.org; Sat, 23 Mar 2024 18:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH v4 11/32] gnu: Remove flatbuffers-next-shared. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Mar 2024 22:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69591@debbugs.gnu.org Cc: David Elsing Received: via spool by 69591-submit@debbugs.gnu.org id=B69591.171123266427578 (code B ref 69591); Sat, 23 Mar 2024 22:25:01 +0000 Received: (at 69591) by debbugs.gnu.org; 23 Mar 2024 22:24:24 +0000 Received: from localhost ([127.0.0.1]:57427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ro9mp-0007Ai-T5 for submit@debbugs.gnu.org; Sat, 23 Mar 2024 18:24:24 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50537) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ro9mn-0007AI-EF for 69591@debbugs.gnu.org; Sat, 23 Mar 2024 18:24:22 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 8C20D240101 for <69591@debbugs.gnu.org>; Sat, 23 Mar 2024 23:05:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711231526; bh=aIisXm8T0hsg+K7iP/NvnCqFi8aWx7iJ8o8Mvctx5Vo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=cH5RX0jX+j3z6XBrp1USXY/dl+I34YLVipxuxnEwPoW2dEzdlz11M3bWgRQ2frgex RAIWJmnNTivPlQiMoiQqDXwYbgMvlKYzStDGKynFsRrsiMd/26YJnYUm/GvgKHAmXO A+9FnY01RwexkAtbKEhTPhSWmNgltG3vBWrs+9z9SQpBHCrHXMpcznSKwVghebmuWT hu5FLICKV7/M1Kg2DcFH3S2yjBrlHvWm9G4EB8Hfmn3G51dqw3xC/DwUeqBWs5rDx5 nSTD1GqAGKi99qiQI2lSIURM9UhYV30kmN9oUSonT6Ksa0LwjMOWpgl+KKGPaRyd/l A7RzFjC8uGzeA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V2CtZ1lnkz6tx0; Sat, 23 Mar 2024 23:05:26 +0100 (CET) From: David Elsing Date: Sat, 23 Mar 2024 22:04:50 +0000 Message-ID: <20240323220518.25063-11-david.elsing@posteo.net> In-Reply-To: <20240323214040.20221-1-david.elsing@posteo.net> References: <20240323214040.20221-1-david.elsing@posteo.net> MIME-Version: 1.0 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/serialization.scm (flatbuffers-next-shared): Delete variable. * gnu/packages/machine-learning.scm (tensorflow-lite)[arguments]: Use flatbuffers-next instead of flatbuffers-next-shared. --- gnu/packages/machine-learning.scm | 5 +++-- gnu/packages/serialization.scm | 11 ----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 003be7e3c6..c6aa394fbc 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2024 David Pflug ;;; Copyright © 2024 Timothee Mathieu ;;; Copyright © 2024 Spencer King +;;; Copyright © 2024 David Elsing ;;; ;;; This file is part of GNU Guix. ;;; @@ -3337,7 +3338,7 @@ (define-public tensorflow-lite (string-append "-DEigen3_DIR=" #$(this-package-input "eigen") "/share/eigen3/cmake") (string-append "-DFlatBuffers_DIR=" - #$(this-package-input "flatbuffers-shared") + #$(this-package-input "flatbuffers") "/lib/cmake/flatbuffers") (string-append "-DNEON_2_SSE_DIR=" #$(this-package-input "neon2sse") "/lib/cmake/NEON_2_SSE") @@ -3424,7 +3425,7 @@ (define-public tensorflow-lite ("cpuinfo" ,cpuinfo) ("eigen" ,eigen) ("fp16" ,fp16) - ("flatbuffers-shared" ,flatbuffers-next-shared) + ("flatbuffers" ,flatbuffers-next) ("gemmlowp" ,gemmlowp) ("mesa-headers" ,mesa-headers) ("neon2sse" ,neon2sse) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index bfee0dbfc6..405c4211da 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -890,17 +890,6 @@ (define-public flatbuffers-next (base32 "1z3a6l8g2y53i5xzraswfs2i0i3kk52zv7nzc2q3fgisbyiri3pz")))))) -(define-public flatbuffers-next-shared - (package - (inherit flatbuffers-next) - (name "flatbuffers-shared") - (version "23.1.21") - (arguments - (substitute-keyword-arguments (package-arguments flatbuffers-next) - ((#:configure-flags flags) - ;; Compile with -fPIC, needed for shared lib. - #~(cons "-DFLATBUFFERS_CXX_FLAGS=-fPIC" #$flags)))))) - (define-public python-flatbuffers (package (name "python-flatbuffers")