* [bug#46929] [PATCH] gnu: maths: dune-*: Update to version 2.7.1
@ 2021-03-04 19:53 Felix Gruber
2021-05-20 22:06 ` [bug#46929] [PATCH v2] " Felix Gruber
0 siblings, 1 reply; 16+ messages in thread
From: Felix Gruber @ 2021-03-04 19:53 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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 <scs@stevesprang.com>
;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
-;;; Copyright © 2020 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2020, 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
@@ -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 <felgru@posteo.net>
-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<BCRSMat,BVector,BVector> Operator;
-+ typedef Dune::MatrixAdapter<Matrix,Vector,Vector> 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, Vector>(scalarProduct,numBlocks);
- }
-
-+#if HAVE_MPI
- // Test the ParallelScalarProduct class
- {
- using Vector = BlockVector<FieldVector<double,BlockSize> >;
-@@ -139,6 +140,7 @@ int main(int argc, char** argv)
- ScalarProduct scalarProduct(communicator,SolverCategory::nonoverlapping);
- scalarProductTest<ScalarProduct, Vector>(scalarProduct,numBlocks);
- }
-+#endif
-
- return t.exit();
- }
---
-2.25.1
-
--
2.30.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v2] gnu: maths: dune-*: Update to version 2.7.1
2021-03-04 19:53 [bug#46929] [PATCH] gnu: maths: dune-*: Update to version 2.7.1 Felix Gruber
@ 2021-05-20 22:06 ` Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
0 siblings, 1 reply; 16+ messages in thread
From: Felix Gruber @ 2021-05-20 22:06 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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 <felgru@posteo.net>
-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<BCRSMat,BVector,BVector> Operator;
-+ typedef Dune::MatrixAdapter<Matrix,Vector,Vector> 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, Vector>(scalarProduct,numBlocks);
- }
-
-+#if HAVE_MPI
- // Test the ParallelScalarProduct class
- {
- using Vector = BlockVector<FieldVector<double,BlockSize> >;
-@@ -139,6 +140,7 @@ int main(int argc, char** argv)
- ScalarProduct scalarProduct(communicator,SolverCategory::nonoverlapping);
- scalarProductTest<ScalarProduct, Vector>(scalarProduct,numBlocks);
- }
-+#endif
-
- return t.exit();
- }
---
-2.25.1
-
--
2.30.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 00/12] gnu: maths: dune-*: Update to version 2.7.1
2021-05-20 22:06 ` [bug#46929] [PATCH v2] " Felix Gruber
@ 2021-12-18 13:36 ` Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 01/12] gnu: Modernize add-openmpi-to-dune-package Felix Gruber
` (12 more replies)
0 siblings, 13 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:36 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 01/12] gnu: Modernize add-openmpi-to-dune-package
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
@ 2021-12-18 13:36 ` Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 02/12] gnu: dune-common: Update to 2.7.1 Felix Gruber
` (11 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:36 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 02/12] gnu: dune-common: Update to 2.7.1.
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 01/12] gnu: Modernize add-openmpi-to-dune-package Felix Gruber
@ 2021-12-18 13:36 ` Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 03/12] gnu: dune-geometry: " Felix Gruber
` (10 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:36 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 03/12] gnu: dune-geometry: Update to 2.7.1.
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 01/12] gnu: Modernize add-openmpi-to-dune-package Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 02/12] gnu: dune-common: Update to 2.7.1 Felix Gruber
@ 2021-12-18 13:36 ` Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 04/12] gnu: dune-uggrid: " Felix Gruber
` (9 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:36 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 04/12] gnu: dune-uggrid: Update to 2.7.1.
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
` (2 preceding siblings ...)
2021-12-18 13:36 ` [bug#46929] [PATCH v3 03/12] gnu: dune-geometry: " Felix Gruber
@ 2021-12-18 13:36 ` Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 05/12] gnu: dune-grid: " Felix Gruber
` (8 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:36 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 05/12] gnu: dune-grid: Update to 2.7.1.
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
` (3 preceding siblings ...)
2021-12-18 13:36 ` [bug#46929] [PATCH v3 04/12] gnu: dune-uggrid: " Felix Gruber
@ 2021-12-18 13:36 ` Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 06/12] gnu: dune-istl: " Felix Gruber
` (7 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:36 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 06/12] gnu: dune-istl: Update to 2.7.1.
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
` (4 preceding siblings ...)
2021-12-18 13:36 ` [bug#46929] [PATCH v3 05/12] gnu: dune-grid: " Felix Gruber
@ 2021-12-18 13:36 ` Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 07/12] gnu: dune-localfunctions: " Felix Gruber
` (6 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:36 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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 <felgru@posteo.net>
-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<BCRSMat,BVector,BVector> Operator;
-+ typedef Dune::MatrixAdapter<Matrix,Vector,Vector> 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, Vector>(scalarProduct,numBlocks);
- }
-
-+#if HAVE_MPI
- // Test the ParallelScalarProduct class
- {
- using Vector = BlockVector<FieldVector<double,BlockSize> >;
-@@ -139,6 +140,7 @@ int main(int argc, char** argv)
- ScalarProduct scalarProduct(communicator,SolverCategory::nonoverlapping);
- scalarProductTest<ScalarProduct, Vector>(scalarProduct,numBlocks);
- }
-+#endif
-
- return t.exit();
- }
---
-2.25.1
-
--
2.30.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 07/12] gnu: dune-localfunctions: Update to 2.7.1.
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
` (5 preceding siblings ...)
2021-12-18 13:36 ` [bug#46929] [PATCH v3 06/12] gnu: dune-istl: " Felix Gruber
@ 2021-12-18 13:36 ` Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 08/12] gnu: dune-alugrid: " Felix Gruber
` (5 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:36 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 08/12] gnu: dune-alugrid: Update to 2.7.1.
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
` (6 preceding siblings ...)
2021-12-18 13:36 ` [bug#46929] [PATCH v3 07/12] gnu: dune-localfunctions: " Felix Gruber
@ 2021-12-18 13:36 ` Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 09/12] gnu: dune-subgrid: " Felix Gruber
` (4 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:36 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 09/12] gnu: dune-subgrid: Update to 2.7.1.
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
` (7 preceding siblings ...)
2021-12-18 13:36 ` [bug#46929] [PATCH v3 08/12] gnu: dune-alugrid: " Felix Gruber
@ 2021-12-18 13:36 ` Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 10/12] gnu: dune-typetree: " Felix Gruber
` (3 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:36 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 10/12] gnu: dune-typetree: Update to 2.7.1.
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
` (8 preceding siblings ...)
2021-12-18 13:36 ` [bug#46929] [PATCH v3 09/12] gnu: dune-subgrid: " Felix Gruber
@ 2021-12-18 13:36 ` Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 11/12] gnu: dune-functions: " Felix Gruber
` (2 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:36 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 11/12] gnu: dune-functions: Update to 2.7.1.
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
` (9 preceding siblings ...)
2021-12-18 13:36 ` [bug#46929] [PATCH v3 10/12] gnu: dune-typetree: " Felix Gruber
@ 2021-12-18 13:36 ` Felix Gruber
2021-12-18 13:37 ` [bug#46929] [PATCH v3 12/12] gnu: dune-pdelab: " Felix Gruber
2022-01-20 13:57 ` bug#46929: [PATCH] gnu: maths: dune-*: Update to version 2.7.1 Ludovic Courtès
12 siblings, 0 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:36 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46929] [PATCH v3 12/12] gnu: dune-pdelab: Update to 2.7.1.
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
` (10 preceding siblings ...)
2021-12-18 13:36 ` [bug#46929] [PATCH v3 11/12] gnu: dune-functions: " Felix Gruber
@ 2021-12-18 13:37 ` Felix Gruber
2022-01-20 13:57 ` bug#46929: [PATCH] gnu: maths: dune-*: Update to version 2.7.1 Ludovic Courtès
12 siblings, 0 replies; 16+ messages in thread
From: Felix Gruber @ 2021-12-18 13:37 UTC (permalink / raw)
To: 46929; +Cc: Felix Gruber
* 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* bug#46929: [PATCH] gnu: maths: dune-*: Update to version 2.7.1
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
` (11 preceding siblings ...)
2021-12-18 13:37 ` [bug#46929] [PATCH v3 12/12] gnu: dune-pdelab: " Felix Gruber
@ 2022-01-20 13:57 ` Ludovic Courtès
12 siblings, 0 replies; 16+ messages in thread
From: Ludovic Courtès @ 2022-01-20 13:57 UTC (permalink / raw)
To: Felix Gruber; +Cc: 46929-done
Hi Felix,
Felix Gruber <felgru@posteo.net> 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’.
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2022-01-20 19:02 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-04 19:53 [bug#46929] [PATCH] gnu: maths: dune-*: Update to version 2.7.1 Felix Gruber
2021-05-20 22:06 ` [bug#46929] [PATCH v2] " Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 01/12] gnu: Modernize add-openmpi-to-dune-package Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 02/12] gnu: dune-common: Update to 2.7.1 Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 03/12] gnu: dune-geometry: " Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 04/12] gnu: dune-uggrid: " Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 05/12] gnu: dune-grid: " Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 06/12] gnu: dune-istl: " Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 07/12] gnu: dune-localfunctions: " Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 08/12] gnu: dune-alugrid: " Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 09/12] gnu: dune-subgrid: " Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 10/12] gnu: dune-typetree: " Felix Gruber
2021-12-18 13:36 ` [bug#46929] [PATCH v3 11/12] gnu: dune-functions: " Felix Gruber
2021-12-18 13:37 ` [bug#46929] [PATCH v3 12/12] gnu: dune-pdelab: " Felix Gruber
2022-01-20 13:57 ` bug#46929: [PATCH] gnu: maths: dune-*: Update to version 2.7.1 Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.