From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id eLYvOOKR3mJTSAAAbAwnHQ (envelope-from ) for ; Mon, 25 Jul 2022 14:51:46 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id oGkYOOKR3mLdHgAA9RJhRA (envelope-from ) for ; Mon, 25 Jul 2022 14:51:46 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8653A1D52F for ; Mon, 25 Jul 2022 14:51:46 +0200 (CEST) Received: from localhost ([::1]:41120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFxYn-0001CV-Ab for larch@yhetil.org; Mon, 25 Jul 2022 08:51:45 -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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1658753506; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=XUsaAg6ewCIiPkbaYLsCWQzBu6QiKewoVuwNkLrPOdE=; b=e4PhZggCDp5lwHHBT4m31TufZIJeQlB6MGb8twn6IxLvF4hG5jeyT/o8Oscz+eDoYAqLGH PdliQInmkJEO4YI38sxYp1D60vSl2gGcVYk0VtqxkC9PASCCJtqbmcTxaOAyRzLfHad7Ji rByQRBfSTLI6sCnC2ggTO1DX9eoLzYt6/VkWoBRPhJ/5MKEmQK2OwTbQLDMvBAHsz5N4Hh jwHDIA1/c7whj+7VJOHZwL6s8CvZ1Wi34DQoVTIT/xB3ZdJVtNDghbOj0XrFgmy+VquHqi GnuIYcaPIchav/XRZj0eCPnNmaVQeWIeo2dJBD4UFo9LH+R9zE2d9R6izbSF8Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658753506; a=rsa-sha256; cv=none; b=HlRJ0A1vSvMqZxzFAL7CwfHKWFIt56mBApvYFlpevI3dKTg30VW/pFA6+fznDMKYr8tzWo twqmx6H2Zy/seE/W8WGQI8apvofBcXkFS8UF/6ZJfVn9HCPe7IX9jhkTClZeOzNZjVqUxy cClO1ZYgaRqxDy1wooOOiy6UdRFfCiJN08TNP5ap9RDnXui8FzZ3/JNAz14QSrpiFIa1qA IN+XtvBd/AYzKkFA2ON2U2AKiSmonLwhObGL8gNjq+RahyfTQ8E6JVoNnj7Pxn7vxZRdqw x/4PM4iRJOWn+RCKesAaT9GeVOxXeRRcLyGstGFJ7OMo3aThqBgv6CPPNqa0ng== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=fTMxpFFJ; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.57 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=fTMxpFFJ; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 8653A1D52F X-Spam-Score: 3.57 X-Migadu-Scanner: scn0.migadu.com X-TUID: 6GuTCUs2k3Ti * 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(-) 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 addin= g - ;; tcsh to the native inputs does not result in the check phase runn= ing - ;; 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 scrip= ts - ;; 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 te= st. - ;; - ;; [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 chec= k + ;; 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.htm= l [1] + ;; states that Zoltan's C-shell test script + ;; packages/zoltan/test/test_zoltan has been obsoleted by the t= ests + ;; 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.h= tml + perl + python-2)) (inputs (list openblas lapack @@ -5251,19 +5248,6 @@ (define trilinos-for-dealii-openmpi "-DTPL_ENABLE_Boost=3DOFF") #:phases #~(modify-phases %standard-phases - (add-after 'configure 'fix-kokkos-config - (lambda _ - ;; GNU Make 4.3 accidentally leaves the backslash prece= ding - ;; the number sign in strings containing a literal - ;; backslash=E2=80=93number sign (\#) [1, 2]. - ;; This is still an issue in Trilinos 13.0.1, but shoul= d 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/Ma= kefile.kokkos#L441 - (substitute* "KokkosCore_config.h" - (("\\\\#") "#")))) (add-before 'check 'mpi-setup #$%openmpi-setup)))) (home-page "https://trilinos.github.io/") -- 2.37.1