From patchwork Sat Nov 4 01:58:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55901 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 883B627BBED; Fri, 3 Nov 2023 23:01:01 +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 E170827BBEA for ; Fri, 3 Nov 2023 23:00:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qz39W-0001e4-Jq; Fri, 03 Nov 2023 19:00:34 -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 1qz39T-0001dB-NR for guix-patches@gnu.org; Fri, 03 Nov 2023 19:00:32 -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 1qz39S-0002hi-2B for guix-patches@gnu.org; Fri, 03 Nov 2023 19:00:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qz39z-000484-OD; Fri, 03 Nov 2023 19:01:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66896] [PATCH v2 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: Fri, 03 Nov 2023 23:01: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.169905241915776 (code B ref 66896); Fri, 03 Nov 2023 23:01:03 +0000 Received: (at 66896) by debbugs.gnu.org; 3 Nov 2023 23:00:19 +0000 Received: from localhost ([127.0.0.1]:60006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qz39G-00046N-P4 for submit@debbugs.gnu.org; Fri, 03 Nov 2023 19:00:19 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:52251) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qz38z-000435-QL for 66896@debbugs.gnu.org; Fri, 03 Nov 2023 19:00:17 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-408382da7f0so18942525e9.0 for <66896@debbugs.gnu.org>; Fri, 03 Nov 2023 15:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699052360; x=1699657160; 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=Q+8w32el0qDlsaG+YwYuN8JuCOv7aWtQTSSgnycPL8L4weGM5dp4utbq2XVQcrsobu id7QsjP57xPJD2wgdiyzxTozka5IA/iSMWFnYK890w/rihmOOFT/ABcNUtpTtLRthLjI K066b9YbPKy7LmdIlofguVjOuZIMqfoaYY8w2YbXfZvDpZoDRnbsLRs5hovtFRWsAn+W Uv0LFo+Ns3EpD+gbnnnmRWr1gh+qpbQ4lUGReT+8pCMR6Mlkz/uVpXr84tE8vOXzx7q1 QDSoDHxNKdfsMIyPUhYgI1M1+TF5shcr8Utp0+WkrN4TgDV+R0fsGYIEb9pB77TFgogm or4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699052360; x=1699657160; 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=VUteOM2ivt4PX6nKPpr66zMzUlqtbMhch4puxfH7nves3S79uFxgOvtG15NlEtVzTD 9FQFCy+kybHI6KDygO3t/r6zju2Cm8mNXU/q+daNb6xKCRV9RyOrwV/9UVCRH+qkpzpe k03H5DFQlvkC8RqvfINbhpAY1RywktnBHBMFMNYjvBoAktHgrE4HZAXfRHKFjBdlYZK5 g5ntl/jFPvfcOiDY/eZQ9iIL2lJfAQ8U4cw30XClkA3q/OSq8sTANOBXJYfGGxOquVjq sbs9wL+dp5ascqmhh5WhCyiOdkOODR9SoEE/edqr9NNM/3zQVpRIIg0eTN5FvQCllCQ/ NhKw== X-Gm-Message-State: AOJu0YxR6wfR8cGSiLODPVe0LJqMGp9otOP9icb5oI0iC/HOM2RFwNHJ FU3fE/WNWZtza3RSe1T6s6TEqsiQ0M764Q== X-Google-Smtp-Source: AGHT+IGSD8fjWws6824JNzbxdU3js7rNU1ihCga4aoS7MQGwfKNnfTAQHsz79RUOtMzBrkv3uhd7zw== X-Received: by 2002:a5d:4c45:0:b0:32d:a98c:aa20 with SMTP id n5-20020a5d4c45000000b0032da98caa20mr18684176wrt.59.1699052360204; Fri, 03 Nov 2023 15:59:20 -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 y3-20020adfe6c3000000b003140f47224csm2886258wrm.15.2023.11.03.15.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 15:59:19 -0700 (PDT) From: Sharlatan Hellseher Date: Sat, 4 Nov 2023 01:58:55 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <1c3e20f81479ed702270fc6640939db165bd33bc.1699062920.git.sharlatanus@gmail.com> References: <1c3e20f81479ed702270fc6640939db165bd33bc.1699062920.git.sharlatanus@gmail.com> 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