From patchwork Fri Apr 14 19:27:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 49162 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 95714175A1; Fri, 14 Apr 2023 20:43:46 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 30B6E27BE29 for ; Fri, 14 Apr 2023 20:28:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnP5f-0001kU-08; Fri, 14 Apr 2023 15:28:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pnP5b-0001Ee-Fo for guix-patches@gnu.org; Fri, 14 Apr 2023 15:28:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pnP5Y-00010C-Al for guix-patches@gnu.org; Fri, 14 Apr 2023 15:28:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnP5Y-00080w-0H for guix-patches@gnu.org; Fri, 14 Apr 2023 15:28:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62842] [PATCH 05/11] gnu: dune-istl: Update to 2.9.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Apr 2023 19:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62842@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 62842-submit@debbugs.gnu.org id=B62842.168150048330785 (code B ref 62842); Fri, 14 Apr 2023 19:28:03 +0000 Received: (at 62842) by debbugs.gnu.org; 14 Apr 2023 19:28:03 +0000 Received: from localhost ([127.0.0.1]:47700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnP5W-00080F-2j for submit@debbugs.gnu.org; Fri, 14 Apr 2023 15:28:02 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52215) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnP5S-0007z1-TQ for 62842@debbugs.gnu.org; Fri, 14 Apr 2023 15:27:59 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 61BA92403B8 for <62842@debbugs.gnu.org>; Fri, 14 Apr 2023 21:27:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1681500473; bh=3HADV+OEfLvXmjxLNhTU5GTCmQRsNsXwkJ0ZCI/RH08=; h=From:To:Cc:Subject:Date:From; b=o2d3F0GgNMljOV1rAxZOH8e5ZGr5DQRsWBQHiOMibOFNEKO3Qg185JN0ZcYqfXgL+ fb7tL6J/nMaoYYhEjzAqBEbuLCzlTMnrT9kDfqcmSw7TjRAz+t55C0+X6kQWic2R+o DyVImL+PAZ7zZJC4292M+El2sBweMY2Q1FRTeqmAPPv7K9Jds72DkHcG1bLkvD7BxR sb1qRHV3/SXsgzXxliGbq1nS9kCslio+4fAzCv1udCQCCD6CKg99yCvHNUBWJzKhzi 6mL6BTjkcCQNjIFtnJ4parQeeg9lZbndiw9EJFzVQRjIhU83SRrflej25o6XwzYsPk qpkPJrUPA1J/w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4PymgY0dGKz9rxF; Fri, 14 Apr 2023 21:27:53 +0200 (CEST) From: Felix Gruber Date: Fri, 14 Apr 2023 19:27:30 +0000 Message-Id: <20230414192736.41322-5-felgru@posteo.net> In-Reply-To: <20230414192518.41188-1-felgru@posteo.net> References: <20230414192518.41188-1-felgru@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (dune-istl): Update to 2.9.0. [source](patches): Add patch to fix test phase. * gnu/packages/patches/dune-istl-fix-solver-playground.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/maths.scm | 5 +- .../dune-istl-fix-solver-playground.patch | 61 +++++++++++++++++++ 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/dune-istl-fix-solver-playground.patch diff --git a/gnu/local.mk b/gnu/local.mk index 96d5aad909..37bef69b4d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1057,6 +1057,7 @@ dist_patch_DATA = \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dune-grid-add-missing-include-cassert.patch \ + %D%/packages/patches/dune-istl-fix-solver-playground.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/dynaconf-unvendor-deps.patch \ %D%/packages/patches/efivar-211.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 95e2eb3ef7..ad50b65cae 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6946,7 +6946,7 @@ (define-public dune-grid (define-public dune-istl (package (name "dune-istl") - (version "2.7.1") + (version "2.9.0") (source (origin (method url-fetch) @@ -6954,7 +6954,8 @@ (define-public dune-istl version "/dune-istl-" version ".tar.gz")) (sha256 (base32 - "1cy69s1266hvnh8blznlvvkrf8i2g640rc3mf7kp872wgvdz4nb9")))) + "0smghqr400xl84j0laabgwaj2p5jlj3n3s85bm7qp9m2vjz6rav6")) + (patches (search-patches "dune-istl-fix-solver-playground.patch")))) (build-system cmake-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/dune-istl-fix-solver-playground.patch b/gnu/packages/patches/dune-istl-fix-solver-playground.patch new file mode 100644 index 0000000000..b3df4b6ffa --- /dev/null +++ b/gnu/packages/patches/dune-istl-fix-solver-playground.patch @@ -0,0 +1,61 @@ +From fe929f17e98b577171f58ca520b5145be41730ea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= +Date: Thu, 16 Mar 2023 19:48:40 +0100 +Subject: [PATCH] Adjust sequential and both parallel cases in + istl-solver-playground + +Do same thing, independent of paralellel, distributed, or +sequential. +This fixes the test in the sequential case. +--- + src/istl-solver-playground.hh | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +diff --git a/src/istl-solver-playground.hh b/src/istl-solver-playground.hh +index 0ff3abd5..11693cf5 100644 +--- a/src/istl-solver-playground.hh ++++ b/src/istl-solver-playground.hh +@@ -66,7 +66,11 @@ std::shared_ptr loadSystem(std::shared_ptr& m, + std::shared_ptr oocomm; + if(distributed){ + oocomm = std::make_shared(MPI_COMM_WORLD); +- loadMatrixMarket(*m, matrixfilename, *oocomm); ++ if(matrixfilename != "laplacian"){ ++ loadMatrixMarket(*m, matrixfilename, *oocomm); ++ }else{ ++ setupLaplacian(*m, config.get("N", 20)); ++ } + if(config.get("random_rhs", false)){ + rhs->resize(m->N()); + srand(42); +@@ -98,16 +102,22 @@ template + void loadSystem(std::shared_ptr& m, + std::shared_ptr& rhs, + const Dune::ParameterTree& config){ +- std::string matrixfilename = config.get("matrix"); ++ // generate Laplacian or load matrix ++ std::string matrixfilename = config.get("matrix", "laplacian"); ++ if(matrixfilename == "laplacian"){ ++ setupLaplacian(*m, config.get("N", 20)); ++ }else{ ++ loadMatrixMarket(*m, matrixfilename); ++ } ++ // use random values or load right-hand side + std::string rhsfilename; +- if(!config.get("random_rhs", false)) +- rhsfilename = config.get("rhs"); +- loadMatrixMarket(*m, matrixfilename); + if(config.get("random_rhs", false)){ + rhs->resize(m->N()); + fillRandom(*rhs); +- }else ++ }else{ ++ rhsfilename = config.get("rhs"); + loadMatrixMarket(*rhs, rhsfilename); ++ } + } + #endif + +-- +2.39.2 +