From patchwork Mon Jul 25 12:33:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 40942 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 31E5127BBEA; Mon, 25 Jul 2022 13:49:48 +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,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 EE39827BBE9 for ; Mon, 25 Jul 2022 13:49:47 +0100 (BST) Received: from localhost ([::1]:37234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFxWt-0006u8-2b for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 08:49:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFxHf-00077g-D6 for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFxHe-000861-3v for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFxHe-0003Qx-0F for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH 1/6] gnu: trilinos-for-dealii-openmpi: Fix build. References: <20220725123004.3862205-1-paul@apatience.com> In-Reply-To: <20220725123004.3862205-1-paul@apatience.com> Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 12:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56760 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56760@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 56760-submit@debbugs.gnu.org id=B56760.165875240213086 (code B ref 56760); Mon, 25 Jul 2022 12:34:01 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 12:33:22 +0000 Received: from localhost ([127.0.0.1]:49501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxH0-0003P0-Ez for submit@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:22 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:19113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxGv-0003Og-J9 for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:21 -0400 Date: Mon, 25 Jul 2022 12:33:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658752391; x=1659011591; bh=RJV0xqqq9n6zV57Udx5aYZxQdXWFbJf6AhwbG/kWxbM=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:Feedback-ID:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID; b=p8wzs6kQdqJitf34yBVawEip3WSpQKnO8rrwKOGvmuMbpB7irFUe3TEhkSnXOfoCs jUMz2JZzJOEdqevi7kVJ7pCDekJCZT2JbEy5Kz4tpLO3RLsE6mB27wn5CwZ/sWpIyc NJH2PIce9Eglk/dgmcMqN+KpFIpufqIUk7UbW6uQ3o/tV6spFoSQmiLX8WmU9diwNP r0mitfqRjHcALVl8ljb0WAsEPwvgyQhSSc5Q4ZQNprd1M4bTT9wDRVaYMYgBS2Cz6n /jIwsBkrMknv8sslcn9Vf126pf8JB1yLBwdausjhleAg1F0NK87WGR0ZVjLHpTBf1l ysoEgDKkDd9Kw== From: "Paul A. Patience" Message-ID: <20220725123303.3863582-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (trilinos-for-dealii-openmpi)[native-inputs]: Add gcc-7 to fix the failing build with newer versions of gcc. --- gnu/packages/maths.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.37.1 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 458bffee61..948776e9d4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5153,7 +5153,10 @@ (define trilinos-for-dealii-openmpi (base32 "0fnwlhzsh85qj38cq3igbs8nm1b2jdgr2z734sapmyyzsy21mkgp")))) (build-system cmake-build-system) (native-inputs - `(("gfortran" ,gfortran) + `(;; The build fails with the current gcc. + ;; Use the version from when Trilinos was added. + ("gcc" ,gcc-7) + ("gfortran" ,gfortran) ;; Trilinos's repository contains several C-shell scripts, but adding ;; tcsh to the native inputs does not result in the check phase running ;; any more tests than without it (nor is tcsh required to build From patchwork Mon Jul 25 12:33:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 40948 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 57BB527BBEA; Mon, 25 Jul 2022 13:55:57 +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,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 3322027BBE9 for ; Mon, 25 Jul 2022 13:55:56 +0100 (BST) Received: from localhost ([::1]:48476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFxcp-0006ix-7d for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 08:55:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFxHf-00077h-DO for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFxHe-000863-Gg for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFxHe-0003R5-Cn for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH 2/6] gnu: dealii: Use G-expressions. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 12:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56760 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56760@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 56760-submit@debbugs.gnu.org id=B56760.165875241113111 (code B ref 56760); Mon, 25 Jul 2022 12:34:02 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 12:33:31 +0000 Received: from localhost ([127.0.0.1]:49505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxH8-0003PN-PN for submit@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:31 -0400 Received: from mail-4022.proton.ch ([185.70.40.22]:16333) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxH4-0003Ot-Hf for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:29 -0400 Date: Mon, 25 Jul 2022 12:33:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658752400; x=1659011600; bh=zBizTll9N5FAv/V+puRpQSZFirJZs2k9yTXo2FoUPpk=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=CuV9BEgksxRIoYKtaLA5GoplYoerkziMWqfKN7dOkRie2LGsOBw82Y619/UCpyjLB h1SsmYYJ6Zrn6iQsWBlwFdNQ+HV6bOhQ9f02BYjWUahjf8pEvJ2yrIKwWNmXxHEc6H LoJMrY9ql9rBuvsJgR3hVWwc+QqkOWPblPiz/E0VZlDm+u4fjX8KjIbl+H19vX7fka EQ+6DvzlC2BK4Hl9PXpI0wVkYdc/eua55OM8iTT8/Bbm9JJ6SvmH+3zvbkdEN48rnL a0R0sa7ApOgkSdS2L+4WVu09rFLlnDjuo0ie9n8zVWZVvX25mMFXY1euj4QEWZfR0Y ZOE8c8zEkefpg== From: "Paul A. Patience" Message-ID: <20220725123303.3863582-2-paul@apatience.com> In-Reply-To: <20220725123303.3863582-1-paul@apatience.com> References: <20220725123303.3863582-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (dealii)[snippet, arguments]: Use G-expressions. (dealii-openmpi)[arguments]: Same. --- gnu/packages/maths.scm | 60 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 28 deletions(-) -- 2.37.1 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 948776e9d4..7d4049c689 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5287,7 +5287,7 @@ (define-public dealii (modules '((guix build utils))) (snippet ;; Remove bundled boost, muparser, TBB and UMFPACK. - '(delete-file-recursively "bundled")))) + #~(delete-file-recursively "bundled")))) (build-system cmake-build-system) (outputs '("out" "doc")) (native-inputs @@ -5315,32 +5315,36 @@ (define-public dealii sundials-5 tbb)) (arguments - `(#:build-type "DebugRelease" ; Supports only Debug, Release and DebugRelease. - ;; The tests take too long and must be explicitly enabled with "make - ;; setup_tests". - ;; See https://www.dealii.org/developer/developers/testsuite.html. - ;; (They can also be run for an already installed deal.II.) - #:tests? #f - #:configure-flags - (let ((doc (string-append (assoc-ref %outputs "doc") - "/share/doc/" ,name "-" ,version))) - `("-DDEAL_II_COMPONENT_DOCUMENTATION=ON" - ,(string-append "-DDEAL_II_DOCREADME_RELDIR=" doc) - ,(string-append "-DDEAL_II_DOCHTML_RELDIR=" doc "/html") - ;; Don't compile the examples because the source and CMakeLists.txt - ;; are installed anyway, allowing users to do so for themselves. - "-DDEAL_II_COMPILE_EXAMPLES=OFF" - ,(string-append "-DDEAL_II_EXAMPLES_RELDIR=" doc "/examples"))) - #:phases - (modify-phases %standard-phases - (add-after 'install 'remove-build-logs - ;; These build logs leak the name of the build directory by storing - ;; the values of CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR. - (lambda* (#:key outputs #:allow-other-keys) - (let ((doc (string-append (assoc-ref outputs "doc") - "/share/doc/" ,name "-" ,version))) - (for-each delete-file (map (lambda (f) (string-append doc "/" f)) - '("detailed.log" "summary.log"))))))))) + (list #:build-type "DebugRelease" ; Only Debug, Release or DebugRelease. + ;; The tests take too long and must be explicitly enabled with + ;; "make setup_tests". + ;; See https://www.dealii.org/developer/developers/testsuite.html. + ;; (They can also be run for an already installed deal.II.) + #:tests? #f + #:configure-flags + #~(let ((doc (string-append #$output:doc "/share/doc/" + #$name "-" #$version))) + (list "-DDEAL_II_COMPONENT_DOCUMENTATION=ON" + (string-append "-DDEAL_II_DOCREADME_RELDIR=" doc) + (string-append "-DDEAL_II_DOCHTML_RELDIR=" doc "/html") + ;; Don't compile the examples because the source and + ;; CMakeLists.txt are installed anyway, allowing users to + ;; do so for themselves. + "-DDEAL_II_COMPILE_EXAMPLES=OFF" + (string-append "-DDEAL_II_EXAMPLES_RELDIR=" doc + "/examples"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'remove-build-logs + ;; These build logs leak the name of the build directory by + ;; storing the values of CMAKE_SOURCE_DIR and + ;; CMAKE_BINARY_DIR. + (lambda _ + (let ((doc (string-append #$output:doc "/share/doc/" + #$name "-" #$version))) + (for-each delete-file + (map (lambda (f) (string-append doc "/" f)) + '("detailed.log" "summary.log"))))))))) (home-page "https://www.dealii.org/") (synopsis "Finite element library") (description @@ -5373,7 +5377,7 @@ (define-public dealii-openmpi (arguments (substitute-keyword-arguments (package-arguments dealii) ((#:configure-flags flags) - `(cons "-DDEAL_II_WITH_MPI=ON" ,flags)))) + #~(cons "-DDEAL_II_WITH_MPI=ON" #$flags)))) (synopsis "Finite element library (with MPI support)"))) (define-public flann From patchwork Mon Jul 25 12:33:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 40947 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 1728B27BBEA; Mon, 25 Jul 2022 13:55:36 +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,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 C90A227BBE9 for ; Mon, 25 Jul 2022 13:55:35 +0100 (BST) Received: from localhost ([::1]:47782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFxcU-0006A3-RD for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 08:55:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFxHf-00077f-Cm for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFxHe-000864-Ug for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFxHe-0003RC-Q7 for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH 3/6] gnu: dealii: Update to 9.4.0. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 12:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56760 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56760@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 56760-submit@debbugs.gnu.org id=B56760.165875241513127 (code B ref 56760); Mon, 25 Jul 2022 12:34:02 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 12:33:35 +0000 Received: from localhost ([127.0.0.1]:49509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxHD-0003Pe-7N for submit@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:35 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]:23054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxHA-0003PD-Ny for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:33 -0400 Date: Mon, 25 Jul 2022 12:33:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658752406; x=1659011606; bh=oTIAN8vcS3W6OaYGFB52aim6wBP88XCZeVDQ9MlTgNE=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=CojjX9P4uk7A3oIQXEkkVZLgsOmFiKHl3EyKgzJg2gfGM77GZFi5nnSnbbJBZ/pCy df8dAryrNHpJL2HBAucItUv8hUwn1QNMpSJjzOQ7rqWjjyrJDy5Kbg5ByQxbVc+6LQ mBRKcHL/7RUqVGvMV379WPpwLJG0wYCyGqeLIpMT26Gb4+NVcKUM6iSTdpDXrPnmpY INN+epgRuCitkDhztGbX7mPzLp71Qu31sF7sJs0duz1ixTXWQpC+kltRIiam6J6RTL OhQIePPewwkmrWis33EX2KzC0cJzpqBIr6LKuhL3N1xs/MQ7oMTVK3uK7bSGTUGQWD v1Fp0l+vS/9vQ== From: "Paul A. Patience" Message-ID: <20220725123303.3863582-3-paul@apatience.com> In-Reply-To: <20220725123303.3863582-1-paul@apatience.com> References: <20220725123303.3863582-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (dealii): Update to 9.4.0. [propagated-inputs]: Replace sundials-5 with sundials. (dealii-openmpi)[propagated-inputs]: Replace sundials-openmpi-5 with sundials-openmpi. --- gnu/packages/maths.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.37.1 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7d4049c689..a2123d2dc8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5276,14 +5276,14 @@ (define trilinos-for-dealii-openmpi (define-public dealii (package (name "dealii") - (version "9.3.3") + (version "9.4.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/dealii/dealii/releases/" "download/v" version "/dealii-" version ".tar.gz")) (sha256 - (base32 "0a8s4yxcbvzmfgv5qcg27h2ss4fcnyhrhhs35glqj59l9cbmkysx")) + (base32 "0v73q6f35f2yrjihaq6vh9lma07qc4cdv75nwmc3c5yrdh07g1i3")) (modules '((guix build utils))) (snippet ;; Remove bundled boost, muparser, TBB and UMFPACK. @@ -5311,8 +5311,7 @@ (define-public dealii (list boost hdf5 suitesparse ; For UMFPACK. - ;; SUNDIALS 6.0.0 and later will be supported in deal.II 9.4.0. - sundials-5 + sundials tbb)) (arguments (list #:build-type "DebugRelease" ; Only Debug, Release or DebugRelease. @@ -5372,7 +5371,7 @@ (define-public dealii-openmpi p4est-openmpi petsc-openmpi slepc-openmpi - sundials-openmpi-5 + sundials-openmpi trilinos-for-dealii-openmpi))) (arguments (substitute-keyword-arguments (package-arguments dealii) From patchwork Mon Jul 25 12:33:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 40943 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 414B827BBEA; Mon, 25 Jul 2022 13:50:05 +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,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 D004927BBE9 for ; Mon, 25 Jul 2022 13:50:04 +0100 (BST) Received: from localhost ([::1]:37972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFxX9-0007Ou-VV for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 08:50:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFxHf-00078B-RX for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFxHf-00086H-Bc for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFxHf-0003RJ-7M for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH 4/6] gnu: trilinos-for-dealii-openmpi: Remove input labels. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 12:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56760 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56760@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 56760-submit@debbugs.gnu.org id=B56760.165875241913142 (code B ref 56760); Mon, 25 Jul 2022 12:34:03 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 12:33:39 +0000 Received: from localhost ([127.0.0.1]:49513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxHG-0003Pt-HV for submit@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:38 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:62865) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxHE-0003PQ-Ly for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:37 -0400 Date: Mon, 25 Jul 2022 12:33:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658752410; x=1659011610; bh=I8vkwaExuUiJnCkCXYbbPTZoJf1G83MzyS4ePFDgWe8=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=qZkBd5LQdR1BJ1Ik5vz4C1HY0wFMkVlcSajUOtezPSRN8N13SWYgXrnk5zk1NBm00 WNFzve/PHdyYWMDlbox+P8Ogdjf97s9Gs7zGbJMqpzXmsPhmSFYEvu1UmcyOWU5pa3 0euQqobF1py3df/R7OT3h3J0E8ytgi7FM2XrzjFZfKP7NlEK9qCpT0DoU1mHLhHxQZ ACmy93iJkfs0CM/x4uWk2+W6cQvAARhggjR/xwFBOPpj55xygoOf+Zprlg5e4o6uj2 sQ/oYWrwgCfOWC8PaxqvJ/kr3lL7phBwBL6MMiIINnxPF56Lw+uAeCeqGv39lZDQ7o jWJNP/mznSyLg== From: "Paul A. Patience" Message-ID: <20220725123303.3863582-4-paul@apatience.com> In-Reply-To: <20220725123303.3863582-1-paul@apatience.com> References: <20220725123303.3863582-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (trilinos-for-dealii-openmpi)[native-inputs, inputs, propagated-inputs]: Remove labels. --- gnu/packages/maths.scm | 53 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 26 deletions(-) -- 2.37.1 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a2123d2dc8..27b92d369c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5153,34 +5153,35 @@ (define trilinos-for-dealii-openmpi (base32 "0fnwlhzsh85qj38cq3igbs8nm1b2jdgr2z734sapmyyzsy21mkgp")))) (build-system cmake-build-system) (native-inputs - `(;; The build fails with the current gcc. - ;; Use the version from when Trilinos was added. - ("gcc" ,gcc-7) - ("gfortran" ,gfortran) - ;; Trilinos's repository contains several C-shell scripts, but adding - ;; tcsh to the native inputs does not result in the check phase running - ;; any more tests than without it (nor is tcsh required to build - ;; Trilinos). - ;; It seems that Trilinos has replaced its use of C-shell test scripts - ;; with CMake's testing facilities. - ;; For example, - ;; packages/zoltan/doc/Zoltan_html/dev_html/dev_test_script.html [1] - ;; states that Zoltan's C-shell test script - ;; packages/zoltan/test/test_zoltan has been obsoleted by the tests now - ;; performed through CMake. - ;; - ;; Perl is required for some Zoltan tests and Python 2 for one ML test. - ;; - ;; [1]: https://cs.sandia.gov/zoltan/dev_html/dev_test_script.html - ("perl" ,perl) - ("python" ,python-2))) + (list + ;; The build fails with the current gcc. + ;; Use the version from when Trilinos was added. + gcc-7 + gfortran + ;; Trilinos's repository contains several C-shell scripts, but adding + ;; tcsh to the native inputs does not result in the check phase running + ;; any more tests than without it (nor is tcsh required to build + ;; Trilinos). + ;; It seems that Trilinos has replaced its use of C-shell test scripts + ;; with CMake's testing facilities. + ;; For example, + ;; packages/zoltan/doc/Zoltan_html/dev_html/dev_test_script.html [1] + ;; states that Zoltan's C-shell test script + ;; packages/zoltan/test/test_zoltan has been obsoleted by the tests now + ;; performed through CMake. + ;; + ;; Perl is required for some Zoltan tests and Python 2 for one ML test. + ;; + ;; [1]: https://cs.sandia.gov/zoltan/dev_html/dev_test_script.html + perl + python-2)) (inputs - `(("blas" ,openblas) - ("lapack" ,lapack) - ("mumps" ,mumps-openmpi) - ("scalapack" ,scalapack))) + (list openblas + lapack + mumps-openmpi + scalapack)) (propagated-inputs - `(("mpi" ,openmpi))) + (list openmpi)) (arguments `(#:build-type "Release" #:configure-flags From patchwork Mon Jul 25 12:33:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 40944 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 092F427BBEA; Mon, 25 Jul 2022 13:50:25 +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,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 4295E27BBE9 for ; Mon, 25 Jul 2022 13:50:24 +0100 (BST) Received: from localhost ([::1]:38884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFxXT-000828-Cv for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 08:50:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFxHg-000792-1J for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59776) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFxHf-00086M-Mi for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFxHf-0003RR-IU for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH 5/6] gnu: trilinos-for-dealii-openmpi: Use G-expressions. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 12:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56760 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56760@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 56760-submit@debbugs.gnu.org id=B56760.165875243013170 (code B ref 56760); Mon, 25 Jul 2022 12:34:03 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 12:33:50 +0000 Received: from localhost ([127.0.0.1]:49517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxHR-0003QM-Ue for submit@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:50 -0400 Received: from mail-4323.proton.ch ([185.70.43.23]:57317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxHQ-0003Q6-2I for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:48 -0400 Date: Mon, 25 Jul 2022 12:33:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658752422; x=1659011622; bh=vPWI640IU8QxlI42zXnKAC+z2oDumo5aZNV+edWm8qo=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=HjT078YISZcwEgdljxXxhj14FBZXThUnXeKpx6030W2s9eaCcbddX5qxbJgvARIVn vzgvzC15SqsKzrfpNrMkDjfn+wZ+LpuFIRQVnxmoXtdySWYAjv3nfBjYiTCBNwB7u1 XcRrdq9IS9KR6KN3QFzgCNBBWuWIRLyi+4F8gpaHT/jSGV5IVHdqfRl+LduVweKp30 Ajw20Pl401K5wJy6zPdCezVw1b78VOjNYfew3rY6NFhH7vwwFg+Ed0koPZOg8Skt4r 94BmysRKgZSC0KGLZ/WLp9zTaNEhkVVc8WheCP/CNu4qGYylwL3JN8NLZDAvjkDz6A QRGxD1oWA8yYw== From: "Paul A. Patience" Message-ID: <20220725123303.3863582-5-paul@apatience.com> In-Reply-To: <20220725123303.3863582-1-paul@apatience.com> References: <20220725123303.3863582-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (trilinos-for-dealii-openmpi)[arguments]: Use G-expressions. <#:phases>: Remove trailing boolean. --- gnu/packages/maths.scm | 162 +++++++++++++++++++++-------------------- 1 file changed, 83 insertions(+), 79 deletions(-) -- 2.37.1 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 27b92d369c..751f1b4fd8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5183,85 +5183,89 @@ (define trilinos-for-dealii-openmpi (propagated-inputs (list openmpi)) (arguments - `(#:build-type "Release" - #:configure-flags - `("-DBUILD_SHARED_LIBS=ON" - ;; Obtain the equivalent of RelWithDebInfo but with -O3 (the Release - ;; default) rather than -O2 (the RelWithDebInfo default), to conform - ;; to candi's trilinos.package's compilation flags, which are -g -O3. - "-DCMAKE_C_FLAGS=-g" - "-DCMAKE_CXX_FLAGS=-g" - "-DCMAKE_Fortran_FLAGS=-g" - - ;; Trilinos libraries that deal.II can interface with. - "-DTrilinos_ENABLE_Amesos=ON" - "-DTrilinos_ENABLE_AztecOO=ON" - "-DTrilinos_ENABLE_Epetra=ON" - "-DTrilinos_ENABLE_EpetraExt=ON" - "-DTrilinos_ENABLE_Ifpack=ON" - "-DTrilinos_ENABLE_ML=ON" - "-DTrilinos_ENABLE_MueLu=ON" - "-DTrilinos_ENABLE_ROL=ON" - ;; Optional; required for deal.II's GridIn::read_exodusii, but - ;; depends on netcdf. - ;; Enable if and when someone needs it. - ;;"-DTrilinos_ENABLE_SEACAS=ON" - "-DTrilinos_ENABLE_Sacado=ON" - "-DTrilinos_ENABLE_Teuchos=ON" - "-DTrilinos_ENABLE_Tpetra=ON" - "-DTrilinos_ENABLE_Zoltan=ON" - - ;; Third-party libraries (TPLs) that Trilinos can interface with. - "-DBLAS_LIBRARY_NAMES=openblas" - "-DTPL_ENABLE_MPI=ON" - "-DTPL_ENABLE_MUMPS=ON" - "-DTPL_ENABLE_SCALAPACK=ON" - - ;; Enable the tests but not the examples (which are enabled by - ;; default when enabling tests). - ;; Although some examples are run as tests, they are otherwise - ;; unnecessary since this is a private package meant for - ;; dealii-openmpi. - ;; Besides, some MueLu and ROL examples require a lot of memory to - ;; compile. - ;; - ;; (For future reference, note that some ROL and SEACAS examples - ;; require removing gfortran from CPLUS_INCLUDE_PATH as in the - ;; dune-istl, dune-localfunctions and dune-alugrid packages.) - "-DTrilinos_ENABLE_TESTS=ON" - "-DTrilinos_ENABLE_EXAMPLES=OFF" - ;; MueLu tests require considerably more time and memory to compile - ;; than the rest of the tests. - "-DMueLu_ENABLE_TESTS=OFF" - - ;; The following options were gleaned from candi's trilinos.package. - ;; (We do not enable the complex instantiations, which are anyway - ;; provided only as an option in trilinos.package, because they are - ;; costly in compilation time and memory usage, and disk space [1].) - ;; - ;; [1]: https://www.docs.trilinos.org/files/TrilinosBuildReference.html#enabling-float-and-complex-scalar-types - "-DTrilinos_ENABLE_Ifpack2=OFF" - "-DTeuchos_ENABLE_FLOAT=ON" - "-DTpetra_INST_INT_LONG=ON" - "-DTPL_ENABLE_Boost=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'configure 'fix-kokkos-config - (lambda _ - ;; GNU Make 4.3 accidentally leaves the backslash preceding the - ;; number sign in strings containing a literal backslash–number - ;; sign (\#) [1, 2]. - ;; This is still an issue in Trilinos 13.0.1, but should be fixed - ;; in the following version. - ;; (The latest versions of Kokkos incorporate the fix [2].) - ;; - ;; [1]: https://github.com/GEOSX/thirdPartyLibs/issues/136 - ;; [2]: https://github.com/kokkos/kokkos/blob/3.4.00/Makefile.kokkos#L441 - (substitute* "KokkosCore_config.h" - (("\\\\#") "#")) - #t)) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (list #:build-type "Release" + #:configure-flags + #~(list "-DBUILD_SHARED_LIBS=ON" + ;; Obtain the equivalent of RelWithDebInfo but with -O3 + ;; (the Release default) rather than -O2 (the + ;; RelWithDebInfo default), to conform to candi's + ;; trilinos.package's compilation flags, which are -g -O3. + "-DCMAKE_C_FLAGS=-g" + "-DCMAKE_CXX_FLAGS=-g" + "-DCMAKE_Fortran_FLAGS=-g" + + ;; Trilinos libraries that deal.II can interface with. + "-DTrilinos_ENABLE_Amesos=ON" + "-DTrilinos_ENABLE_AztecOO=ON" + "-DTrilinos_ENABLE_Epetra=ON" + "-DTrilinos_ENABLE_EpetraExt=ON" + "-DTrilinos_ENABLE_Ifpack=ON" + "-DTrilinos_ENABLE_ML=ON" + "-DTrilinos_ENABLE_MueLu=ON" + "-DTrilinos_ENABLE_ROL=ON" + ;; Optional; required for deal.II's GridIn::read_exodusii, + ;; but depends on netcdf. + ;; Enable if and when someone needs it. + ;;"-DTrilinos_ENABLE_SEACAS=ON" + "-DTrilinos_ENABLE_Sacado=ON" + "-DTrilinos_ENABLE_Teuchos=ON" + "-DTrilinos_ENABLE_Tpetra=ON" + "-DTrilinos_ENABLE_Zoltan=ON" + + ;; Third-party libraries (TPLs) that Trilinos can interface + ;; with. + "-DBLAS_LIBRARY_NAMES=openblas" + "-DTPL_ENABLE_MPI=ON" + "-DTPL_ENABLE_MUMPS=ON" + "-DTPL_ENABLE_SCALAPACK=ON" + + ;; Enable the tests but not the examples (which are enabled + ;; by default when enabling tests). + ;; Although some examples are run as tests, they are + ;; otherwise unnecessary since this is a private package + ;; meant for dealii-openmpi. + ;; Besides, some MueLu and ROL examples require a lot of + ;; memory to compile. + ;; + ;; (For future reference, note that some ROL and SEACAS + ;; examples require removing gfortran from + ;; CPLUS_INCLUDE_PATH as in the dune-istl, + ;; dune-localfunctions and dune-alugrid packages.) + "-DTrilinos_ENABLE_TESTS=ON" + "-DTrilinos_ENABLE_EXAMPLES=OFF" + ;; MueLu tests require considerably more time and memory to + ;; compile than the rest of the tests. + "-DMueLu_ENABLE_TESTS=OFF" + + ;; The following options were gleaned from candi's + ;; trilinos.package. + ;; (We do not enable the complex instantiations, which are + ;; anyway provided only as an option in trilinos.package, + ;; because they are costly in compilation time and memory + ;; usage, and disk space [1].) + ;; + ;; [1]: https://www.docs.trilinos.org/files/TrilinosBuildReference.html#enabling-float-and-complex-scalar-types + "-DTrilinos_ENABLE_Ifpack2=OFF" + "-DTeuchos_ENABLE_FLOAT=ON" + "-DTpetra_INST_INT_LONG=ON" + "-DTPL_ENABLE_Boost=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'fix-kokkos-config + (lambda _ + ;; GNU Make 4.3 accidentally leaves the backslash preceding + ;; the number sign in strings containing a literal + ;; backslash–number sign (\#) [1, 2]. + ;; This is still an issue in Trilinos 13.0.1, but should be + ;; fixed in the following version. + ;; (The latest versions of Kokkos incorporate the fix [2].) + ;; + ;; [1]: https://github.com/GEOSX/thirdPartyLibs/issues/136 + ;; [2]: https://github.com/kokkos/kokkos/blob/3.4.00/Makefile.kokkos#L441 + (substitute* "KokkosCore_config.h" + (("\\\\#") "#")))) + (add-before 'check 'mpi-setup + #$%openmpi-setup)))) (home-page "https://trilinos.github.io/") (synopsis "Algorithms for engineering and scientific problems") (description From patchwork Mon Jul 25 12:33:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 40946 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 8E02F27BBEA; Mon, 25 Jul 2022 13:52:01 +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,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 F03D527BBE9 for ; Mon, 25 Jul 2022 13:52:00 +0100 (BST) Received: from localhost ([::1]:41120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFxZ2-0001CV-4N for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 08:52:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFxHg-0007AC-Ev for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59777) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFxHg-00086W-0z for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFxHf-0003RY-To for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH 6/6] gnu: trilinos-for-dealii-openmpi: Update to 13.4.0. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 12:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56760 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56760@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 56760-submit@debbugs.gnu.org id=B56760.165875243413186 (code B ref 56760); Mon, 25 Jul 2022 12:34:03 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 12:33:54 +0000 Received: from localhost ([127.0.0.1]:49521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxHV-0003Qc-K6 for submit@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:54 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]:41286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxHT-0003QA-BU for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:51 -0400 Date: Mon, 25 Jul 2022 12:33:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658752425; x=1659011625; bh=XUsaAg6ewCIiPkbaYLsCWQzBu6QiKewoVuwNkLrPOdE=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=fTMxpFFJ1qisqVS93M+Hnl0veabuLy6PemL5KB/UKztHitw5QMtcAHcRqyd2jRCmQ 5/IduD8jKbDnTZcL2WCvbCjpSNgd4tVu7apyqHYE+Z7lCkmdh3JMb/N8vAKU39n2hM vXOa3GWuoSiYCGcabopU9Ofqm4zQ76L9gs73jXkCN60hTWvax5OcqrtwHAnJVKKLtJ pWS9Bmu30jw30SQHf4OlPNLGXcD+5XqKPCbDM5TUNpK8VcRu1Fp6CwpTCUewr6swjc cg73Oa+rfJVctUQ5XIJc101BN5xhNucgjIvP610l5QOER0ncmjmDwxYFiZAQZAXRjK AM+jobpHyNMUQ== From: "Paul A. Patience" Message-ID: <20220725123303.3863582-6-paul@apatience.com> In-Reply-To: <20220725123303.3863582-1-paul@apatience.com> References: <20220725123303.3863582-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (trilinos-for-dealii-openmpi): Update to 13.4.0. [native-inputs]: Remove gcc-7. [arguments]: Remove 'fix-kokkos-config' phase. --- gnu/packages/maths.scm | 58 +++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 37 deletions(-) -- 2.37.1 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 751f1b4fd8..73180a1831 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5139,7 +5139,7 @@ (define-public lpsolve (define trilinos-for-dealii-openmpi (package (name "trilinos-for-dealii-openmpi") - (version "12.18.1") + (version "13.4.0") (source (origin (method git-fetch) @@ -5150,31 +5150,28 @@ (define trilinos-for-dealii-openmpi (string-replace-substring version "." "-"))))) (file-name (git-file-name "trilinos" version)) (sha256 - (base32 "0fnwlhzsh85qj38cq3igbs8nm1b2jdgr2z734sapmyyzsy21mkgp")))) + (base32 "11vkn86dbvyvsf3zipd65y2f8vg5if9n3k7h3i8ybj95d4ck5r2n")))) (build-system cmake-build-system) (native-inputs - (list - ;; The build fails with the current gcc. - ;; Use the version from when Trilinos was added. - gcc-7 - gfortran - ;; Trilinos's repository contains several C-shell scripts, but adding - ;; tcsh to the native inputs does not result in the check phase running - ;; any more tests than without it (nor is tcsh required to build - ;; Trilinos). - ;; It seems that Trilinos has replaced its use of C-shell test scripts - ;; with CMake's testing facilities. - ;; For example, - ;; packages/zoltan/doc/Zoltan_html/dev_html/dev_test_script.html [1] - ;; states that Zoltan's C-shell test script - ;; packages/zoltan/test/test_zoltan has been obsoleted by the tests now - ;; performed through CMake. - ;; - ;; Perl is required for some Zoltan tests and Python 2 for one ML test. - ;; - ;; [1]: https://cs.sandia.gov/zoltan/dev_html/dev_test_script.html - perl - python-2)) + (list gfortran + ;; Trilinos's repository contains several C-shell scripts, but + ;; adding tcsh to the native inputs does not result in the check + ;; phase running any more tests than without it (nor is tcsh + ;; required to build Trilinos). + ;; It seems that Trilinos has replaced its use of C-shell test + ;; scripts with CMake's testing facilities. + ;; For example, + ;; packages/zoltan/doc/Zoltan_html/dev_html/dev_test_script.html [1] + ;; states that Zoltan's C-shell test script + ;; packages/zoltan/test/test_zoltan has been obsoleted by the tests + ;; now performed through CMake. + ;; + ;; Perl is required for some Zoltan tests and Python 2 for one ML + ;; test. + ;; + ;; [1]: https://cs.sandia.gov/zoltan/dev_html/dev_test_script.html + perl + python-2)) (inputs (list openblas lapack @@ -5251,19 +5248,6 @@ (define trilinos-for-dealii-openmpi "-DTPL_ENABLE_Boost=OFF") #:phases #~(modify-phases %standard-phases - (add-after 'configure 'fix-kokkos-config - (lambda _ - ;; GNU Make 4.3 accidentally leaves the backslash preceding - ;; the number sign in strings containing a literal - ;; backslash–number sign (\#) [1, 2]. - ;; This is still an issue in Trilinos 13.0.1, but should be - ;; fixed in the following version. - ;; (The latest versions of Kokkos incorporate the fix [2].) - ;; - ;; [1]: https://github.com/GEOSX/thirdPartyLibs/issues/136 - ;; [2]: https://github.com/kokkos/kokkos/blob/3.4.00/Makefile.kokkos#L441 - (substitute* "KokkosCore_config.h" - (("\\\\#") "#")))) (add-before 'check 'mpi-setup #$%openmpi-setup)))) (home-page "https://trilinos.github.io/")