[bug#74356] [PATCH 00/10] Update dune-* to 2.10.0.

[bug#74356] [PATCH 00/10] Update dune-* to 2.10.0.

[Felix Gruber]

This patchset updates the Dune finite element library to its latest
release 2.10.0.

Felix Gruber (10):
  gnu: dune-common: Update to 2.10.0.
  gnu: dune-geometry: Update to 2.10.0.
  gnu: dune-uggrid: Update to 2.10.0.
  gnu: dune-grid: Update to 2.10.0.
  gnu: dune-istl: Update to 2.10.0.
  gnu: dune-localfunctions: Update to 2.10.0.
  gnu: dune-alugrid: Update to 2.10.0.
  gnu: dune-subgrid: Update to 2.10.0.
  gnu: dune-typetree: Update to 2.10.0.
  gnu: dune-functions: Update to 2.10.0.

 gnu/local.mk                                  |  2 -
 gnu/packages/maths.scm                        | 73 ++++++++-----------
 ...une-grid-add-missing-include-cassert.patch | 24 ------
 .../dune-istl-fix-solver-playground.patch     | 61 ----------------
 4 files changed, 32 insertions(+), 128 deletions(-)
 delete mode 100644 gnu/packages/patches/dune-grid-add-missing-include-cassert.patch
 delete mode 100644 gnu/packages/patches/dune-istl-fix-solver-playground.patch


base-commit: c1cb7f1031c5dde2a260d8d8ad7547d6c79cc532
-- 
2.45.2

[bug#74356] [PATCH 01/10] gnu: dune-common: Update to 2.10.0.

[Felix Gruber]

* gnu/packages/maths.scm (dune-common): Update to 2.10.0.

Change-Id: I9294c8cb03933533ca05d574320fbfcb8fc711fd
---
 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 bb6c1648b5..20912b8f9a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8376,7 +8376,7 @@ (define-public combinatorial-blas
 (define-public dune-common
   (package
     (name "dune-common")
-    (version "2.9.0")
+    (version "2.10.0")
     (source
      (origin
        (method url-fetch)
@@ -8384,7 +8384,7 @@ (define-public dune-common
                            version "/dune-common-" version ".tar.gz"))
        (sha256
         (base32
-         "04pzk8q0bibci8z5xlwndhh3y3vs63mw7kad62lbzfwrr5121hrd"))
+         "1pdgxlxb570fm7smk1zv9b3iq1wzjg6g0s4361xs2w5qrf6drh4l"))
        (patches (search-patches "dune-common-skip-failing-tests.patch"))))
     (build-system cmake-build-system)
     (arguments
-- 
2.45.2

[bug#74356] [PATCH 02/10] gnu: dune-geometry: Update to 2.10.0.

[Felix Gruber]

* gnu/packages/maths.scm (dune-geometry): Update to 2.10.0.

Change-Id: I4643e3f2c558abbe56f8dbd5e3ff59b334c00912
---
 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 20912b8f9a..e88cc13e34 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8414,7 +8414,7 @@ (define-public dune-common
 (define-public dune-geometry
   (package
     (name "dune-geometry")
-    (version "2.9.0")
+    (version "2.10.0")
     (source
      (origin
        (method url-fetch)
@@ -8422,7 +8422,7 @@ (define-public dune-geometry
                            version "/dune-geometry-" version ".tar.gz"))
        (sha256
         (base32
-         "1bl1abipcf7zysmyyy2ikfx0nip55kasrb1bbkh11ghdilxrwwqy"))))
+         "00vkidb931zvpq3nmw8ikyg8pr3jqisfq2qxwj9hqzj7634qms98"))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases
-- 
2.45.2

[bug#74356] [PATCH 03/10] gnu: dune-uggrid: Update to 2.10.0.

[Felix Gruber]

* gnu/packages/maths.scm (dune-uggrid): Update to 2.10.0.
  [source]: Download as tarball.

Change-Id: I3b89ad16dffe6bb64bc343bda4b27868720551f4
---
 gnu/packages/maths.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index e88cc13e34..d29db6fcc0 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8455,17 +8455,15 @@ (define-public dune-geometry
 (define-public dune-uggrid
   (package
     (name "dune-uggrid")
-    (version "2.9.0")
+    (version "2.10.0")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-         (url "https://gitlab.dune-project.org/staging/dune-uggrid.git")
-         (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append "https://dune-project.org/download/"
+                           version "/dune-uggrid-" version ".tar.gz"))
        (sha256
         (base32
-         "1xwmiabb25nydi0yzhd64vq6fm3razix6k87afhq88q0ywzll65x"))))
+         "1wm1jy8ssfzpskhk7z34ahmw0q0iyna0dgph8kskv6j2i8v7skip"))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases
-- 
2.45.2

[bug#74356] [PATCH 04/10] gnu: dune-grid: Update to 2.10.0.

[Felix Gruber]

* gnu/packages/maths.scm (dune-grid): Update to 2.10.0.
  [source]: Remove patch that has been applied upstream.
* gnu/packages/patches/dune-grid-add-missing-include-cassert.patch:
  Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.

Change-Id: I793f9151ace3c5104fd2b8d74ace128e73133cf3
---
 gnu/local.mk                                  |  1 -
 gnu/packages/maths.scm                        |  6 ++---
 ...une-grid-add-missing-include-cassert.patch | 24 -------------------
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 gnu/packages/patches/dune-grid-add-missing-include-cassert.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 1f48fddc9e..dcc1aa201a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1167,7 +1167,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/dtc-meson-cell-overflow.patch		\
   %D%/packages/patches/duc-fix-test-sh.patch                    \
   %D%/packages/patches/dune-common-skip-failing-tests.patch	\
-  %D%/packages/patches/dune-grid-add-missing-include-cassert.patch	\
   %D%/packages/patches/dune-istl-fix-solver-playground.patch	\
   %D%/packages/patches/durden-shadow-arcan.patch		\
   %D%/packages/patches/dvd+rw-tools-add-include.patch 		\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index d29db6fcc0..bb40f046dd 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8493,7 +8493,7 @@ (define-public dune-uggrid
 (define-public dune-grid
   (package
     (name "dune-grid")
-    (version "2.9.0")
+    (version "2.10.0")
     (source
      (origin
        (method url-fetch)
@@ -8501,9 +8501,7 @@ (define-public dune-grid
                            version "/dune-grid-" version ".tar.gz"))
        (sha256
         (base32
-         "17l2vlr8q3rfifxv80r3jlzamx478xn0vfjkrl3ns1akk7miycq8"))
-       (patches (search-patches
-                  "dune-grid-add-missing-include-cassert.patch"))))
+         "0mh06g3sryx3s0d7zgzsz6j18vbzb0f46wq7aw6ahj2hswb7rsrg"))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases
diff --git a/gnu/packages/patches/dune-grid-add-missing-include-cassert.patch b/gnu/packages/patches/dune-grid-add-missing-include-cassert.patch
deleted file mode 100644
index 7462b11934..0000000000
--- a/gnu/packages/patches/dune-grid-add-missing-include-cassert.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ef843b1a66308247ba4d2e2c116ff5517421a91b Mon Sep 17 00:00:00 2001
-From: Simon Praetorius <simon.praetorius@tu-dresden.de>
-Date: Tue, 6 Dec 2022 13:39:44 +0100
-Subject: [PATCH] Add missing include <cassert>
-
----
- dune/grid/test/yasp/test-yaspgrid-partitioner.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dune/grid/test/yasp/test-yaspgrid-partitioner.cc b/dune/grid/test/yasp/test-yaspgrid-partitioner.cc
-index 93ae042b0..9a4530201 100644
---- a/dune/grid/test/yasp/test-yaspgrid-partitioner.cc
-+++ b/dune/grid/test/yasp/test-yaspgrid-partitioner.cc
-@@ -6,6 +6,7 @@
- #include <config.h>
- 
- #include <array>
-+#include <cassert>
- #include <iostream>
- 
- #include <dune/common/filledarray.hh>
--- 
-2.39.2
-
-- 
2.45.2

[bug#74356] [PATCH 05/10] gnu: dune-istl: Update to 2.10.0.

[Felix Gruber]

* gnu/packages/maths.scm (dune-istl): Update to 2.10.0.
  [source]: Remove patch that has been applied upstream.
* gnu/packages/patches/dune-istl-fix-solver-playground.patch: Remove
  file.
* gnu/local.mk (dist_patch_DATA): Remove it.

Change-Id: Ifbbb6f2dea815159a1743ae6e622c154cf1cc9b0
---
 gnu/local.mk                                  |  1 -
 gnu/packages/maths.scm                        |  5 +-
 .../dune-istl-fix-solver-playground.patch     | 61 -------------------
 3 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 gnu/packages/patches/dune-istl-fix-solver-playground.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index dcc1aa201a..5adebbee41 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1167,7 +1167,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/dtc-meson-cell-overflow.patch		\
   %D%/packages/patches/duc-fix-test-sh.patch                    \
   %D%/packages/patches/dune-common-skip-failing-tests.patch	\
-  %D%/packages/patches/dune-istl-fix-solver-playground.patch	\
   %D%/packages/patches/durden-shadow-arcan.patch		\
   %D%/packages/patches/dvd+rw-tools-add-include.patch 		\
   %D%/packages/patches/dwarves-threading-reproducibility.patch	\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index bb40f046dd..799e9115a1 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8539,7 +8539,7 @@ (define-public dune-grid
 (define-public dune-istl
   (package
     (name "dune-istl")
-    (version "2.9.0")
+    (version "2.10.0")
     (source
      (origin
        (method url-fetch)
@@ -8547,8 +8547,7 @@ (define-public dune-istl
                            version "/dune-istl-" version ".tar.gz"))
        (sha256
         (base32
-         "0smghqr400xl84j0laabgwaj2p5jlj3n3s85bm7qp9m2vjz6rav6"))
-       (patches (search-patches "dune-istl-fix-solver-playground.patch"))))
+         "0rk95rkj87gpb3gn40jl532rybs2lxkhn7g6b30m9kbzz7yfjfbc"))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases
diff --git a/gnu/packages/patches/dune-istl-fix-solver-playground.patch b/gnu/packages/patches/dune-istl-fix-solver-playground.patch
deleted file mode 100644
index b3df4b6ffa..0000000000
--- a/gnu/packages/patches/dune-istl-fix-solver-playground.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From fe929f17e98b577171f58ca520b5145be41730ea Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
-Date: Thu, 16 Mar 2023 19:48:40 +0100
-Subject: [PATCH] Adjust sequential and both parallel cases in
- istl-solver-playground
-
-Do same thing, independent of paralellel, distributed, or
-sequential.
-This fixes the test in the sequential case.
----
- src/istl-solver-playground.hh | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/src/istl-solver-playground.hh b/src/istl-solver-playground.hh
-index 0ff3abd5..11693cf5 100644
---- a/src/istl-solver-playground.hh
-+++ b/src/istl-solver-playground.hh
-@@ -66,7 +66,11 @@ std::shared_ptr<OOCOMM> loadSystem(std::shared_ptr<Mat>& m,
-   std::shared_ptr<OOCOMM> oocomm;
-   if(distributed){
-     oocomm = std::make_shared<OOCOMM>(MPI_COMM_WORLD);
--    loadMatrixMarket(*m, matrixfilename, *oocomm);
-+    if(matrixfilename != "laplacian"){
-+      loadMatrixMarket(*m, matrixfilename, *oocomm);
-+    }else{
-+      setupLaplacian(*m, config.get("N", 20));
-+    }
-     if(config.get("random_rhs", false)){
-       rhs->resize(m->N());
-       srand(42);
-@@ -98,16 +102,22 @@ template<class Mat, class Vec>
- void loadSystem(std::shared_ptr<Mat>& m,
-                 std::shared_ptr<Vec>& rhs,
-                 const Dune::ParameterTree& config){
--  std::string matrixfilename = config.get<std::string>("matrix");
-+  // generate Laplacian or load matrix
-+  std::string matrixfilename = config.get<std::string>("matrix", "laplacian");
-+  if(matrixfilename == "laplacian"){
-+    setupLaplacian(*m, config.get("N", 20));
-+  }else{
-+    loadMatrixMarket(*m, matrixfilename);
-+  }
-+  // use random values or load right-hand side
-   std::string rhsfilename;
--  if(!config.get("random_rhs", false))
--    rhsfilename = config.get<std::string>("rhs");
--  loadMatrixMarket(*m, matrixfilename);
-   if(config.get("random_rhs", false)){
-     rhs->resize(m->N());
-     fillRandom(*rhs);
--  }else
-+  }else{
-+    rhsfilename = config.get<std::string>("rhs");
-     loadMatrixMarket(*rhs, rhsfilename);
-+  }
- }
- #endif
- 
--- 
-2.39.2
-
-- 
2.45.2

[bug#74356] [PATCH 06/10] gnu: dune-localfunctions: Update to 2.10.0.

[Felix Gruber]

* gnu/packages/maths.scm (dune-localfunctions): Update to 2.10.0.

Change-Id: If3a92b213d0c94b15035b937e9d0fd96bdf13554
---
 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 799e9115a1..546b7914c5 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8600,7 +8600,7 @@ (define-public dune-istl
 (define-public dune-localfunctions
   (package
     (name "dune-localfunctions")
-    (version "2.9.0")
+    (version "2.10.0")
     (source
      (origin
        (method url-fetch)
@@ -8608,7 +8608,7 @@ (define-public dune-localfunctions
                            version "/dune-localfunctions-" version ".tar.gz"))
        (sha256
         (base32
-         "02zl49q40ifmic221fxlhi8zj9pybdyjavzvgn1zwh636ysgjbsp"))))
+         "0a5hyd7fps18178dq41nxa21h0i9ah6sw7di8qkc4i1rh052rzc1"))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases
-- 
2.45.2

[bug#74356] [PATCH 07/10] gnu: dune-alugrid: Update to 2.10.0.

[Felix Gruber]

* gnu/packages/maths.scm (dune-alugrid): Update to 2.10.0.

Change-Id: I316d27b7da3e07398d12a156fa9b3b24675b7fad
---
 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 546b7914c5..e058a2475a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8658,7 +8658,7 @@ (define-public dune-localfunctions
 (define-public dune-alugrid
   (package
     (name "dune-alugrid")
-    (version "2.9.0")
+    (version "2.10.0")
     (source
      (origin
        (method git-fetch)
@@ -8668,7 +8668,7 @@ (define-public dune-alugrid
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0s41jinsfpm56nx41vkmyv3y9n072ssw9hxjm7di64zcszgpjmzd"))))
+         "0289vqf9azhgqda04qa5prn201xnsd9i0r8gy6jn0g6wfy9bcpav"))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases
-- 
2.45.2

[bug#74356] [PATCH 08/10] gnu: dune-subgrid: Update to 2.10.0.

[Felix Gruber]

* gnu/packages/maths.scm (dune-subgrid): Update to 2.10.0.

Change-Id: I447398849731713a4f56e22139b829cb835e97ce
---
 gnu/packages/maths.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index e058a2475a..c37cb59741 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8710,12 +8710,12 @@ (define-public dune-alugrid
 
 (define-public dune-subgrid
   ; dune-subgrid does not tag its releases.
-  ; The following commit is a few commits past the releases/2.9 branch
-  ; to include some additional commits fixing compatibility with dune-uggrid.
-  (let ((commit "e83f3f919c2602425467ed767f279bc9c356c436"))
+  ; The following commit is the last commit on the releases/2.10 branch
+  ; as of 2024-11-14.
+  (let ((commit "e71cc9c2514356c7cd989f0c13661f10c37c58df"))
     (package
       (name "dune-subgrid")
-      (version (git-version "2.9.0" "1" commit))
+      (version (git-version "2.10.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -8725,7 +8725,7 @@ (define-public dune-subgrid
          (file-name (git-file-name name version))
          (sha256
           (base32
-            "1dv4zg5j17bldpgg02ycg9fbfmnc1kffixgzbkkz86f2dmwgh2b6"))))
+            "1vahmj2r9r684n8rgnqqb8zhi3wibkxjsv1kql804azx71dslx0d"))))
       (build-system cmake-build-system)
       (arguments
        `(#:phases
-- 
2.45.2

[bug#74356] [PATCH 09/10] gnu: dune-typetree: Update to 2.10.0.

[Felix Gruber]

* gnu/packages/maths.scm (dune-typetree): Update to 2.10.0.

Change-Id: I5f41fd6a1f8401283d6fa1831d8af96cd751907e
---
 gnu/packages/maths.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index c37cb59741..023504acac 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8758,17 +8758,15 @@ (define-public dune-subgrid
 (define-public dune-typetree
   (package
     (name "dune-typetree")
-    (version "2.9.0")
+    (version "2.10.0")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.dune-project.org/staging/dune-typetree.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append "https://dune-project.org/download/"
+                           version "/dune-typetree-" version ".tar.gz"))
        (sha256
         (base32
-         "1qcnl8giivnn8zprszdwrqw4q29sv3c2pr8dlrz616j10i4r8p18"))))
+         "0k756c543r79jz51jfnvi6knnxv7y19xg69yb15b0hrv4gq015pf"))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases
-- 
2.45.2

[bug#74356] [PATCH 10/10] gnu: dune-functions: Update to 2.10.0.

[Felix Gruber]

* gnu/packages/maths.scm (dune-functions): Update to 2.10.0.

Change-Id: I022a75f9c66adf50b5b074594d50eed98f316634
---
 gnu/packages/maths.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 023504acac..d51ba86232 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8798,17 +8798,15 @@ (define-public dune-typetree
 (define-public dune-functions
   (package
     (name "dune-functions")
-    (version "2.9.0")
+    (version "2.10.0")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.dune-project.org/staging/dune-functions.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append "https://dune-project.org/download/"
+                           version "/dune-functions-" version ".tar.gz"))
        (sha256
         (base32
-         "0pmi9vk0pdq9qp3xvknsndg8l6f2xkjr1rwbfbzsl9aj0qv9rn2p"))))
+         "1v2yyiqacspa7fkz5pbhd9hcz8rk5bhyhlhwvr3jjgmniiy0x2hp"))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases
-- 
2.45.2

[bug#74356] Moreinfo

[Andreas Enge]

Hello Felix,

thanks for the patchset! I see you have updated all the packages that are
at version 2.9.0, which happen to be also those with an additional
dune-*-openmpi package.

There is also dune-pdelab@2.8.0-0.d5dddb6. Can this be kept as is? Or is it
incompatible with dune and should be dropped?

(For the record, I realised that there two completely unrelated projects
called "dune"; the one at version 3.11.0 is a build system for OCaml.)

Andreas

bug#74356: Close

[Andreas Enge]

Well, all packages still compile, including the dune-plelab package that
is not updated. So I have just pushed the commits.

Thanks!

Andreas