* [PATCH] gnu: openmpi: Use our hwloc.
@ 2014-05-12 21:45 Eric Bavier
2014-05-12 21:57 ` Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Eric Bavier @ 2014-05-12 21:45 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 126 bytes --]
The attached patch should allow openmpi to build for i686 (i.e. it was
able to build on my machine for --system=i686-linux).
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-openmpi-Use-our-hwloc.patch --]
[-- Type: text/x-diff, Size: 2635 bytes --]
From f6c7613f1995a760a3f0f1da35d0135d55c932e0 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Mon, 12 May 2014 16:43:04 -0500
Subject: [PATCH] gnu: openmpi: Use our hwloc.
* gnu/packages/mpi.scm (hwloc): Propagate numactl.
(openmpi)[inputs]: Add hwloc.
[native-inputs]: Add pkg-config.
[argument]: Add hwloc configure flags.
---
gnu/packages/mpi.scm | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 0712292..37b7858 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -51,16 +51,16 @@
;; Enable libpci support, which effectively makes hwloc GPLv2+.
'(#:configure-flags '("--enable-libpci")))
(inputs
- `(("numactl" ,numactl)
- ("libx11" ,libx11)
+ `(("libx11" ,libx11)
("cairo" ,cairo)
("ncurses" ,ncurses)
("expat" ,expat)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(propagated-inputs
- ;; 'hwloc.pc' refers to libpci, hence the propagation.
- `(("pciutils" ,pciutils)))
+ ;; 'hwloc.pc' refers to libpci and libnuma, hence the propagation.
+ `(("numactl" ,numactl)
+ ("pciutils" ,pciutils)))
(home-page "http://www.open-mpi.org/projects/hwloc/")
(synopsis "Abstraction of hardware architectures")
(description
@@ -94,11 +94,14 @@ bind processes, and much more.")
(base32
"13z1q69f3qwmmhpglarfjminfy2yw4rfqr9jydjk5507q3mjf50p"))))
(build-system gnu-build-system)
- ;; TODO: Use our hwloc instead of the bundled one.
+ (inputs
+ `(("hwloc" ,hwloc)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(propagated-inputs
`(("gfortran" ,gfortran-4.8)))
(arguments
- `(#:configure-flags '("--enable-static"
+ `(#:configure-flags `("--enable-static"
"--enable-oshmem"
;; Thread support causes some applications to hang
;; "--enable-event-thread-support"
@@ -106,7 +109,9 @@ bind processes, and much more.")
;; "--enable-orte-progress-threads"
;; "--enable-mpi-thread-multiple"
"--enable-mpi-ext=all"
- "--with-devel-headers")))
+ "--with-devel-headers"
+ ,(string-append "--with-hwloc="
+ (assoc-ref %build-inputs "hwloc")))))
(home-page "http://www.open-mpi.org")
(synopsis "MPI-2 implementation")
(description
--
1.7.9.5
[-- Attachment #3: Type: text/plain, Size: 12 bytes --]
--
`~Eric
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] gnu: openmpi: Use our hwloc.
2014-05-12 21:45 [PATCH] gnu: openmpi: Use our hwloc Eric Bavier
@ 2014-05-12 21:57 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2014-05-12 21:57 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel
Eric Bavier <ericbavier@gmail.com> skribis:
> The attached patch should allow openmpi to build for i686 (i.e. it was
> able to build on my machine for --system=i686-linux).
>
>
> From f6c7613f1995a760a3f0f1da35d0135d55c932e0 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Mon, 12 May 2014 16:43:04 -0500
> Subject: [PATCH] gnu: openmpi: Use our hwloc.
>
> * gnu/packages/mpi.scm (hwloc): Propagate numactl.
> (openmpi)[inputs]: Add hwloc.
> [native-inputs]: Add pkg-config.
> [argument]: Add hwloc configure flags.
Looks good to me!
Ludo’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-12 21:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-12 21:45 [PATCH] gnu: openmpi: Use our hwloc Eric Bavier
2014-05-12 21:57 ` 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.