From patchwork Mon Jul 25 15:11:54 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: 40950 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 E5A7F27BBE9; Mon, 25 Jul 2022 16:13:21 +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 33B1427BBEA for ; Mon, 25 Jul 2022 16:13:21 +0100 (BST) Received: from localhost ([::1]:37036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFzlo-0002IQ-By for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 11:13:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFzlW-0002B2-SD for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33353) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFzlW-0002sl-Jq for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFzlW-0001nJ-FO for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH v2 1/6] gnu: trilinos-for-dealii-openmpi: Fix build. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 15:13: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.16587619296756 (code B ref 56760); Mon, 25 Jul 2022 15:13:02 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 15:12:09 +0000 Received: from localhost ([127.0.0.1]:51313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzkf-0001ku-0r for submit@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:09 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]:39564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzkb-0001k9-Qq for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:08 -0400 Date: Mon, 25 Jul 2022 15:11:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658761919; x=1659021119; bh=RJV0xqqq9n6zV57Udx5aYZxQdXWFbJf6AhwbG/kWxbM=; 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=Ek+93D0iXPyrkOqnCck2IYqsdDmlfx5/DjZXO623G+BtPZxgRt2ddlEGTjX1sX3B9 k3utSXGFVduUl28TI1xIzPtUiWByFkNrhDwWz1AxZUmRCVpjwNbjv0YTsxoEejXjhT G3BPjja4eGYZNoQs9ywFo8aXTaTpihtX3lA06+kVFeav1h0UWNf9LHkIkDVCrmPzW0 sqwWOLuybhEjELS1BQFfq7eeNKGDI+2qqUZKw3D5Oe7ITVqqF8JwkJOHFljk0nOyhN kc3qorU6tZWyZAPnhT/mjnOhETpmXAzFdzOOXY1Br8rNKMVFs5XFE6ElnVwJIPjC/E BthwcjIp+FPTA== From: "Paul A. Patience" Message-ID: <20220725151135.3924177-2-paul@apatience.com> In-Reply-To: <20220725151135.3924177-1-paul@apatience.com> References: <20220725151135.3924177-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 15:12:02 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: 40954 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 682BE27BBEA; Mon, 25 Jul 2022 16:14:38 +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 CE05F27BBE9 for ; Mon, 25 Jul 2022 16:14:37 +0100 (BST) Received: from localhost ([::1]:39894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFzn3-0004DS-0t for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 11:14:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFzlX-0002BN-U6 for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33355) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFzlX-0002t0-E6 for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFzlX-0001nX-8G for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH v2 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 15:13: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.16587619376785 (code B ref 56760); Mon, 25 Jul 2022 15:13:03 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 15:12:17 +0000 Received: from localhost ([127.0.0.1]:51319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzkm-0001lN-Hs for submit@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:16 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:34651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzkh-0001kd-24 for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:12 -0400 Date: Mon, 25 Jul 2022 15:12:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658761925; x=1659021125; 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=qU6RksyyXox9bbmDKgGpPz322HmKrhgpGdjLIXJ6ucgkTsmnIJ4sKR+vu6rqkg+Gk 3cljsn9/PH9U9wqieU4mDg2l8PhP/Mj6CJyi/OqyDwE/Zeq2xCKfeZHW8FlG5VLZZy Nl5tabgba834Jx0nJcg4aKBfyLY072JmWZFpKCegewm0DFWfZ5oSN60iEiJgisFEPj YFFZJ+5xeaTlOccJ64hYhJcvc1ntg9i87tfqbkJAgoj+2TlEJivKknerpHKTsVGsFY 9736CdA5R+OMCwUTMXtGZKvtr9TBQ0bbG464u8tqGsIlSD8odJ6uQ/tq1juCNGGAOT fGrWtx27/5++w== From: "Paul A. Patience" Message-ID: <20220725151135.3924177-3-paul@apatience.com> In-Reply-To: <20220725151135.3924177-1-paul@apatience.com> References: <20220725151135.3924177-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 15:12:08 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: 40952 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 5824127BBEA; Mon, 25 Jul 2022 16:13:32 +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 147B427BBE9 for ; Mon, 25 Jul 2022 16:13:32 +0100 (BST) Received: from localhost ([::1]:37890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFzly-0002sb-V0 for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 11:13:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFzlY-0002BO-1J for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFzlX-0002t3-OD for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFzlX-0001nf-Jl for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH v2 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 15:13: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.16587619486812 (code B ref 56760); Mon, 25 Jul 2022 15:13:03 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 15:12:28 +0000 Received: from localhost ([127.0.0.1]:51323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzky-0001lo-0Z for submit@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:28 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:36287) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzkv-0001lW-7T for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:26 -0400 Date: Mon, 25 Jul 2022 15:12:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658761939; x=1659021139; 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=YR4nwqE0J/9M7GSfyNFs87yC4HyYnKb6XCQNTnJLbtft5PulIAoOvpM16jI2MLmnn ZWJsgihJelLOi+rWZFKErdycezklSTlhAvGrQ12WSyD6Yd23LKcX70vPHKqCFsATyA 17W6ssamrOR6v+u9wEG37xtRcBC8h6rWEBLzBqy11UfilyFsSS56EHITJyVkOGC/cY oAb6fz5A66AgoEoWeVsH/hA+n/biOv7kLK+f2dO/0Rv5XFHctFSHzVz3d4NGD0Yv42 YWBURR6HeTak30KBfmzvfmcPCMtwvHCCmoGVmiJWpjxTLZZOs9bTHiYt/S2uBRHOqT 0/tCaRRE28ZyA== From: "Paul A. Patience" Message-ID: <20220725151135.3924177-4-paul@apatience.com> In-Reply-To: <20220725151135.3924177-1-paul@apatience.com> References: <20220725151135.3924177-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 15:12:16 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: 40955 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 4D3E727BBEA; Mon, 25 Jul 2022 16:14:45 +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 E776727BBE9 for ; Mon, 25 Jul 2022 16:14:44 +0100 (BST) Received: from localhost ([::1]:40136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFzn9-0004Mv-To for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 11:14:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFzlY-0002C4-Kv for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33357) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFzlY-0002tF-3l for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFzlX-0001nm-Vg for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH v2 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 15:13: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.16587619536831 (code B ref 56760); Mon, 25 Jul 2022 15:13:03 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 15:12:33 +0000 Received: from localhost ([127.0.0.1]:51327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzl3-0001m7-BN for submit@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:33 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:24868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzl1-0001lf-Oo for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:32 -0400 Date: Mon, 25 Jul 2022 15:12:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658761945; x=1659021145; 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=VZaDhDO5PKmbGnxL0vfCH0XWxYyWAQSx4PWno2uUGvrTYE1szy542HUkNCpLBeLnt jwU1yeHZE/8ArKHALCksrW+xOmT7LL/xRM9A7eI/YGOXEzIurs8s+dcKE+d1abRxjq FE1Mz/hxS+kjXOw7lc0wi93HqHfLJgzZQbx7hTHAQPIAeebwx16FFjJh31o+Nqpngq Y68/K7ShTc9lrWivABruZBDf0Uvum0L/j+xs7veBwkR24ldUgvHg1IIB29Xtt0cF9W wR596k0hriu4MIynkoDTcYOn6ZA90cVNQMmYdd+XewwemCDlUdVApKljbXCQwOaTSi WhOtSR76PeGDA== From: "Paul A. Patience" Message-ID: <20220725151135.3924177-5-paul@apatience.com> In-Reply-To: <20220725151135.3924177-1-paul@apatience.com> References: <20220725151135.3924177-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 15:12:24 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: 40951 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 488F227BBEA; Mon, 25 Jul 2022 16:13:23 +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 81D8327BBE9 for ; Mon, 25 Jul 2022 16:13:22 +0100 (BST) Received: from localhost ([::1]:37006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFzlp-0002HN-MO for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 11:13:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFzla-0002Cm-De for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33358) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFzlY-0002tJ-NX for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFzlY-0001nt-AO for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH v2 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 15:13:04 +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.16587619576846 (code B ref 56760); Mon, 25 Jul 2022 15:13:04 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 15:12:37 +0000 Received: from localhost ([127.0.0.1]:51331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzl6-0001mM-O8 for submit@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:37 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]:62890) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzl5-0001lx-Bd for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:36 -0400 Date: Mon, 25 Jul 2022 15:12:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658761949; x=1659021149; 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=MKQpWwNyNoOgw2oZiQaBroZArnW0W7HvVE120A47V6MBHdFyJ8QuSJejISKQaXX66 2O47xiaYH4jf7Fj77ji0nJz4B5Qd/gSQ9BaDf10p2l+GJprOaUXzhebZDam+ya37Bd RarGdYUWAqxFHJcaArqV4G03w/rnMpBzj7qT+aTj6HXGTKEUzoBs78nQ0gTQ52XzDR xrzfdoDL48QyxLcwvTslRPth8L20MF36SnAJOtD+OJapmWb4O1klYerrP8OOtphpGT pBWxjURnkvx4UAPLrexEkJuTggpqvBM0LbyytvJ+21MP8sQbnIcP6fNNvSzfzq0Gml b2ibN1EH7lY9g== From: "Paul A. Patience" Message-ID: <20220725151135.3924177-6-paul@apatience.com> In-Reply-To: <20220725151135.3924177-1-paul@apatience.com> References: <20220725151135.3924177-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 15:12:33 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: 40953 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 3072A27BBEA; Mon, 25 Jul 2022 16:13:41 +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 8C18827BBE9 for ; Mon, 25 Jul 2022 16:13:40 +0100 (BST) Received: from localhost ([::1]:38402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFzm7-0003DP-NC for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 11:13:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFzla-0002Cn-Ex for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33359) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFzlY-0002tW-WD for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFzlY-0001o1-Rj for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH v2 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 15:13:04 +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.16587619646870 (code B ref 56760); Mon, 25 Jul 2022 15:13:04 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 15:12:44 +0000 Received: from localhost ([127.0.0.1]:51335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzlE-0001mi-CD for submit@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:44 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:13241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzlC-0001mT-NM for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:43 -0400 Date: Mon, 25 Jul 2022 15:12:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658761956; x=1659021156; bh=AxnayrIUV36NzhB6YtBxKhUd7vnw6SKQfCuk26Utams=; 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=b7FrvTqbGXe/8G5zQDYySOig+Ky7+W+e5CdnbiqXtkf8EU0i0VHxnPi7pPuak3yyd m6NPYb6Ef1hIhFwl3WrwuXTxiw/dlnRmiHPPglJ9p0rEJQD1IyYoEq6bi0S5MujtLa LEYDYPV48umHCpGZPrYl89XDFJaQHpBk3IMEUPqq3RTjccDDoumV2z/4GrWeFwz65O gfComd2Kma8RVJuculBzwIg1JWwFUDc9BSD5axbDO2ttk5SHfvnmihyJuVkZVk8R+F cr5+PRta3WBf+QC01OABjFUoohrWMfzhEhNOq4cuR9Ico8Aq4iVgz7R4OvHOkQs0vq hg8/bgAiIV0wg== From: "Paul A. Patience" Message-ID: <20220725151135.3924177-7-paul@apatience.com> In-Reply-To: <20220725151135.3924177-1-paul@apatience.com> References: <20220725151135.3924177-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 | 70 ++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 37 deletions(-) -- 2.37.1 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 751f1b4fd8..d3481da0a6 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 @@ -5248,22 +5245,21 @@ (define trilinos-for-dealii-openmpi "-DTrilinos_ENABLE_Ifpack2=OFF" "-DTeuchos_ENABLE_FLOAT=ON" "-DTpetra_INST_INT_LONG=ON" + ;; Disabling Tpetra_INST_INT_LONG_LONG is required only + ;; because Tpetra's CMakeLists.txt [1] is incorrectly + ;; testing for + ;; + ;; DEFINED Tpetra_INST_INT_LONG AND Tpetra_INST_INT_UNSIGNED_LONG + ;; + ;; instead of + ;; + ;; DEFINED Tpetra_INST_INT_LONG AND Tpetra_INST_INT_LONG + ;; + ;; [1]: https://github.com/trilinos/Trilinos/blob/0976cf2a8f9ee2991f4fb479f1056ca569eb22b9/packages/tpetra/CMakeLists.txt#L697 + "-DTpetra_INST_INT_LONG_LONG=OFF" "-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/")