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/")