From patchwork Thu Nov 14 20:21:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 70414 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 E8D7427BBEA; Thu, 14 Nov 2024 20:23:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 4AC6627BBE2 for ; Thu, 14 Nov 2024 20:23:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBgMx-0003b7-SD; Thu, 14 Nov 2024 15:23:11 -0500 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 1tBgMp-0003We-57 for guix-patches@gnu.org; Thu, 14 Nov 2024 15:23:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tBgMo-0006SE-Sl for guix-patches@gnu.org; Thu, 14 Nov 2024 15:23:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=h/zC5jsdIPwsRtRp+23YgtXoMO2ZpeCS8wiidb5zkRM=; b=YDWq5OoIHH8VxE8adgptsYutNJgKuo64YEEFmpTPi1b2PjXUr4QVJy/Nd7gi49ziAXLIcF58mLMiUCs4zIU8/CpC95HEsT4VmsLQdy1fL+Rw5FePdttj6xpCEdDLbOujjWP/j0QJwVZZ76BBZkF1f0PZVnJE0DrH9VlrPDIf/3eS7fZna8t3/tc2dX4kzclH+EM88oPWPI0OgCfv9L1JglzexTv1epcccGzQ+LMCLMz97Tp1ChPU4xMY0osj9qhp9C5i0ktro18iRe/9QhpALxHxZLDyxNC+CcppC4S64aSSbwqMA2CfMT6tFi9v/GcUsf45AmCw4FC5GgCx+qRz1A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tBgMo-0001wn-OB for guix-patches@gnu.org; Thu, 14 Nov 2024 15:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74356] [PATCH 05/10] gnu: dune-istl: Update to 2.10.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Nov 2024 20:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74356 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74356@debbugs.gnu.org Cc: Felix Gruber , andreas@enge.fr, sharlatanus@gmail.com, bavier@posteo.net Received: via spool by 74356-submit@debbugs.gnu.org id=B74356.17316157377296 (code B ref 74356); Thu, 14 Nov 2024 20:23:02 +0000 Received: (at 74356) by debbugs.gnu.org; 14 Nov 2024 20:22:17 +0000 Received: from localhost ([127.0.0.1]:47379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBgM4-0001tc-Hg for submit@debbugs.gnu.org; Thu, 14 Nov 2024 15:22:17 -0500 Received: from mout02.posteo.de ([185.67.36.66]:41855) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBgM2-0001t4-3f for 74356@debbugs.gnu.org; Thu, 14 Nov 2024 15:22:14 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id AFAE7240101 for <74356@debbugs.gnu.org>; Thu, 14 Nov 2024 21:22:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1731615728; bh=1JeU9DFhZEkkCwpgqWoOYf3Gma/udkW6+XOPTum3nsg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=dK3QXsPhVRicIC9h+QciScSKnc/rdsBoUThLvu8NrUXFCWWUBGO7IFzj/TU9Oevdo 4200YyL2+H7Oz0nolot1tvTQ7Lqo1CdSnIT093BV2s9V7PqRkYKqRlbGC1Lpw9sXG9 RWp0Kel28n+kj5IVnShW+gL0rEPVnyjV0LpQTglozcaJmAN486ZNi6uSiLQVR65Fc4 2SzdiHBPffbNnrhps3sC+XDtScQe2qnibkBFhRc8jbVut/rmbQj+XgVMtlfjdaojlC yQNvSh0wthoOKs0UMVFNnFkgh20jbdGxNksTjeclBwk+p4mxdGm8jhBEE+zEHMdsf/ EeOB0DG6uHb6Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XqBQR5f3Yz6tvd; Thu, 14 Nov 2024 21:22:07 +0100 (CET) From: Felix Gruber Date: Thu, 14 Nov 2024 20:21:01 +0000 Message-ID: In-Reply-To: References: 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.10.0. [source]: Remove patch that has been applied upstream. * gnu/packages/patches/dune-istl-fix-solver-playground.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Change-Id: Ifbbb6f2dea815159a1743ae6e622c154cf1cc9b0 --- gnu/local.mk | 1 - gnu/packages/maths.scm | 5 +- .../dune-istl-fix-solver-playground.patch | 61 ------------------- 3 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 gnu/packages/patches/dune-istl-fix-solver-playground.patch diff --git a/gnu/local.mk b/gnu/local.mk index dcc1aa201a..5adebbee41 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1167,7 +1167,6 @@ dist_patch_DATA = \ %D%/packages/patches/dtc-meson-cell-overflow.patch \ %D%/packages/patches/duc-fix-test-sh.patch \ %D%/packages/patches/dune-common-skip-failing-tests.patch \ - %D%/packages/patches/dune-istl-fix-solver-playground.patch \ %D%/packages/patches/durden-shadow-arcan.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/dwarves-threading-reproducibility.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index bb40f046dd..799e9115a1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8539,7 +8539,7 @@ (define-public dune-grid (define-public dune-istl (package (name "dune-istl") - (version "2.9.0") + (version "2.10.0") (source (origin (method url-fetch) @@ -8547,8 +8547,7 @@ (define-public dune-istl version "/dune-istl-" version ".tar.gz")) (sha256 (base32 - "0smghqr400xl84j0laabgwaj2p5jlj3n3s85bm7qp9m2vjz6rav6")) - (patches (search-patches "dune-istl-fix-solver-playground.patch")))) + "0rk95rkj87gpb3gn40jl532rybs2lxkhn7g6b30m9kbzz7yfjfbc")))) (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 deleted file mode 100644 index b3df4b6ffa..0000000000 --- a/gnu/packages/patches/dune-istl-fix-solver-playground.patch +++ /dev/null @@ -1,61 +0,0 @@ -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 -