unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Felix Gruber <felgru@posteo.net>
To: 39862@debbugs.gnu.org
Cc: Felix Gruber <felgru@posteo.net>, zimoun <zimon.toutoune@gmail.com>
Subject: [bug#39862] [PATCH v2 6/6] gnu: define dune-*-openmpi packages
Date: Tue, 10 Mar 2020 20:29:10 +0100	[thread overview]
Message-ID: <20200310192910.6251-7-felgru@posteo.net> (raw)
In-Reply-To: <5e890189-d5f7-a646-fe37-1f93115d17f9@posteo.net>

* gnu/packages/maths.scm (dune-*-openmpi): New variables.
* gnu/packages/maths.scm (add-openmpi-to-dune-package): New function to
  add openmpi to the inputs of a dune-* package and replace all dune-*
  packages in its input with the corresponding dune-*-openmpi package.
---
 gnu/packages/maths.scm | 79 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 33a5efd2f0..e904ca1bd8 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -126,7 +126,9 @@
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages wxwidgets)
   #:use-module (gnu packages xml)
-  #:use-module (srfi srfi-1))
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-34)
+  #:use-module (srfi srfi-35))
 
 (define-public aris
   (package
@@ -5027,6 +5029,81 @@ 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))))
 
+(define add-openmpi-to-dune-package
+  (let ((transformed-packages '()))
+   (lambda (p)
+    (let* ((p-name (package-name p))
+           (replace-package
+             (lambda (mapping)
+               (let* ((name (car mapping))
+                      (p (cadr mapping))
+                      (new-p
+                        (match (assoc-ref transformed-packages name)
+                          (#f
+                           (if (string-prefix? "dune-" name)
+                               (raise (condition
+                                 (&message
+                                  (message
+                                   (format #f "Need to call \
+add-openmpi-to-dune-package on '~a' before '~a'."
+                                           name p-name)))))
+                               p))
+                          (transformed-p transformed-p))))
+                `(,name ,new-p))))
+           (substitute-mpi-packages (lambda (inputs)
+                                      (map replace-package inputs)))
+           (mpi-p
+             (package (inherit p)
+               (name (string-append p-name "-openmpi"))
+               (inputs `(,@(substitute-mpi-packages (package-inputs p))
+                         ("openmpi" ,openmpi)))
+               (propagated-inputs
+                 (substitute-mpi-packages (package-propagated-inputs p)))
+               (arguments
+                (substitute-keyword-arguments (package-arguments p)
+                  ((#:phases phases '%standard-phases)
+                   `(modify-phases ,phases
+                      (add-before 'check 'mpi-setup
+                        ,%openmpi-setup)))))
+               (synopsis (string-append (package-synopsis p) " (with MPI support)")))))
+     (begin
+      (set! transformed-packages
+            (acons p-name mpi-p transformed-packages))
+      mpi-p)))))
+
+(define-public dune-common-openmpi
+  (add-openmpi-to-dune-package dune-common))
+
+(define-public dune-geometry-openmpi
+  (add-openmpi-to-dune-package dune-geometry))
+
+(define-public dune-istl-openmpi
+  (add-openmpi-to-dune-package dune-istl))
+
+(define-public dune-typetree-openmpi
+  (add-openmpi-to-dune-package dune-typetree))
+
+(define-public dune-uggrid-openmpi
+  (add-openmpi-to-dune-package dune-uggrid))
+
+(define-public dune-grid-openmpi
+  (add-openmpi-to-dune-package dune-grid))
+
+(define-public dune-alugrid-openmpi
+  (add-openmpi-to-dune-package dune-alugrid))
+
+(define-public dune-subgrid-openmpi
+  (add-openmpi-to-dune-package dune-subgrid))
+
+(define-public dune-localfunctions-openmpi
+  (add-openmpi-to-dune-package dune-localfunctions))
+
+(define-public dune-functions-openmpi
+  (add-openmpi-to-dune-package dune-functions))
+
+(define-public dune-pdelab-openmpi
+  (add-openmpi-to-dune-package dune-pdelab))
+
 (define-public mlucas
   (package
     (name "mlucas")
-- 
2.25.1

  parent reply	other threads:[~2020-03-10 19:32 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-01 19:49 [bug#39862] [PATCH 0/4] update Dune finite element packages Felix Gruber
2020-03-01 20:23 ` [bug#39862] [PATCH 1/4] gnu: dune-*: set up MPI for tests Felix Gruber
2020-03-01 20:24 ` [bug#39862] [PATCH 2/4] gnu: add dune-uggrid 2.6.0 Felix Gruber
2020-03-01 20:25 ` [bug#39862] [PATCH 3/4] gnu: Add dune-subgrid Felix Gruber
2020-03-01 20:25 ` [bug#39862] [PATCH 4/4] gnu: dune-istl: Build with suitesparse Felix Gruber
2020-03-02 14:53 ` [bug#39862] [PATCH 0/4] update Dune finite element packages zimoun
2020-03-02 21:56   ` Felix Gruber
2020-03-10 19:29     ` [bug#39862] [PATCH v2 0/6] Update " Felix Gruber
2020-03-12 10:46       ` Ludovic Courtès
2020-03-10 19:29     ` [bug#39862] [PATCH v2 1/6] gnu: dune-*: set up MPI for tests Felix Gruber
2020-03-10 19:29     ` [bug#39862] [PATCH v2 2/6] gnu: add dune-uggrid 2.6.0 Felix Gruber
2020-03-10 19:29     ` [bug#39862] [PATCH v2 3/6] gnu: Add dune-subgrid Felix Gruber
2020-03-10 19:29     ` [bug#39862] [PATCH v2 4/6] gnu: dune-istl: Build with suitesparse Felix Gruber
2020-03-10 19:29     ` [bug#39862] [PATCH v2 5/6] gnu: dune-*: remove openmpi dependency Felix Gruber
2020-03-10 19:29     ` Felix Gruber [this message]
2020-03-12 12:42       ` [bug#39862] [PATCH v2 6/6] gnu: define dune-*-openmpi packages Ludovic Courtès
2020-03-12 21:05         ` [bug#39862] [PATCH v3 0/2] Add " Felix Gruber
2020-03-12 21:05         ` [bug#39862] [PATCH v3 1/2] gnu: dune-*: remove openmpi dependency Felix Gruber
2020-03-12 21:05         ` [bug#39862] [PATCH v3 2/2] gnu: define dune-*-openmpi packages Felix Gruber
2020-03-13  9:42           ` Ludovic Courtès
2020-03-13 17:26             ` Felix Gruber
2020-03-13 21:28               ` Ludovic Courtès
2020-03-13 17:30             ` [bug#39862] [PATCH v4 1/2] gnu: dune-*: remove openmpi dependency Felix Gruber
2020-03-14 16:55               ` bug#39862: " Ludovic Courtès
2020-03-13 17:30             ` [bug#39862] [PATCH v4 2/2] gnu: define dune-*-openmpi packages Felix Gruber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200310192910.6251-7-felgru@posteo.net \
    --to=felgru@posteo.net \
    --cc=39862@debbugs.gnu.org \
    --cc=zimon.toutoune@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).