From patchwork Thu Nov 2 15:37:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55824 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 65DAA27BBEA; Thu, 2 Nov 2023 12:39:18 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 60C1327BBE2 for ; Thu, 2 Nov 2023 12:39:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyWxz-0003Op-Dp; Thu, 02 Nov 2023 08:38:31 -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 1qyWxx-0003O3-Td for guix-patches@gnu.org; Thu, 02 Nov 2023 08:38:30 -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 1qyWxx-0004y2-K9 for guix-patches@gnu.org; Thu, 02 Nov 2023 08:38:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyWyV-0001k5-UH; Thu, 02 Nov 2023 08:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66896] [PATCH 5/5] gnu: elemental: Update package style. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 12:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66896@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 66896-submit@debbugs.gnu.org id=B66896.16989287396657 (code B ref 66896); Thu, 02 Nov 2023 12:39:03 +0000 Received: (at 66896) by debbugs.gnu.org; 2 Nov 2023 12:38:59 +0000 Received: from localhost ([127.0.0.1]:54142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyWyR-0001jG-AN for submit@debbugs.gnu.org; Thu, 02 Nov 2023 08:38:59 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:44036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyWyP-0001i8-W5 for 66896@debbugs.gnu.org; Thu, 02 Nov 2023 08:38:58 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40837ebba42so5900655e9.0 for <66896@debbugs.gnu.org>; Thu, 02 Nov 2023 05:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698928697; x=1699533497; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+d3gicKbK2w8ei88sSOHOtq/wL/cVgvQsk+uSIHl790=; b=iOeh3mS4kbko1b76qLuLAoWLuLQdCdXE0nEJ9S22AOwTP0e4crlIdzjpL2AYVkQi9a k4Z1z9eBCQdUEzOTjKY95oEjgx38nivp/G9m48cDUgH4oHbqHYO0XFV8VDDfX9GjMLZk TqMuVdJEiZ4bg5HSpVn2r5tAIqOTLquRM24F2LdzLIBxIJujrkwE1iWHqvHye4a4cQAU 25ZBM7m9mHV0L92VFbQtEUVNIik+hmRWval+7prxsLMr8+c9kqrSKa/coaNpCwaky9Ea ZWxK16bbZd3JPipzhTGXVgVJBvvJCCHOmwOCNSOmagU/6CDUWFWdM8pcWJYTZj11+AzV mHxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698928697; x=1699533497; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+d3gicKbK2w8ei88sSOHOtq/wL/cVgvQsk+uSIHl790=; b=mi0FA5dvbl+Ok/oVDvgfjB4g8haUJMk9uxHSyQPFVyc8kuYKQzXJAPRlyJ/8BgcDK9 F0a80KFW81YBLQpP3zfxsxFo15wgoycFl60Erg6eLCWqd78ntA+Dx1NpbOB+qr0eCdwg waNMcadG4w11AbTVzef6KXO8zuxfzg/56Q6gFl06F3DAASr+3HQHYJPKnr7iQMwEw6Ei ms4Y0DTsVUctq+7JLMsJB/2ktAqKY5jA6A3+Pxy06/0bxHPqwW3W1DUKY8n0iXvTUhZv mUHCRQeSXfLTQ7dHIU5ocyCNSgu5StZdF5XC2x3AgUVeGD96u5axDqOM7Pnde0anJzqS s9sw== X-Gm-Message-State: AOJu0YzhP+n+8dDJQqPZJzXcJDPNX8D65b1kBh2HjZapQT3dfualjIBe XLEmcIedwoupS5BisxKdii2EnJ078qu5bQ== X-Google-Smtp-Source: AGHT+IHAFNpDgwKpLWYIVdpljIKImqOLOokPk0+uM+CPu4HbrC+XKA8V3McxJpOI+S97vp038UrXvg== X-Received: by 2002:adf:f4d1:0:b0:32d:a2c4:18bf with SMTP id h17-20020adff4d1000000b0032da2c418bfmr14128663wrp.59.1698928696991; Thu, 02 Nov 2023 05:38:16 -0700 (PDT) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id e12-20020adfe7cc000000b003143c9beeaesm2369671wrn.44.2023.11.02.05.38.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:38:16 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 2 Nov 2023 15:37:50 +0000 Message-ID: <25abffb2d0991e8a087f4b4f818cf3915431d22f.1698938938.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/maths.scm (elemental): Update package style, shift order of package fields. [arguments]: Use G-expressions. {phases}: Remove trailing #f from each lambda. Change-Id: Ib961eb99159e1206963041bd7014dca032a21441 --- gnu/packages/maths.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0ed25834f6..34710fc65c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7611,7 +7611,29 @@ (define-public elemental (base32 "06xcs4ic60ndcf2hq19gr8yjwdsnphpcyhapab41rkw726z4lm7p")))) (build-system cmake-build-system) - (home-page "https://github.com/elemental/Elemental") + (arguments + (list + #:build-type "Release" ;default RelWithDebInfo not supported + #:configure-flags + #~(list "-DEL_DISABLE_PARMETIS:BOOL=YES" + "-DEL_AVOID_COMPLEX_MPI:BOOL=NO" + "-DEL_CACHE_WARNINGS:BOOL=YES" + "-DEL_TESTS:BOOL=YES" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DGFORTRAN_LIB=gfortran") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'mpi-setup + #$%openmpi-setup) + (add-before 'check 'setup-tests + (lambda _ ;; Parallelism is done at the MPI layer. + (setenv "OMP_NUM_THREADS" "1"))) + (add-after 'install 'remove-tests + (lambda _ + ;; Tests are installed, with no easy configuration + ;; switch to prevent this, so delete them. + (delete-file-recursively + (string-append #$output "/bin/test"))))))) (native-inputs (list gfortran)) (inputs @@ -7624,29 +7646,7 @@ (define-public elemental openmpi qd openblas)) - (arguments - `(#:build-type "Release" ;default RelWithDebInfo not supported - #:configure-flags `("-DEL_DISABLE_PARMETIS:BOOL=YES" - "-DEL_AVOID_COMPLEX_MPI:BOOL=NO" - "-DEL_CACHE_WARNINGS:BOOL=YES" - "-DEL_TESTS:BOOL=YES" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DGFORTRAN_LIB=gfortran") - #:phases (modify-phases %standard-phases - (add-before 'check 'mpi-setup - ,%openmpi-setup) - (add-before 'check 'setup-tests - (lambda _ - ;; Parallelism is done at the MPI layer. - (setenv "OMP_NUM_THREADS" "1") - #t)) - (add-after 'install 'remove-tests - (lambda* (#:key outputs #:allow-other-keys) - ;; Tests are installed, with no easy configuration - ;; switch to prevent this, so delete them. - (delete-file-recursively - (string-append (assoc-ref outputs "out") "/bin")) - #t))))) + (home-page "https://github.com/elemental/Elemental") (synopsis "Dense and sparse-direct linear algebra and optimization") (description "Elemental is a modern C++ library for distributed-memory dense and sparse-direct linear algebra, conic optimization, and lattice