From unknown Wed Jun 18 23:09:47 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#46929 <46929@debbugs.gnu.org> To: bug#46929 <46929@debbugs.gnu.org> Subject: Status: [PATCH] gnu: maths: dune-*: Update to version 2.7.1 Reply-To: bug#46929 <46929@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:09:47 +0000 retitle 46929 [PATCH] gnu: maths: dune-*: Update to version 2.7.1 reassign 46929 guix-patches submitter 46929 Felix Gruber severity 46929 normal tag 46929 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 04 14:54:41 2021 Received: (at submit) by debbugs.gnu.org; 4 Mar 2021 19:54:41 +0000 Received: from localhost ([127.0.0.1]:60290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHu3N-0008Cp-Ld for submit@debbugs.gnu.org; Thu, 04 Mar 2021 14:54:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:55680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHu3G-0008Cd-ES for submit@debbugs.gnu.org; Thu, 04 Mar 2021 14:54:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHu3G-000777-4j for guix-patches@gnu.org; Thu, 04 Mar 2021 14:54:26 -0500 Received: from mout02.posteo.de ([185.67.36.66]:56183) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHu3B-0004Ui-Vq for guix-patches@gnu.org; Thu, 04 Mar 2021 14:54:25 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 8DD302400FE for ; Thu, 4 Mar 2021 20:54:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1614887655; bh=13kbzTajmc0jyyhFtF/NX/TrMk8xbhnjyFsI3ZWOFBI=; h=From:To:Cc:Subject:Date:From; b=L+EOjimTv5aFGPgjzqgLVXzVn8vkIarLY2nizOJgw2YG4ZoSSetnexTgBcO/OE1DY XXQ0HYgKw5d85EKjyXHpqC5bhSwFrrc2Dj7rPsAx+vxTnP/8j0CJ/5VbuGL5DrqZy3 Rd4321y0X5P1y+YeYTitTMchA70BLlmkSB8ONVKmIQtUJq/OVCQ+efwa9iSjxssxr8 GNj0j1O6rn+mbihbCN8gMp59tgIoOfScyrXGoXG2mH/RZJqQqHljeaCXCiWztrgxvv KjU5WrPirxqsoCvjvfGBjtbQssVUbtgNUxCS+JD6k4//MxWcrv3Duff/nSvIMdE27O VuwSXVs1DFrPQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ds1lp2sbBz9rxW; Thu, 4 Mar 2021 20:54:14 +0100 (CET) From: Felix Gruber To: guix-patches@gnu.org Subject: [PATCH] gnu: maths: dune-*: Update to version 2.7.1 Date: Thu, 4 Mar 2021 20:53:54 +0100 Message-Id: <20210304195354.62983-1-felgru@posteo.net> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=felgru@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.6 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/maths.scm (dune-alugrid, dune-common, dune-functions, dune-geometry, dune-grid, dune-istl, dune-localfunctions, dune-pdelab, dune-subgrid, dune-typetree, dune-uggrid): Update to version [...] Content analysis details: (1.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/maths.scm (dune-alugrid, dune-common, dune-functions, dune-geometry, dune-grid, dune-istl, dune-localfunctions, dune-pdelab, dune-subgrid, dune-typetree, dune-uggrid): Update to version 2.7.1. (dune-istl)[source](patches) Remove patch that is no longer needed. * gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove above patch. --- gnu/local.mk | 1 - gnu/packages/maths.scm | 53 ++++++------ .../dune-istl-2.7-fix-non-mpi-tests.patch | 82 ------------------- 3 files changed, 26 insertions(+), 110 deletions(-) delete mode 100644 gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3557d9f429..c3c838ea67 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -941,7 +941,6 @@ dist_patch_DATA = \ %D%/packages/patches/doxygen-1.8.17-runtests.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ - %D%/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/ecl-16-format-directive-limit.patch \ %D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6856737bdf..c249b80ee8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 Robert Smith ;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2020 Felix Gruber +;;; Copyright © 2020, 2021 Felix Gruber ;;; Copyright © 2020 R Veera Kumar ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Nicolò Balzarotti @@ -5186,7 +5186,7 @@ linear algebra primitives specifically targeting graph analytics.") (define-public dune-common (package (name "dune-common") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -5194,7 +5194,7 @@ linear algebra primitives specifically targeting graph analytics.") version "/dune-common-" version ".tar.gz")) (sha256 (base32 - "140q1zh44cr5yrjwg4b5ga803rkqv55vk30l2cqm29aklj1wb0rw")))) + "0sidwdkyrrqjkqhpvrlc991pzi5xzlvxk91s2n7qk3widwy7fch2")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5224,7 +5224,7 @@ Differences} (FD).") (define-public dune-geometry (package (name "dune-geometry") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -5232,7 +5232,7 @@ Differences} (FD).") version "/dune-geometry-" version ".tar.gz")) (sha256 (base32 - "1cicvlwbyyw76npicnblxckyvhbfn3ip8isydiv3hlrlz8zcg5nr")))) + "068mh3fd110xl27rwxqlqy4d9cpqw2vqm2pzfrripiaqscb3byfy")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5264,7 +5264,7 @@ This package contains the basic DUNE geometry classes.") (define-public dune-uggrid (package (name "dune-uggrid") - (version "2.7.0") + (version "2.7.1") (source (origin (method git-fetch) @@ -5274,7 +5274,7 @@ This package contains the basic DUNE geometry classes.") (file-name (git-file-name name version)) (sha256 (base32 - "192miqgmfj6jwk969gydzpbv9ki7jg5nky3ydnrwa2nq29b5xkh0")))) + "11qz52g9d5k96fqik2lyi80xryw174rnny074pj70ardl6zzz83p")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5301,7 +5301,7 @@ This package contains the DUNE UG grid classes.") (define-public dune-grid (package (name "dune-grid") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -5309,7 +5309,7 @@ This package contains the DUNE UG grid classes.") version "/dune-grid-" version ".tar.gz")) (sha256 (base32 - "17fjz30qazjgl11sryyxnw9klai4yz1ji4bs68013xcxc5hdv27s")))) + "15iws03hkbmr4a4rqqb0rriz1m8szl96wdr7gw0jmrcnlzbdbbx5")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5344,7 +5344,7 @@ This package contains the basic DUNE grid classes.") (define-public dune-istl (package (name "dune-istl") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -5352,8 +5352,7 @@ This package contains the basic DUNE grid classes.") version "/dune-istl-" version ".tar.gz")) (sha256 (base32 - "0gl3wgz5rs6sb4m83440ny45sbx7z7lnbi3gx6r9nm3rvy5j33f9")) - (patches (search-patches "dune-istl-2.7-fix-non-mpi-tests.patch")))) + "1cy69s1266hvnh8blznlvvkrf8i2g640rc3mf7kp872wgvdz4nb9")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5403,7 +5402,7 @@ aggregation-based algebraic multigrid.") (define-public dune-localfunctions (package (name "dune-localfunctions") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -5411,7 +5410,7 @@ aggregation-based algebraic multigrid.") version "/dune-localfunctions-" version ".tar.gz")) (sha256 (base32 - "1yih59h6vngii696bx1c2vil02lriij4kz0nc583mjn9kiaqxfqd")))) + "031i42anrhi0ngpvp42rdjbkic7v3008fwild9xg7flffwvnpshg")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5458,17 +5457,17 @@ assemble global function spaces on finite-element grids.") (define-public dune-alugrid (package (name "dune-alugrid") - (version "2.7.0-git-81d35682") + (version "2.7.1-git-178a69b6") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.dune-project.org/extensions/dune-alugrid.git") - (commit "81d356827c84454b971937db02c02b90bbcd7fe5"))) + (commit "178a69b69eca8bf3e31ddce0fd8c990fee4931ae"))) (file-name (git-file-name name version)) (sha256 (base32 - "0z54lwfp53prcrs94k8gwh047l9z642jll3l56xlyfr69z0b2zz1")))) + "1fbjc5ydcax8qacrq4a703ln6xfcfz500lvy628jrm8hg6zqd61g")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5508,17 +5507,17 @@ cubes.") (define-public dune-subgrid (package (name "dune-subgrid") - (version "2.7.0-git-2103a363") + (version "2.7.1-git-45d1ee9f") (source (origin (method git-fetch) (uri (git-reference (url "https://git.imp.fu-berlin.de/agnumpde/dune-subgrid") - (commit "2103a363f32e8d7b60e66eee7ddecf969f6cf762"))) + (commit "45d1ee9f3f711e209695deee97912f4954f7f280"))) (file-name (git-file-name name version)) (sha256 (base32 - "1wsjlypd3835c3arqjkw836cxx5q67zy447wa65q634lf6f6v9ia")))) + "0xjf7865wil7kzym608kv3nc3ff3m3nlqich4k9wjyvy3lz6panh")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5548,7 +5547,7 @@ provides the full grid interface including adaptive mesh refinement.") (define-public dune-typetree (package (name "dune-typetree") - (version "2.7.0") + (version "2.7.1") (source (origin (method git-fetch) @@ -5558,7 +5557,7 @@ provides the full grid interface including adaptive mesh refinement.") (file-name (git-file-name name version)) (sha256 (base32 - "1rhv25yg0q1hw50c8wlfqhgwrjl4mh62zq9v14ilwgzbfgxmpiy7")))) + "1kx9k8i7pdw6l6ny6nq85v5p1nd6yxldzaj8k3nizaz3q1j407pv")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5587,7 +5586,7 @@ operating on statically typed trees of objects.") (define-public dune-functions (package (name "dune-functions") - (version "2.7.0") + (version "2.7.1") (source (origin (method git-fetch) @@ -5597,7 +5596,7 @@ operating on statically typed trees of objects.") (file-name (git-file-name name version)) (sha256 (base32 - "1na4gcih0kin37ksj2xj07ds04v7zx53pjdhm1hzy55jjfqdjk8h")))) + "04dhr4asnl38bf1gp8hrk31maav33m7q71lhl2n5yk1q1x6i77nw")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5637,17 +5636,17 @@ implemented as callable objects, and bases of finite element spaces.") (define-public dune-pdelab (package (name "dune-pdelab") - (version "2.7.0-git-476fe437") + (version "2.7.1-git-3435f7f1") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.dune-project.org/pdelab/dune-pdelab") - (commit "476fe43763fa6f459c5e4658e2a2b4b5582db834"))) + (commit "3435f7f1f4d05e3f6e8d9fe8a06a09569c7244be"))) (file-name (git-file-name name version)) (sha256 (base32 - "0cs36piqzn6rq0j2ih3ab3q3q9yg199wk72k5qi86pkzh7i7fdn1")))) + "0akllyj4qh686h1xs53n102vf70ydxa7g6ha5gj3wdlig2ny4vik")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; XXX: the tests cannot be compiled (inputs diff --git a/gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch b/gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch deleted file mode 100644 index ee2bb8f676..0000000000 --- a/gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch +++ /dev/null @@ -1,82 +0,0 @@ -Fix build of dune-istl's tests - -Patch copied from upstream source repository: - -https://gitlab.dune-project.org/core/dune-istl/-/commit/9eee3462df5a64881c08574f9291e76db398de0a - -From 9eee3462df5a64881c08574f9291e76db398de0a Mon Sep 17 00:00:00 2001 -From: Felix Gruber -Date: Sat, 4 Apr 2020 15:27:09 +0200 -Subject: [PATCH] make tests succeed when MPI is disabled - -When MPI is not available or explicitly disabled with the CMake build -option -DCMAKE_IDSABLE_FIND_PACKAGE_MPI=TRUE, some tests were unable to -build. - -The tests created from solverfactorytest.cc.in and part of -scalarproductstest.cc use Dune::OwnerOverlapCopyCommunication which is -defined behind `#if HAVE_MPI` and is thus not available in a non-MPI -build. I've thus disabled those tests when MPI is unavailable. - -The matrixmarkettest did not work without MPI, as it contained some code -using the wrong template parameters when HAVE_MPI was not set. Those -template paramters have been fixed now. - -I've confirmed, that after my changes `make build_tests` succeeds to -build all tests and that those tests run without failure. ---- - dune/istl/test/CMakeLists.txt | 3 ++- - dune/istl/test/matrixmarkettest.cc | 2 +- - dune/istl/test/scalarproductstest.cc | 2 ++ - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/dune/istl/test/CMakeLists.txt b/dune/istl/test/CMakeLists.txt -index ffd87969..2c7b2387 100644 ---- a/dune/istl/test/CMakeLists.txt -+++ b/dune/istl/test/CMakeLists.txt -@@ -77,7 +77,8 @@ set(DUNE_TEST_FACTORY_BLOCK_SIZES - function(add_factory_test BLOCK) - STRING(REGEX REPLACE "[^a-zA-Z0-9]" "" BLOCK_CLEAN ${BLOCK}) - configure_file(solverfactorytest.cc.in solverfactorytest_${BLOCK_CLEAN}.cc) -- dune_add_test(SOURCES ${CMAKE_CURRENT_BINARY_DIR}/solverfactorytest_${BLOCK_CLEAN}.cc) -+ dune_add_test(SOURCES ${CMAKE_CURRENT_BINARY_DIR}/solverfactorytest_${BLOCK_CLEAN}.cc -+ CMAKE_GUARD HAVE_MPI) - endfunction(add_factory_test) - - foreach(FIELD_TYPE ${DUNE_TEST_FACTORY_FIELD_TYPES}) -diff --git a/dune/istl/test/matrixmarkettest.cc b/dune/istl/test/matrixmarkettest.cc -index b335afe6..ce30e8ae 100644 ---- a/dune/istl/test/matrixmarkettest.cc -+++ b/dune/istl/test/matrixmarkettest.cc -@@ -52,7 +52,7 @@ int testMatrixMarket(int N) - storeMatrixMarket(mat, std::string("testmat"), comm); - storeMatrixMarket(bv, std::string("testvec"), comm, false); - #else -- typedef Dune::MatrixAdapter Operator; -+ typedef Dune::MatrixAdapter Operator; - Operator op(mat); - op.apply(bv, cv); - -diff --git a/dune/istl/test/scalarproductstest.cc b/dune/istl/test/scalarproductstest.cc -index 452b1d89..f46ce2a9 100644 ---- a/dune/istl/test/scalarproductstest.cc -+++ b/dune/istl/test/scalarproductstest.cc -@@ -115,6 +115,7 @@ int main(int argc, char** argv) - scalarProductTest(scalarProduct,numBlocks); - } - -+#if HAVE_MPI - // Test the ParallelScalarProduct class - { - using Vector = BlockVector >; -@@ -139,6 +140,7 @@ int main(int argc, char** argv) - ScalarProduct scalarProduct(communicator,SolverCategory::nonoverlapping); - scalarProductTest(scalarProduct,numBlocks); - } -+#endif - - return t.exit(); - } --- -2.25.1 - -- 2.30.1 From debbugs-submit-bounces@debbugs.gnu.org Thu May 20 18:06:54 2021 Received: (at 46929) by debbugs.gnu.org; 20 May 2021 22:06:54 +0000 Received: from localhost ([127.0.0.1]:35378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljqoY-0007hR-ST for submit@debbugs.gnu.org; Thu, 20 May 2021 18:06:54 -0400 Received: from mout01.posteo.de ([185.67.36.65]:44087) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljqoV-0007hD-43 for 46929@debbugs.gnu.org; Thu, 20 May 2021 18:06:45 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 057B0240028 for <46929@debbugs.gnu.org>; Fri, 21 May 2021 00:06:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1621548397; bh=qqGcG2Sq/EmY7Idw874MUvlj1fxO6U7E/KqwZJ/QzKo=; h=From:To:Cc:Subject:Date:From; b=WPOJ1PrRzMwANTHhZnpjwE+KQXLt7A/pmSMZszIpC2myjmV2n9VKD/0D26D9Sv06c t9Sb7W9x48NTKkx+XCc46vdeDIRLO48GwFyFb/+Bv3pA9HIdNN+pst7A1VGchZgfC8 Hx8fzkBtw2IE0gEzyB/kL1iXQifTsl//3NH4x9byZi4bN2OlbI9CeEWTjMom+SBn3g 36Grev2NhognRDDZGmLzGgQMWQYgeNRag4Vr9EG9tYdrkzJIEpDZhOhYNjv4jus26O pTapO4BTz297ktVm1NFBsvgc8cj2/rvN+C+adDSM7Yswzqbgo//P0l7noxmShxwUt3 rY3WaMki3cgUA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FmP301gMKz6tm4; Fri, 21 May 2021 00:06:35 +0200 (CEST) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v2] gnu: maths: dune-*: Update to version 2.7.1 Date: Thu, 20 May 2021 22:06:03 +0000 Message-Id: <20210520220603.20289-1-felgru@posteo.net> In-Reply-To: <20210304195354.62983-1-felgru@posteo.net> References: <20210304195354.62983-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maths.scm (dune-alugrid, dune-common, dune-functions, dune-geometry, dune-grid, dune-istl, dune-localfunctions, dune-pdelab, dune-subgrid, dune-typetree, dune-uggrid): Update to version 2.7.1. (dune-istl)[source](patches) Remove patch that is no longer needed. (dune-alugrid, dune-subgrid, dune-pdelab)[version]: Use `git-version` to compute the version string. * gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove above patch. --- Since v1 of the patch, I've made the following changes: * Use git-version to generate versions. * Add comments to explain that some of the packages didn't have a recent release tag. * Update dune-alugrid to use the latest commit from the releases/2.7 branch. (The simd tests in dune-common take ages to complete, I wonder if I should disable them to significantly cut down the build time.) gnu/local.mk | 1 - gnu/packages/maths.scm | 280 +++++++++--------- .../dune-istl-2.7-fix-non-mpi-tests.patch | 82 ----- 3 files changed, 144 insertions(+), 219 deletions(-) delete mode 100644 gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index dd68bb5957..0d676dcf69 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -955,7 +955,6 @@ dist_patch_DATA = \ %D%/packages/patches/doxygen-1.8.17-runtests.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ - %D%/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/ecl-16-format-directive-limit.patch \ %D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6b3f5cf41c..65ae445efb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5346,7 +5346,7 @@ linear algebra primitives specifically targeting graph analytics.") (define-public dune-common (package (name "dune-common") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -5354,7 +5354,7 @@ linear algebra primitives specifically targeting graph analytics.") version "/dune-common-" version ".tar.gz")) (sha256 (base32 - "140q1zh44cr5yrjwg4b5ga803rkqv55vk30l2cqm29aklj1wb0rw")))) + "0sidwdkyrrqjkqhpvrlc991pzi5xzlvxk91s2n7qk3widwy7fch2")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5384,7 +5384,7 @@ Differences} (FD).") (define-public dune-geometry (package (name "dune-geometry") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -5392,7 +5392,7 @@ Differences} (FD).") version "/dune-geometry-" version ".tar.gz")) (sha256 (base32 - "1cicvlwbyyw76npicnblxckyvhbfn3ip8isydiv3hlrlz8zcg5nr")))) + "068mh3fd110xl27rwxqlqy4d9cpqw2vqm2pzfrripiaqscb3byfy")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5424,7 +5424,7 @@ This package contains the basic DUNE geometry classes.") (define-public dune-uggrid (package (name "dune-uggrid") - (version "2.7.0") + (version "2.7.1") (source (origin (method git-fetch) @@ -5434,7 +5434,7 @@ This package contains the basic DUNE geometry classes.") (file-name (git-file-name name version)) (sha256 (base32 - "192miqgmfj6jwk969gydzpbv9ki7jg5nky3ydnrwa2nq29b5xkh0")))) + "11qz52g9d5k96fqik2lyi80xryw174rnny074pj70ardl6zzz83p")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5461,7 +5461,7 @@ This package contains the DUNE UG grid classes.") (define-public dune-grid (package (name "dune-grid") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -5469,7 +5469,7 @@ This package contains the DUNE UG grid classes.") version "/dune-grid-" version ".tar.gz")) (sha256 (base32 - "17fjz30qazjgl11sryyxnw9klai4yz1ji4bs68013xcxc5hdv27s")))) + "15iws03hkbmr4a4rqqb0rriz1m8szl96wdr7gw0jmrcnlzbdbbx5")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5504,7 +5504,7 @@ This package contains the basic DUNE grid classes.") (define-public dune-istl (package (name "dune-istl") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -5512,8 +5512,7 @@ This package contains the basic DUNE grid classes.") version "/dune-istl-" version ".tar.gz")) (sha256 (base32 - "0gl3wgz5rs6sb4m83440ny45sbx7z7lnbi3gx6r9nm3rvy5j33f9")) - (patches (search-patches "dune-istl-2.7-fix-non-mpi-tests.patch")))) + "1cy69s1266hvnh8blznlvvkrf8i2g640rc3mf7kp872wgvdz4nb9")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5563,7 +5562,7 @@ aggregation-based algebraic multigrid.") (define-public dune-localfunctions (package (name "dune-localfunctions") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -5571,7 +5570,7 @@ aggregation-based algebraic multigrid.") version "/dune-localfunctions-" version ".tar.gz")) (sha256 (base32 - "1yih59h6vngii696bx1c2vil02lriij4kz0nc583mjn9kiaqxfqd")))) + "031i42anrhi0ngpvp42rdjbkic7v3008fwild9xg7flffwvnpshg")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5616,99 +5615,105 @@ assemble global function spaces on finite-element grids.") (license license:gpl2))) (define-public dune-alugrid - (package - (name "dune-alugrid") - (version "2.7.0-git-81d35682") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.dune-project.org/extensions/dune-alugrid.git") - (commit "81d356827c84454b971937db02c02b90bbcd7fe5"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0z54lwfp53prcrs94k8gwh047l9z642jll3l56xlyfr69z0b2zz1")))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-include - (lambda _ - (substitute* "dune/alugrid/test/test-alugrid.cc" - (("doc/grids/gridfactory/testgrids") - "doc/dune-grid/grids/gridfactory/testgrids")) - #t)) - (add-after 'build 'build-tests - (lambda* (#:key inputs make-flags #:allow-other-keys) - (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "dune-grid") "/share")) - (apply invoke "make" "build_tests" make-flags)))))) - (inputs - `(("dune-common" ,dune-common) - ("dune-geometry" ,dune-geometry) - ("dune-grid" ,dune-grid) - ;; Optional - ("metis" ,metis) - ("openblas" ,openblas) - ("python" ,python) - ("superlu" ,superlu) - ("gmp" ,gmp) - ("zlib" ,zlib))) - (native-inputs - `(("gfortran" ,gfortran) - ("pkg-config" ,pkg-config))) - (home-page "https://dune-project.org/") - (synopsis "Distributed and Unified Numerics Environment") - (description "ALUGrid is an adaptive, loadbalancing, unstructured + ;; This was the last commit on the releases/2.7 branch as of 2021-05-20, + ;; unfortunately there was no tag for any 2.7 release. + (let ((commit "51bde29a2dfa7cfac4fb73d40ffd42b9c1eb1d3d")) + (package + (name "dune-alugrid") + (version (git-version "2.7.1" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.dune-project.org/extensions/dune-alugrid.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z16wg6llzxs7vjg2yilg31vwnkz8k050j6bspg3blbym0razy15")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-include + (lambda _ + (substitute* "dune/alugrid/test/test-alugrid.cc" + (("doc/grids/gridfactory/testgrids") + "doc/dune-grid/grids/gridfactory/testgrids")) + #t)) + (add-after 'build 'build-tests + (lambda* (#:key inputs make-flags #:allow-other-keys) + (setenv "CPLUS_INCLUDE_PATH" + (string-append (assoc-ref inputs "dune-grid") "/share")) + (apply invoke "make" "build_tests" make-flags)))))) + (inputs + `(("dune-common" ,dune-common) + ("dune-geometry" ,dune-geometry) + ("dune-grid" ,dune-grid) + ;; Optional + ("metis" ,metis) + ("openblas" ,openblas) + ("python" ,python) + ("superlu" ,superlu) + ("gmp" ,gmp) + ("zlib" ,zlib))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "ALUGrid is an adaptive, loadbalancing, unstructured implementation of the DUNE grid interface supporting either simplices or cubes.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public dune-subgrid - (package - (name "dune-subgrid") - (version "2.7.0-git-2103a363") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.imp.fu-berlin.de/agnumpde/dune-subgrid") - (commit "2103a363f32e8d7b60e66eee7ddecf969f6cf762"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1wsjlypd3835c3arqjkw836cxx5q67zy447wa65q634lf6f6v9ia")))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'build-tests - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags)))))) - (inputs - `(("dune-common" ,dune-common) - ("dune-geometry" ,dune-geometry) - ("dune-grid" ,dune-grid) - ;; Optional - ("metis" ,metis) - ("openblas" ,openblas) - ("gmp" ,gmp))) - (native-inputs - `(("gfortran" ,gfortran) - ("pkg-config" ,pkg-config))) - (home-page "http://numerik.mi.fu-berlin.de/dune-subgrid/index.php") - (synopsis "Distributed and Unified Numerics Environment") - (description "The dune-subgrid module marks elements of + ;; This was the last commit on the releases/2.7 branch as of 2021-05-20. + ;; Unfortunately the dune-subgrid repository contains no release tags. + (let ((commit "45d1ee9f3f711e209695deee97912f4954f7f280")) + (package + (name "dune-subgrid") + (version (git-version "2.7.1" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.imp.fu-berlin.de/agnumpde/dune-subgrid") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xjf7865wil7kzym608kv3nc3ff3m3nlqich4k9wjyvy3lz6panh")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-tests + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build_tests" make-flags)))))) + (inputs + `(("dune-common" ,dune-common) + ("dune-geometry" ,dune-geometry) + ("dune-grid" ,dune-grid) + ;; Optional + ("metis" ,metis) + ("openblas" ,openblas) + ("gmp" ,gmp))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "http://numerik.mi.fu-berlin.de/dune-subgrid/index.php") + (synopsis "Distributed and Unified Numerics Environment") + (description "The dune-subgrid module marks elements of another hierarchical dune grid. The set of marked elements can then be accessed as a hierarchical dune grid in its own right. Dune-Subgrid provides the full grid interface including adaptive mesh refinement.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public dune-typetree (package (name "dune-typetree") - (version "2.7.0") + (version "2.7.1") (source (origin (method git-fetch) @@ -5718,7 +5723,7 @@ provides the full grid interface including adaptive mesh refinement.") (file-name (git-file-name name version)) (sha256 (base32 - "1rhv25yg0q1hw50c8wlfqhgwrjl4mh62zq9v14ilwgzbfgxmpiy7")))) + "1kx9k8i7pdw6l6ny6nq85v5p1nd6yxldzaj8k3nizaz3q1j407pv")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5747,7 +5752,7 @@ operating on statically typed trees of objects.") (define-public dune-functions (package (name "dune-functions") - (version "2.7.0") + (version "2.7.1") (source (origin (method git-fetch) @@ -5757,7 +5762,7 @@ operating on statically typed trees of objects.") (file-name (git-file-name name version)) (sha256 (base32 - "1na4gcih0kin37ksj2xj07ds04v7zx53pjdhm1hzy55jjfqdjk8h")))) + "04dhr4asnl38bf1gp8hrk31maav33m7q71lhl2n5yk1q1x6i77nw")))) (build-system cmake-build-system) (arguments `(#:phases @@ -5795,45 +5800,48 @@ implemented as callable objects, and bases of finite element spaces.") (license (list license:lgpl3+ license:gpl2)))) (define-public dune-pdelab - (package - (name "dune-pdelab") - (version "2.7.0-git-476fe437") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.dune-project.org/pdelab/dune-pdelab") - (commit "476fe43763fa6f459c5e4658e2a2b4b5582db834"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0cs36piqzn6rq0j2ih3ab3q3q9yg199wk72k5qi86pkzh7i7fdn1")))) - (build-system cmake-build-system) - (arguments '(#:tests? #f)) ; XXX: the tests cannot be compiled - (inputs - `(("dune-common" ,dune-common) - ("dune-istl" ,dune-istl) - ("dune-localfunctions" ,dune-localfunctions) - ("dune-geometry" ,dune-geometry) - ("dune-grid" ,dune-grid) - ("dune-typetree" ,dune-typetree) - ("dune-functions" ,dune-functions) - ;; Optional - ("openblas" ,openblas) - ("eigen" ,eigen) - ("metis" ,metis) - ("python" ,python) - ("superlu" ,superlu) - ("gmp" ,gmp))) - (native-inputs - `(("gfortran" ,gfortran) - ("pkg-config" ,pkg-config))) - (home-page "https://dune-project.org/") - (synopsis "Differential equations solver toolbox") - (description "PDELab is a partial differential equations solver toolbox + ;; This was the last commit on the releases/2.7 branch as of 2021-05-20, + ;; unfortunately there was no tag for any 2.7 release. + (let ((commit "3435f7f1f4d05e3f6e8d9fe8a06a09569c7244be")) + (package + (name "dune-pdelab") + (version (git-version "2.7.1" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.dune-project.org/pdelab/dune-pdelab") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0akllyj4qh686h1xs53n102vf70ydxa7g6ha5gj3wdlig2ny4vik")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f)) ; XXX: the tests cannot be compiled + (inputs + `(("dune-common" ,dune-common) + ("dune-istl" ,dune-istl) + ("dune-localfunctions" ,dune-localfunctions) + ("dune-geometry" ,dune-geometry) + ("dune-grid" ,dune-grid) + ("dune-typetree" ,dune-typetree) + ("dune-functions" ,dune-functions) + ;; Optional + ("openblas" ,openblas) + ("eigen" ,eigen) + ("metis" ,metis) + ("python" ,python) + ("superlu" ,superlu) + ("gmp" ,gmp))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Differential equations solver toolbox") + (description "PDELab is a partial differential equations solver toolbox built on top of DUNE, the Distributed and Unified Numerics Environment.") - ;; Either GPL version 2 with "runtime exception" or LGPLv3+. - (license (list license:lgpl3+ license:gpl2)))) + ;; Either GPL version 2 with "runtime exception" or LGPLv3+. + (license (list license:lgpl3+ license:gpl2))))) (define add-openmpi-to-dune-package (let ((dune-package? diff --git a/gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch b/gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch deleted file mode 100644 index ee2bb8f676..0000000000 --- a/gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch +++ /dev/null @@ -1,82 +0,0 @@ -Fix build of dune-istl's tests - -Patch copied from upstream source repository: - -https://gitlab.dune-project.org/core/dune-istl/-/commit/9eee3462df5a64881c08574f9291e76db398de0a - -From 9eee3462df5a64881c08574f9291e76db398de0a Mon Sep 17 00:00:00 2001 -From: Felix Gruber -Date: Sat, 4 Apr 2020 15:27:09 +0200 -Subject: [PATCH] make tests succeed when MPI is disabled - -When MPI is not available or explicitly disabled with the CMake build -option -DCMAKE_IDSABLE_FIND_PACKAGE_MPI=TRUE, some tests were unable to -build. - -The tests created from solverfactorytest.cc.in and part of -scalarproductstest.cc use Dune::OwnerOverlapCopyCommunication which is -defined behind `#if HAVE_MPI` and is thus not available in a non-MPI -build. I've thus disabled those tests when MPI is unavailable. - -The matrixmarkettest did not work without MPI, as it contained some code -using the wrong template parameters when HAVE_MPI was not set. Those -template paramters have been fixed now. - -I've confirmed, that after my changes `make build_tests` succeeds to -build all tests and that those tests run without failure. ---- - dune/istl/test/CMakeLists.txt | 3 ++- - dune/istl/test/matrixmarkettest.cc | 2 +- - dune/istl/test/scalarproductstest.cc | 2 ++ - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/dune/istl/test/CMakeLists.txt b/dune/istl/test/CMakeLists.txt -index ffd87969..2c7b2387 100644 ---- a/dune/istl/test/CMakeLists.txt -+++ b/dune/istl/test/CMakeLists.txt -@@ -77,7 +77,8 @@ set(DUNE_TEST_FACTORY_BLOCK_SIZES - function(add_factory_test BLOCK) - STRING(REGEX REPLACE "[^a-zA-Z0-9]" "" BLOCK_CLEAN ${BLOCK}) - configure_file(solverfactorytest.cc.in solverfactorytest_${BLOCK_CLEAN}.cc) -- dune_add_test(SOURCES ${CMAKE_CURRENT_BINARY_DIR}/solverfactorytest_${BLOCK_CLEAN}.cc) -+ dune_add_test(SOURCES ${CMAKE_CURRENT_BINARY_DIR}/solverfactorytest_${BLOCK_CLEAN}.cc -+ CMAKE_GUARD HAVE_MPI) - endfunction(add_factory_test) - - foreach(FIELD_TYPE ${DUNE_TEST_FACTORY_FIELD_TYPES}) -diff --git a/dune/istl/test/matrixmarkettest.cc b/dune/istl/test/matrixmarkettest.cc -index b335afe6..ce30e8ae 100644 ---- a/dune/istl/test/matrixmarkettest.cc -+++ b/dune/istl/test/matrixmarkettest.cc -@@ -52,7 +52,7 @@ int testMatrixMarket(int N) - storeMatrixMarket(mat, std::string("testmat"), comm); - storeMatrixMarket(bv, std::string("testvec"), comm, false); - #else -- typedef Dune::MatrixAdapter Operator; -+ typedef Dune::MatrixAdapter Operator; - Operator op(mat); - op.apply(bv, cv); - -diff --git a/dune/istl/test/scalarproductstest.cc b/dune/istl/test/scalarproductstest.cc -index 452b1d89..f46ce2a9 100644 ---- a/dune/istl/test/scalarproductstest.cc -+++ b/dune/istl/test/scalarproductstest.cc -@@ -115,6 +115,7 @@ int main(int argc, char** argv) - scalarProductTest(scalarProduct,numBlocks); - } - -+#if HAVE_MPI - // Test the ParallelScalarProduct class - { - using Vector = BlockVector >; -@@ -139,6 +140,7 @@ int main(int argc, char** argv) - ScalarProduct scalarProduct(communicator,SolverCategory::nonoverlapping); - scalarProductTest(scalarProduct,numBlocks); - } -+#endif - - return t.exit(); - } --- -2.25.1 - -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:37:41 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:37:42 +0000 Received: from localhost ([127.0.0.1]:41468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZu9-0007n7-Ls for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:37:41 -0500 Received: from mout01.posteo.de ([185.67.36.65]:51045) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZu7-0007mt-Of for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:37:40 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 72E58240027 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:37:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834653; bh=dm0qhK7TKMJlVaoA14AW0uR/SPevLnn3mYuMbKEUA3Q=; h=From:To:Cc:Subject:Date:From; b=PZobvOP+SVMKFq6x/UHqKgIOhrwuTvzFveQfDEaTbaeg3IxglhUoRWVg/vxS1XkkE xli3uSGYiSebwpjeCfOOGHbttgfaGACQvnOaWU8HcxExbf4ErGhT/RM0+kfgvcz+e+ gebudps3+rtlvIVm+YcX7BYXXqbj0ClXI7MkoS99TIwYHfGOqxbBIMYIhoM8HMCyKG aSz7UglnhtCdI3ii0K3pCnnhRArtYIpTtG9/GUCin/CIC8Src7SMRJNtbGZthlQdyD nH18Xl0o7cgSuoUpHIYkElGQ7TLXDD+8vuGLsQTrb6EcA+lQ3AQumvBoxGT0NGqA9K 8u77UiJln8swA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRjm4DP7z9rxF; Sat, 18 Dec 2021 14:37:32 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 00/12] gnu: maths: dune-*: Update to version 2.7.1 Date: Sat, 18 Dec 2021 13:36:48 +0000 Message-Id: <20211218133700.10135-1-felgru@posteo.net> In-Reply-To: <20210520220603.20289-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) I've rebased the patches onto master and made some small changes to use the new simplified package inputs. I've also split the patch into one patch per package to be in line with common practice. To speed up the build-tests phase, I've made it to honor parallel-build? to run make with multiple jobs. This makes the build faster, but dune-common still takes a while to build (~20min on my computer). Finally I've updated the dune-pdelab package to use the latest commit on the releases/2.7 branch (there is no tag for version 2.7 or 2.7.1). Since my last patch Dune 2.8 has been released, but I wasn't able to build dune-subgrid with it since building against Dune 2.8 was giving me failures in dune-subgrid's test suite. Until the cause of those test failures is fixed, it's probably best to only upgrade to 2.7.1. Felix Gruber (12): gnu: Modernize add-openmpi-to-dune-package gnu: dune-common: Update to 2.7.1. gnu: dune-geometry: Update to 2.7.1. gnu: dune-uggrid: Update to 2.7.1. gnu: dune-grid: Update to 2.7.1. gnu: dune-istl: Update to 2.7.1. gnu: dune-localfunctions: Update to 2.7.1. gnu: dune-alugrid: Update to 2.7.1. gnu: dune-subgrid: Update to 2.7.1. gnu: dune-typetree: Update to 2.7.1. gnu: dune-functions: Update to 2.7.1. gnu: dune-pdelab: Update to 2.7.1. gnu/local.mk | 1 - gnu/packages/maths.scm | 350 ++++++++++-------- .../dune-istl-2.7-fix-non-mpi-tests.patch | 82 ---- 3 files changed, 199 insertions(+), 234 deletions(-) delete mode 100644 gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:37:53 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:37:53 +0000 Received: from localhost ([127.0.0.1]:41471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuK-0007nU-Uz for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:37:53 -0500 Received: from mout01.posteo.de ([185.67.36.65]:35359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuI-0007nH-QS for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:37:51 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 372CA240029 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:37:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834665; bh=dQ4YLPQN/iW7WKQoLIBa9aFBryPV2VU34OA+YC1OJ/U=; h=From:To:Cc:Subject:Date:From; b=Xva2dh7zF0b4qJPniOnm9AiBzZsXz9UEJUmMEg9sv5C5jEp+tcoE/JVTotIs03lY6 +PHf9TVmqvRh/RTdrZr++wkzXKcCqDEY6/NSrMDnLYYUOAnrCZhnTrK7PZDSsAMnlB gPA/1A1RZPSgNDoGt0aNXVAYiTwRr/2jNVFe4SKprcAMByJZcSA8XEZRd+Vpo9oZ3E aAXM7iaW5IRbWo9sd236WPIC5SvKcedtTBkgjz1BoxookW1/GJbgr0smu/05WPJGzX dxTr8xja2eeTO3RSBtEbDCli5Xv8NxxMRnXjNFNKFOxZL0+mI4bSs+2IwqU6TemQUy FQEftNVkMO9NA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRk04b46z6tnN; Sat, 18 Dec 2021 14:37:44 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 01/12] gnu: Modernize add-openmpi-to-dune-package Date: Sat, 18 Dec 2021 13:36:49 +0000 Message-Id: <20211218133700.10135-2-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (add-openmpi-to-dune-package): Use modify-inputs. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 3bac086666..5c2c3d75d7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6729,8 +6729,8 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.") (if (dune-package? p) (package (inherit p) (name (string-append (package-name p) "-openmpi")) - (inputs `(,@(package-inputs p) - ("openmpi" ,openmpi))) + (inputs (modify-inputs (package-inputs p) + (append openmpi))) (arguments (substitute-keyword-arguments (package-arguments p) ((#:phases phases '%standard-phases) -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:38:05 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:06 +0000 Received: from localhost ([127.0.0.1]:41480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuX-0007oh-GR for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:05 -0500 Received: from mout02.posteo.de ([185.67.36.66]:54789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuU-0007nf-TF for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:03 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 0BB05240101 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:37:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834677; bh=B2Ip6zZoaDmKwBAN9QklCq8FOse/fBTYzNH3oTR6G10=; h=From:To:Cc:Subject:Date:From; b=iee9eptkUuQn4BRszBb9rqRTi/OnLLCPfTzV/Uo9TE9YRJr6gpQCjV1yVMRT+D9L9 t7h0qiiVixtlCeH0oVznyKPlD+9LYgQ4yC/IRw39JX2sRMhW4315q7tgsRdcbzOYBn xzgyDzSnfsvYgD6SimFgLFW2A/h2UjlUWPdh9dk/yhfVhMftCP2r7UKtFQw+hov5iR 8oSHMEow+8J3t2No+O/R/JC13NItbVyrm5bkq1wDh5L7PdKNwcLY63eLCK9lQ1jSmv 1jxvdr84hyyIy7ljs7RBEULgqP7u/lVrXXrioioLi86Ffdozzhh6Jr1gyZLU6e2jbG M9Q7mF3JrOCgA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkD3JNwz9rxP; Sat, 18 Dec 2021 14:37:56 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 02/12] gnu: dune-common: Update to 2.7.1. Date: Sat, 18 Dec 2021 13:36:50 +0000 Message-Id: <20211218133700.10135-3-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (dune-common): Update to 2.7.1. [arguments]: Parallelize build-tests phase. --- gnu/packages/maths.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5c2c3d75d7..eb41e52f5a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6249,7 +6249,7 @@ linear algebra primitives specifically targeting graph analytics.") (define-public dune-common (package (name "dune-common") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -6257,14 +6257,18 @@ linear algebra primitives specifically targeting graph analytics.") version "/dune-common-" version ".tar.gz")) (sha256 (base32 - "140q1zh44cr5yrjwg4b5ga803rkqv55vk30l2cqm29aklj1wb0rw")))) + "0sidwdkyrrqjkqhpvrlc991pzi5xzlvxk91s2n7qk3widwy7fch2")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'build 'build-tests - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags)))))) + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "build_tests" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) (inputs (list gmp metis openblas python superlu)) (native-inputs -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:38:06 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:06 +0000 Received: from localhost ([127.0.0.1]:41483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuX-0007oq-Ty for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:06 -0500 Received: from mout01.posteo.de ([185.67.36.65]:43401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuV-0007ng-1Q for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:03 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 6CA6C240027 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:37:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834677; bh=iPCfm9hp6AJO3yVU4jkoLuu+V2Mp231Bb0NfFgG7kvo=; h=From:To:Cc:Subject:Date:From; b=eoDN2lHydL5bfpYxw0t1XgPiRtCO4OPijPFLGAEJdwZi1v3N82Nlb5VYfs4tD6vpj OjWAsFHaEXi1ljSGoRC9RyqCMMYBtnHx9Em0oblPg7ZAx5vstIoG3FiRIFaAb1G/fC eyOB+xB/1nPS1Hd7bAAv6ZGH3NZEk5FnIfh3ikYMPTOAv4Hm82hwy/pxz6mUuM93T/ TuJzobDBJXR+UlSKhgi35MF4Sm7cTzl+XkfrkVhm03X4r18T+xenq63SrrH2oW1kcI 1/79PNzYLWF0rd4p/i3pghA13kVWc1l6OM0D+uUtqB7l1bApDel2Gj6GJzVImeLjDf 8YOCtuOjqTMbA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkF0MYmz9rxR; Sat, 18 Dec 2021 14:37:57 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 03/12] gnu: dune-geometry: Update to 2.7.1. Date: Sat, 18 Dec 2021 13:36:51 +0000 Message-Id: <20211218133700.10135-4-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (dune-geometry): Update to 2.7.1. [arguments]: Parallelize build-tests phase. --- gnu/packages/maths.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index eb41e52f5a..0cfee02653 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6286,7 +6286,7 @@ Differences} (FD).") (define-public dune-geometry (package (name "dune-geometry") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -6294,14 +6294,18 @@ Differences} (FD).") version "/dune-geometry-" version ".tar.gz")) (sha256 (base32 - "1cicvlwbyyw76npicnblxckyvhbfn3ip8isydiv3hlrlz8zcg5nr")))) + "068mh3fd110xl27rwxqlqy4d9cpqw2vqm2pzfrripiaqscb3byfy")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'build 'build-tests - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags)))))) + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "build_tests" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) (inputs (list dune-common ;; Optional -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:38:09 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:09 +0000 Received: from localhost ([127.0.0.1]:41490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZub-0007ph-Fc for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:09 -0500 Received: from mout02.posteo.de ([185.67.36.66]:56285) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuW-0007nj-AL for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:04 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AECCA240101 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:37:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834678; bh=Rno0HFXXb3NpjYEB8dZJyG3dnvTg015EDBACYMRFTHk=; h=From:To:Cc:Subject:Date:From; b=WbC/p3GQqw6rJKxFxBBmWfiEDjt5UGGf5CeX2TTrSNI//X4mfNFULNrk0jlZ/Q8yl h51/rA2R97RMW26O7/6ocaO/S1ZCB1gZpaLIkEdbE+9hyF4r/ZSgcl2F9SoxjsHBDF DszqYzXX78H09izI/j41SfyKjGp8ti5R8Ap+cTG1DTObQ3hgRq9X+Z+bGq6Rq2bZdW TYqPXT3tkxoa/edPRPlIQvHNgilAGZAK/367Cfot7WlOUAzPoR4YQBF9glvLW5F1rG Z1AiDMx2WViRBB8IzbyNz6Jj+5JQww0/QSnBIzAPVEa3xY+FRcrXBzWADvk7jp7Mf7 jPRC3fea21yHQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkG2Fs6z9rxP; Sat, 18 Dec 2021 14:37:58 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 05/12] gnu: dune-grid: Update to 2.7.1. Date: Sat, 18 Dec 2021 13:36:53 +0000 Message-Id: <20211218133700.10135-6-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (dune-grid): Update to 2.7.1. [arguments]: Parallelize build-tests phase. --- gnu/packages/maths.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index db20722fb4..26833350c7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6367,7 +6367,7 @@ This package contains the DUNE UG grid classes.") (define-public dune-grid (package (name "dune-grid") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -6375,14 +6375,18 @@ This package contains the DUNE UG grid classes.") version "/dune-grid-" version ".tar.gz")) (sha256 (base32 - "17fjz30qazjgl11sryyxnw9klai4yz1ji4bs68013xcxc5hdv27s")))) + "15iws03hkbmr4a4rqqb0rriz1m8szl96wdr7gw0jmrcnlzbdbbx5")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'build 'build-tests - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags)))))) + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "build_tests" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) (inputs (list dune-common dune-geometry -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:38:14 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:14 +0000 Received: from localhost ([127.0.0.1]:41492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZub-0007pj-Ni for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:14 -0500 Received: from mout02.posteo.de ([185.67.36.66]:38761) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuW-0007nl-TG for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:05 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 4BCBF240101 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:37:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834679; bh=C6lik4aNmOHeYBFjmH34B/nWnOQ8I9o8DR7ghkD04mM=; h=From:To:Cc:Subject:Date:From; b=ACxiP3DLk61D7WjE92IaJzvRbo+9S0xPI+eGE4zC4I5bVfVdIz4D2qufnnxWRGQJT Owiq8Cu7I7VyrgdwP9Logvrju2sOHY86ALaFYuswsqyyr/yqsxcFb+mSlovZMdK9Lq oF7AgIpZpCC5R/3pPiiLDf6M2VFfi4S6wYv9cnwZ1FjnfwwhJ2eWaKP23kG0Mr16bf iVU8Hi6kiFOV101YeJWeDBDeQyLH0F0XKQLJ2r7rc3wdExtBRCkfy+WYRIg4U50ZPD /L1cu8dDe2SXSMKj8uRJrHWDOhdnnyT+GUKvSbdp2dcTrwdLqPshsZsBBdGyzwwHUa 0hpe0nohN4wRg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkG5nRYz6tmZ; Sat, 18 Dec 2021 14:37:58 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 06/12] gnu: dune-istl: Update to 2.7.1. Date: Sat, 18 Dec 2021 13:36:54 +0000 Message-Id: <20211218133700.10135-7-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maths.scm (dune-istl): Update to 2.7.1. [arguments]: Parallelize build-tests phase. [source](patches) Remove patch that is no longer needed. * gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove above patch. --- gnu/local.mk | 1 - gnu/packages/maths.scm | 13 +-- .../dune-istl-2.7-fix-non-mpi-tests.patch | 82 ------------------- 3 files changed, 8 insertions(+), 88 deletions(-) delete mode 100644 gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 76403bbdf9..ed6dc3d0c3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1001,7 +1001,6 @@ dist_patch_DATA = \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ - %D%/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/dynaconf-unvendor-deps.patch \ %D%/packages/patches/ecl-16-format-directive-limit.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 26833350c7..4f0e929318 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6413,7 +6413,7 @@ This package contains the basic DUNE grid classes.") (define-public dune-istl (package (name "dune-istl") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -6421,8 +6421,7 @@ This package contains the basic DUNE grid classes.") version "/dune-istl-" version ".tar.gz")) (sha256 (base32 - "0gl3wgz5rs6sb4m83440ny45sbx7z7lnbi3gx6r9nm3rvy5j33f9")) - (patches (search-patches "dune-istl-2.7-fix-non-mpi-tests.patch")))) + "1cy69s1266hvnh8blznlvvkrf8i2g640rc3mf7kp872wgvdz4nb9")))) (build-system cmake-build-system) (arguments `(#:phases @@ -6440,8 +6439,12 @@ This package contains the basic DUNE grid classes.") ":")) #t))) (add-after 'build 'build-tests - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags)))))) + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "build_tests" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) (inputs (list dune-common ;; Optional diff --git a/gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch b/gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch deleted file mode 100644 index ee2bb8f676..0000000000 --- a/gnu/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch +++ /dev/null @@ -1,82 +0,0 @@ -Fix build of dune-istl's tests - -Patch copied from upstream source repository: - -https://gitlab.dune-project.org/core/dune-istl/-/commit/9eee3462df5a64881c08574f9291e76db398de0a - -From 9eee3462df5a64881c08574f9291e76db398de0a Mon Sep 17 00:00:00 2001 -From: Felix Gruber -Date: Sat, 4 Apr 2020 15:27:09 +0200 -Subject: [PATCH] make tests succeed when MPI is disabled - -When MPI is not available or explicitly disabled with the CMake build -option -DCMAKE_IDSABLE_FIND_PACKAGE_MPI=TRUE, some tests were unable to -build. - -The tests created from solverfactorytest.cc.in and part of -scalarproductstest.cc use Dune::OwnerOverlapCopyCommunication which is -defined behind `#if HAVE_MPI` and is thus not available in a non-MPI -build. I've thus disabled those tests when MPI is unavailable. - -The matrixmarkettest did not work without MPI, as it contained some code -using the wrong template parameters when HAVE_MPI was not set. Those -template paramters have been fixed now. - -I've confirmed, that after my changes `make build_tests` succeeds to -build all tests and that those tests run without failure. ---- - dune/istl/test/CMakeLists.txt | 3 ++- - dune/istl/test/matrixmarkettest.cc | 2 +- - dune/istl/test/scalarproductstest.cc | 2 ++ - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/dune/istl/test/CMakeLists.txt b/dune/istl/test/CMakeLists.txt -index ffd87969..2c7b2387 100644 ---- a/dune/istl/test/CMakeLists.txt -+++ b/dune/istl/test/CMakeLists.txt -@@ -77,7 +77,8 @@ set(DUNE_TEST_FACTORY_BLOCK_SIZES - function(add_factory_test BLOCK) - STRING(REGEX REPLACE "[^a-zA-Z0-9]" "" BLOCK_CLEAN ${BLOCK}) - configure_file(solverfactorytest.cc.in solverfactorytest_${BLOCK_CLEAN}.cc) -- dune_add_test(SOURCES ${CMAKE_CURRENT_BINARY_DIR}/solverfactorytest_${BLOCK_CLEAN}.cc) -+ dune_add_test(SOURCES ${CMAKE_CURRENT_BINARY_DIR}/solverfactorytest_${BLOCK_CLEAN}.cc -+ CMAKE_GUARD HAVE_MPI) - endfunction(add_factory_test) - - foreach(FIELD_TYPE ${DUNE_TEST_FACTORY_FIELD_TYPES}) -diff --git a/dune/istl/test/matrixmarkettest.cc b/dune/istl/test/matrixmarkettest.cc -index b335afe6..ce30e8ae 100644 ---- a/dune/istl/test/matrixmarkettest.cc -+++ b/dune/istl/test/matrixmarkettest.cc -@@ -52,7 +52,7 @@ int testMatrixMarket(int N) - storeMatrixMarket(mat, std::string("testmat"), comm); - storeMatrixMarket(bv, std::string("testvec"), comm, false); - #else -- typedef Dune::MatrixAdapter Operator; -+ typedef Dune::MatrixAdapter Operator; - Operator op(mat); - op.apply(bv, cv); - -diff --git a/dune/istl/test/scalarproductstest.cc b/dune/istl/test/scalarproductstest.cc -index 452b1d89..f46ce2a9 100644 ---- a/dune/istl/test/scalarproductstest.cc -+++ b/dune/istl/test/scalarproductstest.cc -@@ -115,6 +115,7 @@ int main(int argc, char** argv) - scalarProductTest(scalarProduct,numBlocks); - } - -+#if HAVE_MPI - // Test the ParallelScalarProduct class - { - using Vector = BlockVector >; -@@ -139,6 +140,7 @@ int main(int argc, char** argv) - ScalarProduct scalarProduct(communicator,SolverCategory::nonoverlapping); - scalarProductTest(scalarProduct,numBlocks); - } -+#endif - - return t.exit(); - } --- -2.25.1 - -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:38:14 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:14 +0000 Received: from localhost ([127.0.0.1]:41494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZug-0007pu-AR for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:14 -0500 Received: from mout02.posteo.de ([185.67.36.66]:55291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuX-0007nm-FP for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:06 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id D55A8240103 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:37:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834679; bh=tq4F6EicbaU5JAc6l03P53nQHofnNCihNwI1qst7v9w=; h=From:To:Cc:Subject:Date:From; b=UTyurvEeGoiZ5T2xCPGJg8lhzTuGU4hI7uRrKh0dxglNyiVaK9rdjlVjmbgaCdcUh u5flbUGZJ862uAd4MY2RVwOXI6bP0O8+FUf6VDyiOesUqM6Zgo4+L+Wo8M6wm/DR/q mwPYZLYuSJt7HsZAEC31XYOVF8Rw99TbhuQgvToTZoNyZidYtoxXNjt/sJxDcqJQIX o5iVjfDS6LE0BAVF5ap1sZJ0c/O72ILXuPjYqkK7o+OXq9Au23EpKHblSBvsuYclWb G5cLFgExdHceTtqVa5KLgcItDAVtcWD34NGOJj3Q4lSsgcGsM2P0SlT5I3GQ+QlM36 H5qmHI5C3QyTg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkH2lxfz6tpW; Sat, 18 Dec 2021 14:37:59 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 07/12] gnu: dune-localfunctions: Update to 2.7.1. Date: Sat, 18 Dec 2021 13:36:55 +0000 Message-Id: <20211218133700.10135-8-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (dune-localfunctions): Update to 2.7.1. [arguments]: Parallelize build-tests phase. --- gnu/packages/maths.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4f0e929318..60cab4ab2c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6474,7 +6474,7 @@ aggregation-based algebraic multigrid.") (define-public dune-localfunctions (package (name "dune-localfunctions") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) @@ -6482,7 +6482,7 @@ aggregation-based algebraic multigrid.") version "/dune-localfunctions-" version ".tar.gz")) (sha256 (base32 - "1yih59h6vngii696bx1c2vil02lriij4kz0nc583mjn9kiaqxfqd")))) + "031i42anrhi0ngpvp42rdjbkic7v3008fwild9xg7flffwvnpshg")))) (build-system cmake-build-system) (arguments `(#:phases @@ -6500,8 +6500,12 @@ aggregation-based algebraic multigrid.") ":")) #t))) (add-after 'build 'build-tests - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags)))))) + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "build_tests" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) (inputs (list dune-common dune-geometry -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:38:15 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:15 +0000 Received: from localhost ([127.0.0.1]:41496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZug-0007q1-KE for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:15 -0500 Received: from mout01.posteo.de ([185.67.36.65]:35993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuY-0007no-5r for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:06 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 751DA240027 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:38:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834680; bh=WppNoWSVlrS4/ejdQoErYuMWPKZjrLzQ4ag9dLII0TY=; h=From:To:Cc:Subject:Date:From; b=bMcW6iQLKnSNSXrJrB3HcnAwn9x4jFFAbh0fYy1SExfA5+y2nveZg3xH8OG96dw5N yQnHuyDWl+mnv/KXvBO++Q8PFG7TBCSW9OCxdCIBFwqj99Q9iGKDft4wd7UgjBzDMf sDhu/hJrCLuspoQjxwxwZCkHPP1GITKf0/f5u2dkfXKj9VCnDP3b91/dExcHTLHqTB D9dHOphrJIMX8XpovQz4517wH1BKxg9ta+ebiacKBK7+Tk4qN+5hxBQ2FovhBBpl+N on4jgtm+1vvegskBL9GqU2EUL1fsLHUzXdRQ2O6HrCJzMFfI2m4qzTYSqTPvrbgt3r /HGTr7u4FQ0ww== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkH6rn1z6tpZ; Sat, 18 Dec 2021 14:37:59 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 08/12] gnu: dune-alugrid: Update to 2.7.1. Date: Sat, 18 Dec 2021 13:36:56 +0000 Message-Id: <20211218133700.10135-9-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (dune-alugrid): Update to 2.7.1. [version]: Use `git-version` to compute the version string. [arguments]: Parallelize build-tests phase. --- gnu/packages/maths.scm | 97 ++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 60cab4ab2c..9874972e20 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6530,53 +6530,60 @@ assemble global function spaces on finite-element grids.") (license license:gpl2))) (define-public dune-alugrid - (package - (name "dune-alugrid") - (version "2.7.0-git-81d35682") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.dune-project.org/extensions/dune-alugrid.git") - (commit "81d356827c84454b971937db02c02b90bbcd7fe5"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0z54lwfp53prcrs94k8gwh047l9z642jll3l56xlyfr69z0b2zz1")))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-include - (lambda _ - (substitute* "dune/alugrid/test/test-alugrid.cc" - (("doc/grids/gridfactory/testgrids") - "doc/dune-grid/grids/gridfactory/testgrids")) - #t)) - (add-after 'build 'build-tests - (lambda* (#:key inputs make-flags #:allow-other-keys) - (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "dune-grid") "/share")) - (apply invoke "make" "build_tests" make-flags)))))) - (inputs - (list dune-common - dune-geometry - dune-grid - ;; Optional - metis - openblas - python - superlu - gmp - zlib)) - (native-inputs - (list gfortran pkg-config)) - (home-page "https://dune-project.org/") - (synopsis "Distributed and Unified Numerics Environment") - (description "ALUGrid is an adaptive, loadbalancing, unstructured + ;; This was the last commit on the releases/2.7 branch as of 2021-12-17, + ;; unfortunately there was no tag for any 2.7 release. + (let ((commit "51bde29a2dfa7cfac4fb73d40ffd42b9c1eb1d3d")) + (package + (name "dune-alugrid") + (version (git-version "2.7.1" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.dune-project.org/extensions/dune-alugrid.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z16wg6llzxs7vjg2yilg31vwnkz8k050j6bspg3blbym0razy15")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-include + (lambda _ + (substitute* "dune/alugrid/test/test-alugrid.cc" + (("doc/grids/gridfactory/testgrids") + "doc/dune-grid/grids/gridfactory/testgrids")) + #t)) + (add-after 'build 'build-tests + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (setenv "CPLUS_INCLUDE_PATH" + (string-append (assoc-ref inputs "dune-grid") "/share")) + (apply invoke "make" "build_tests" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) + (inputs + (list dune-common + dune-geometry + dune-grid + ;; Optional + metis + openblas + python + superlu + gmp + zlib)) + (native-inputs + (list gfortran pkg-config)) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "ALUGrid is an adaptive, loadbalancing, unstructured implementation of the DUNE grid interface supporting either simplices or cubes.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public dune-subgrid (package -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:38:15 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:15 +0000 Received: from localhost ([127.0.0.1]:41498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuh-0007q9-1j for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:15 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56381) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuV-0007ni-Ls for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:07 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 15729240027 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:37:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834678; bh=ZrSWbRjkLl+PwYfL+wPkfEYGqjLU6W5+2KDHSLOR22w=; h=From:To:Cc:Subject:Date:From; b=CvSmurGD+ZdYgq9Izv52+y/DBe5VLBWonFVpbsqrGvXDoWDs3xFyr82DuALyIqxzC nez0fcNJ0YUVDnzcsQbo84tRZlXb2hvck69SvDoplBdoLksG1WSjJuvCEPyMk+Nf3w 9zasQAnWCxcpw1nlUUruxKUSNz5phMYo/AyHIoq1NPLP46w9zoVF5L85P/P8Fijxfa TXSeny83vLtbfx4QZSMbrzKaXkVj/1sV1d0pqwxdJUNlORDavdat2lRxT4OjENkXva ZbwgVCIx7KplEQZEppZwSBziKjnXBE+W2uDoZGsQ1R1dM0foAzsq4naLuqs/0bUGJB 4UZDhs8BK6CQA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkF4Qkgz6tnP; Sat, 18 Dec 2021 14:37:57 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 04/12] gnu: dune-uggrid: Update to 2.7.1. Date: Sat, 18 Dec 2021 13:36:52 +0000 Message-Id: <20211218133700.10135-5-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (dune-uggrid): Update to 2.7.1. [arguments]: Parallelize build-tests phase. --- gnu/packages/maths.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0cfee02653..db20722fb4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6327,7 +6327,7 @@ This package contains the basic DUNE geometry classes.") (define-public dune-uggrid (package (name "dune-uggrid") - (version "2.7.0") + (version "2.7.1") (source (origin (method git-fetch) @@ -6337,14 +6337,18 @@ This package contains the basic DUNE geometry classes.") (file-name (git-file-name name version)) (sha256 (base32 - "192miqgmfj6jwk969gydzpbv9ki7jg5nky3ydnrwa2nq29b5xkh0")))) + "11qz52g9d5k96fqik2lyi80xryw174rnny074pj70ardl6zzz83p")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'build 'build-tests - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags)))))) + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "build_tests" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) (inputs (list dune-common)) (native-inputs -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:38:15 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:15 +0000 Received: from localhost ([127.0.0.1]:41500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuh-0007qG-BW for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:15 -0500 Received: from mout01.posteo.de ([185.67.36.65]:37617) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuY-0007np-Ow for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:07 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 29045240028 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:38:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834681; bh=vlT72cG7pkJGhnXue7m/v+C4FKYesBNH4IbdohfbtFo=; h=From:To:Cc:Subject:Date:From; b=pHK4mvWh6iSE5SLgLU5EHu7+WpnfbfKBGbCwDQi0hMnyZeyAvISPvuDeryxiUhksS /amnwChyNQRXgfDo9RrdHSXWRyzdDzBaB2Gqnl1/JFmOd6WjJoMVYbPb6buM7WNCVt q6Z3cxoVxK+0ZQfbpHLylKk/Q7nJO/0+XFOC2FBQg5ZU9d74nVcHZBGW3OhZkRajdf /0SA2f2SyPlxZHE/O1dDDmtVRv4Frg8p9i/TWHLztnnvag3qk/L6Skfo8PD7yExbUZ eOgZYYniZD77q313ljD69ISSiG+NovvWa2xWg1DjQIIh7Upt00E2Sw/G7UrccXrNPU kjBsYgIHj7Ebg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkJ5b3bz9rxS; Sat, 18 Dec 2021 14:38:00 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 09/12] gnu: dune-subgrid: Update to 2.7.1. Date: Sat, 18 Dec 2021 13:36:57 +0000 Message-Id: <20211218133700.10135-10-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (dune-subgrid): Update to 2.7.1. [version]: Use `git-version` to compute the version string. [arguments]: Parallelize build-tests phase. --- gnu/packages/maths.scm | 75 +++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9874972e20..b05883fe42 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6586,43 +6586,50 @@ cubes.") (license license:gpl2+)))) (define-public dune-subgrid - (package - (name "dune-subgrid") - (version "2.7.0-git-2103a363") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.imp.fu-berlin.de/agnumpde/dune-subgrid") - (commit "2103a363f32e8d7b60e66eee7ddecf969f6cf762"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1wsjlypd3835c3arqjkw836cxx5q67zy447wa65q634lf6f6v9ia")))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'build-tests - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags)))))) - (inputs - (list dune-common - dune-geometry - dune-grid - ;; Optional - metis - openblas - gmp)) - (native-inputs - (list gfortran pkg-config)) - (home-page "http://numerik.mi.fu-berlin.de/dune-subgrid/index.php") - (synopsis "Distributed and Unified Numerics Environment") - (description "The dune-subgrid module marks elements of + ;; This was the last commit on the releases/2.7 branch as of 2021-12-17. + ;; Unfortunately the dune-subgrid repository contains no release tags. + (let ((commit "45d1ee9f3f711e209695deee97912f4954f7f280")) + (package + (name "dune-subgrid") + (version (git-version "2.7.1" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.imp.fu-berlin.de/agnumpde/dune-subgrid") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xjf7865wil7kzym608kv3nc3ff3m3nlqich4k9wjyvy3lz6panh")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-tests + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "build_tests" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) + (inputs + (list dune-common + dune-geometry + dune-grid + ;; Optional + metis + openblas + gmp)) + (native-inputs + (list gfortran pkg-config)) + (home-page "http://numerik.mi.fu-berlin.de/dune-subgrid/index.php") + (synopsis "Distributed and Unified Numerics Environment") + (description "The dune-subgrid module marks elements of another hierarchical dune grid. The set of marked elements can then be accessed as a hierarchical dune grid in its own right. Dune-Subgrid provides the full grid interface including adaptive mesh refinement.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public dune-typetree (package -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:38:16 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:16 +0000 Received: from localhost ([127.0.0.1]:41502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuh-0007qN-PG for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:16 -0500 Received: from mout02.posteo.de ([185.67.36.66]:38235) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuZ-0007nv-9K for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:07 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A7387240103 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:38:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834681; bh=c7k7Vp+0s0U8Wf260iJ8nzURqf2wxRcuzNrBI2RoAQU=; h=From:To:Cc:Subject:Date:From; b=G9mlXc9Bt83BFqKXkcCMOw+Z7MS0s67MdD21o0e3JvZNxBe26tF+PIvwUbq32PmlC 95ePiUQxdhiA3/1rmfiPFuBX3ZRk3k1oD1YSuHy5m7KG+YxCHye+IuRo7YHdJrR1x2 bT4hNubNaF3cM95Q94Lqvwu5EygO36IxQILbrG+aIPgxig0MjI1zNiZzykEro0hYvw iJAYjvnPPej3U08TvUWQX+aUlQ9rH04qZpYQjTtoDAEPsl+2qZ2agQEuEetbF26LDR PH6PAKZ7c81+SMhHJ5SNgx2Mr6ueYQrDiPf4OpKJWtG9zDsgHWlUMdvTGENgLCDCcq blS8cByAleBVg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkK1hKJz6tnd; Sat, 18 Dec 2021 14:38:01 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 10/12] gnu: dune-typetree: Update to 2.7.1. Date: Sat, 18 Dec 2021 13:36:58 +0000 Message-Id: <20211218133700.10135-11-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (dune-typetree): Update to 2.7.1. [arguments]: Parallelize build-tests phase. --- gnu/packages/maths.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b05883fe42..6b73978083 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6634,7 +6634,7 @@ provides the full grid interface including adaptive mesh refinement.") (define-public dune-typetree (package (name "dune-typetree") - (version "2.7.0") + (version "2.7.1") (source (origin (method git-fetch) @@ -6644,14 +6644,18 @@ provides the full grid interface including adaptive mesh refinement.") (file-name (git-file-name name version)) (sha256 (base32 - "1rhv25yg0q1hw50c8wlfqhgwrjl4mh62zq9v14ilwgzbfgxmpiy7")))) + "1kx9k8i7pdw6l6ny6nq85v5p1nd6yxldzaj8k3nizaz3q1j407pv")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'build 'build-tests - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags)))))) + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "build_tests" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) (inputs (list dune-common ;; Optional -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:38:16 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:16 +0000 Received: from localhost ([127.0.0.1]:41504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZui-0007qU-2l for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:16 -0500 Received: from mout01.posteo.de ([185.67.36.65]:54145) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZua-0007oE-Cs for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:08 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C278E240029 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:38:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834682; bh=cXAcrfkrysdpQaFK71XMHSoByP5Rkl8WcrNEiyeAJdM=; h=From:To:Cc:Subject:Date:From; b=rKlH5kAG2qHsoWlpsSHbOZlaMbv7IQvRVk6hPBqVUyvZ9hAduK2x2UZb6D54VKp0T QOS5zIdPxJMrs9eooahjl5vajzskbi5FMpQikKOYgJYJleOR+QP8OExkXcpm/KqInH /RBE/XvJLwu+gkzjFIxdZVe2QQsOlnGjixqbBaNHjcemcC9pBgAACYEFLjc27xAtzv xD3FT8K2BprKIPiCjcE+W9YGVYn1REKijmZGdgcR4y+Wt+1QV6AD2zh5L44zoUFJZh M3/LGTUg0+wZWuCY9nNmG0nDddIZpRSBB8FVCzAVjz/4uHPhjhAUqs8cTBgRyox5hl WZtqDFf0tcZgg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkL2yBtz9rxP; Sat, 18 Dec 2021 14:38:02 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 12/12] gnu: dune-pdelab: Update to 2.7.1. Date: Sat, 18 Dec 2021 13:37:00 +0000 Message-Id: <20211218133700.10135-13-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (dune-pdelab): Update to 2.7.1. [version]: Use `git-version` to compute the version string. --- gnu/packages/maths.scm | 77 ++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9cfe67db5c..f75f2b0d12 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6727,44 +6727,47 @@ implemented as callable objects, and bases of finite element spaces.") (license (list license:lgpl3+ license:gpl2)))) (define-public dune-pdelab - (package - (name "dune-pdelab") - (version "2.7.0-git-476fe437") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.dune-project.org/pdelab/dune-pdelab") - (commit "476fe43763fa6f459c5e4658e2a2b4b5582db834"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0cs36piqzn6rq0j2ih3ab3q3q9yg199wk72k5qi86pkzh7i7fdn1")))) - (build-system cmake-build-system) - (arguments '(#:tests? #f)) ; XXX: the tests cannot be compiled - (inputs - (list dune-common - dune-istl - dune-localfunctions - dune-geometry - dune-grid - dune-typetree - dune-functions - ;; Optional - openblas - eigen - metis - python - superlu - gmp)) - (native-inputs - (list gfortran pkg-config)) - (home-page "https://dune-project.org/") - (synopsis "Differential equations solver toolbox") - (description "PDELab is a partial differential equations solver toolbox + ;; This was the last commit on the releases/2.7 branch as of 2021-12-17, + ;; unfortunately there was no tag for any 2.7 release. + (let ((commit "09aef74d95661d18a7789d2f517ae77797eec738")) + (package + (name "dune-pdelab") + (version (git-version "2.7.1" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.dune-project.org/pdelab/dune-pdelab") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nv69ayr4gln9m1s94z9zkrxqi8nzar3z6awnvgqz595nmjf82ac")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f)) ; XXX: the tests cannot be compiled + (inputs + (list dune-common + dune-istl + dune-localfunctions + dune-geometry + dune-grid + dune-typetree + dune-functions + ;; Optional + openblas + eigen + metis + python + superlu + gmp)) + (native-inputs + (list gfortran pkg-config)) + (home-page "https://dune-project.org/") + (synopsis "Differential equations solver toolbox") + (description "PDELab is a partial differential equations solver toolbox built on top of DUNE, the Distributed and Unified Numerics Environment.") - ;; Either GPL version 2 with "runtime exception" or LGPLv3+. - (license (list license:lgpl3+ license:gpl2)))) + ;; Either GPL version 2 with "runtime exception" or LGPLv3+. + (license (list license:lgpl3+ license:gpl2))))) (define add-openmpi-to-dune-package (let ((dune-package? -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 08:38:16 2021 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:16 +0000 Received: from localhost ([127.0.0.1]:41506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZui-0007qc-Ep for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:16 -0500 Received: from mout02.posteo.de ([185.67.36.66]:43949) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZua-0007oW-RJ for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:09 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 4E64F240101 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:38:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834682; bh=CE77agry9flzxcrzKFCTN/wW7//cHrV47M4caRPb9m4=; h=From:To:Cc:Subject:Date:From; b=bKAP7amMsPHxkAigFsCfBAKMfMZedd5E7vpHzNwDI93J2VR8nWJ3Tq3pq5C0YXWzs g16Jf7RaUY7XQKiCZE2+iNi5981YiSW8HcCotw4Zo3sLU/bypXApNNnQHSoniUaIgn QcgVw/eNPOXZLuF3tDlMie2BTxapNGxW258O7wijToffB0Eo8bvhidJv9zAseGiqyd VrwMSPTwLQrsnXxqJqP+XzVq9cItd7aQvqhptDR0T9UqnqWeLkihrMVwlAvv3GsU0g bvUk5knKP/jOM1HCJjN42YYdc2T5xn3AXG7zGx6jbU2D5wDSGjskZ67XLKBl3jc9rh vwHw+6Rkpmnvw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkK620dz6tm6; Sat, 18 Dec 2021 14:38:01 +0100 (CET) From: Felix Gruber To: 46929@debbugs.gnu.org Subject: [PATCH v3 11/12] gnu: dune-functions: Update to 2.7.1. Date: Sat, 18 Dec 2021 13:36:59 +0000 Message-Id: <20211218133700.10135-12-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (dune-functions): Update to 2.7.1. [arguments]: Parallelize build-tests phase. --- gnu/packages/maths.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6b73978083..9cfe67db5c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6676,7 +6676,7 @@ operating on statically typed trees of objects.") (define-public dune-functions (package (name "dune-functions") - (version "2.7.0") + (version "2.7.1") (source (origin (method git-fetch) @@ -6686,7 +6686,7 @@ operating on statically typed trees of objects.") (file-name (git-file-name name version)) (sha256 (base32 - "1na4gcih0kin37ksj2xj07ds04v7zx53pjdhm1hzy55jjfqdjk8h")))) + "04dhr4asnl38bf1gp8hrk31maav33m7q71lhl2n5yk1q1x6i77nw")))) (build-system cmake-build-system) (arguments `(#:phases @@ -6698,8 +6698,12 @@ operating on statically typed trees of objects.") "--exclude-regex gridviewfunctionspacebasistest") #t)) (add-after 'build 'build-tests - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags)))))) + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "build_tests" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) (inputs (list dune-common dune-istl -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 20 08:57:19 2022 Received: (at 46929-done) by debbugs.gnu.org; 20 Jan 2022 13:57:19 +0000 Received: from localhost ([127.0.0.1]:56877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAXwF-0002ID-79 for submit@debbugs.gnu.org; Thu, 20 Jan 2022 08:57:19 -0500 Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:45054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAXwD-0002I0-9W for 46929-done@debbugs.gnu.org; Thu, 20 Jan 2022 08:57:17 -0500 X-IronPort-AV: E=Sophos;i="5.88,302,1635199200"; d="scan'208";a="17034771" Received: from 91-160-117-201.subs.proxad.net (HELO ribbon) ([91.160.117.201]) by mail2-relais-roc.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2022 14:57:10 +0100 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Felix Gruber Subject: Re: bug#46929: [PATCH] gnu: maths: dune-*: Update to version 2.7.1 References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> Date: Thu, 20 Jan 2022 14:57:10 +0100 In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> (Felix Gruber's message of "Sat, 18 Dec 2021 13:36:48 +0000") Message-ID: <878rva8q89.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46929-done Cc: 46929-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Felix, Felix Gruber skribis: > I've rebased the patches onto master and made some small changes to use > the new simplified package inputs. I've also split the patch into one > patch per package to be in line with common practice. > > To speed up the build-tests phase, I've made it to honor parallel-build? > to run make with multiple jobs. This makes the build faster, but > dune-common still takes a while to build (~20min on my computer). > > Finally I've updated the dune-pdelab package to use the latest commit on > the releases/2.7 branch (there is no tag for version 2.7 or 2.7.1). > > Since my last patch Dune 2.8 has been released, but I wasn't able to > build dune-subgrid with it since building against Dune 2.8 was giving me > failures in dune-subgrid's test suite. Until the cause of those test > failures is fixed, it's probably best to only upgrade to 2.7.1. Somehow this had fell through the cracks, sorry about that! > Felix Gruber (12): > gnu: Modernize add-openmpi-to-dune-package > gnu: dune-common: Update to 2.7.1. > gnu: dune-geometry: Update to 2.7.1. > gnu: dune-uggrid: Update to 2.7.1. > gnu: dune-grid: Update to 2.7.1. > gnu: dune-istl: Update to 2.7.1. > gnu: dune-localfunctions: Update to 2.7.1. > gnu: dune-alugrid: Update to 2.7.1. > gnu: dune-subgrid: Update to 2.7.1. > gnu: dune-typetree: Update to 2.7.1. > gnu: dune-functions: Update to 2.7.1. > gnu: dune-pdelab: Update to 2.7.1. Finally applied, thank you! Ludo=E2=80=99. From unknown Wed Jun 18 23:09:47 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 18 Feb 2022 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator