aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-12-20 22:35:12 +0100
committerLudovic Courtès <ludo@gnu.org>2019-12-20 22:35:12 +0100
commit2d6f68aa3b0404c3c37568a8a7bfee692cb80337 (patch)
tree250e6a5c2a33d1849f091a36fefc89a114b772a0
parentf94f9d67e65975724ee5b5cbc936c0895a258685 (diff)
downloadguix-2d6f68aa3b0404c3c37568a8a7bfee692cb80337.tar
guix-2d6f68aa3b0404c3c37568a8a7bfee692cb80337.tar.gz
gnu: intel-mpi-benchmarks: Merge with "imb-openmpi".
* gnu/packages/mpi.scm (intel-mpi-benchmarks): Remove. * gnu/packages/benchmark.scm (imb): Rename to... (intel-mpi-benchmarks): ... this. Change 'name'. Update to 2019.3. [arguments]: Remove 'build phase. Rewrite 'install phase. Pass #:parallel-build? and #:make-flags. (intel-mpi-benchmarks/openmpi): New variable. (imb-openmpi): Rewrite in terms of 'deprecated-package'.
-rw-r--r--gnu/packages/benchmark.scm61
-rw-r--r--gnu/packages/mpi.scm52
2 files changed, 35 insertions, 78 deletions
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index f9e819460e..27ba3cb604 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
+;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -118,18 +119,22 @@ is to write a job file matching the I/O load one wants to simulate.")
license:public-domain))))
;; Parameterized in anticipation of m(va)pich support
-(define (imb mpi)
+(define (intel-mpi-benchmarks mpi)
(package
- (name (string-append "imb-" (package-name mpi)))
- (version "2019.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/intel/mpi-benchmarks.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256 (base32 "18hfdyvl5i172gadiq9si1qxif5rvic0lifxpbrr7s59ylg8f9c4"))))
+ (name (string-append "intel-mpi-benchmarks"
+ (if (string=? (package-name mpi) "openmpi")
+ ""
+ (string-append "-" (package-name mpi)))))
+ (version "2019.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/intel/mpi-benchmarks.git")
+ (commit (string-append "IMB-v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0si5xi6ilhd3w0gbsg124589pvp094hvf366rvjjb9pi7pdk5p4i"))))
(build-system gnu-build-system)
(inputs
`(("mpi" ,mpi)))
@@ -138,25 +143,25 @@ is to write a job file matching the I/O load one wants to simulate.")
(modify-phases %standard-phases
(delete 'configure)
(delete 'check)
- (replace 'build
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((mpi-home (assoc-ref inputs "mpi")))
- ;; Override default parallelism
- (substitute* "Makefile"
- (("make -j[[:digit:]]+")
- (format #f "make -j~d" (parallel-job-count))))
- (invoke "make" "SHELL=sh" "CC=mpicc" "CXX=mpic++"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
+ (define (benchmark? file stat)
+ (and (string-prefix? "IMB-" (basename file))
+ (executable-file? file)))
+
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
- (for-each
- (lambda (file)
- (install-file file bin))
- '("IMB-IO" "IMB-EXT" "IMB-MPI1" "IMB-NBC" "IMB-RMA" "IMB-MT")))
- #t)))))
+ (for-each (lambda (file)
+ (install-file file bin))
+ (find-files "." benchmark?))
+ #t))))
+
+ ;; The makefile doesn't express all the dependencies, it seems.
+ #:parallel-build? #t
+
+ #:make-flags '("CC=mpicc" "CXX=mpicxx")))
(home-page "https://software.intel.com/en-us/articles/intel-mpi-benchmarks")
- (synopsis "Intel MPI Benchmarks")
+ (synopsis "Benchmarks for the Message Passing Interface (MPI)")
(description
"This package provides benchmarks for implementations of the @dfn{Message
Passing Interface} (MPI). It contains MPI performance measurements for
@@ -172,7 +177,11 @@ Efficiency of the MPI implementation.
@end itemize")
(license license:cpl1.0)))
-(define-public imb-openmpi (imb openmpi))
+(define-public intel-mpi-benchmarks/openmpi
+ (intel-mpi-benchmarks openmpi))
+
+(define-public imb-openmpi
+ (deprecated-package "imb-openmpi" intel-mpi-benchmarks/openmpi))
(define-public multitime
(package
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 45941df0b0..55641d8fa1 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -29,7 +29,6 @@
#:use-module ((guix licenses)
#:hide (expat))
#:use-module (guix download)
- #:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix deprecation)
#:use-module (guix build-system gnu)
@@ -357,57 +356,6 @@ only provides @code{MPI_THREAD_FUNNELED}.")))
(setenv "UCX_LOG_LEVEL" "error")
#t))
-(define-public intel-mpi-benchmarks
- (package
- (name "intel-mpi-benchmarks")
- (version "2019.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/intel/mpi-benchmarks.git")
- (commit (string-append "IMB-v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0si5xi6ilhd3w0gbsg124589pvp094hvf366rvjjb9pi7pdk5p4i"))))
- (build-system gnu-build-system)
- (arguments
- '(#:phases (modify-phases %standard-phases
- (delete 'configure)
- (delete 'check)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (define (benchmark? file stat)
- (and (string-prefix? "IMB-" (basename file))
- (executable-file? file)))
-
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (for-each (lambda (file)
- (install-file file bin))
- (find-files "." benchmark?))
- #t))))
-
- ;; The makefile doesn't express all the dependencies, it seems.
- #:parallel-build? #t
-
- #:make-flags (list (string-append "CC="
- (assoc-ref %build-inputs "openmpi")
- "/bin/mpicc")
- (string-append "CXX="
- (assoc-ref %build-inputs "openmpi")
- "/bin/mpicxx"))))
- (inputs
- `(("openmpi" ,openmpi)))
- (home-page "https://github.com/intel/mpi-benchmarks")
- (synopsis "Benchmarks for the Message Passing Interface (MPI)")
- (description
- "Intel MPI Benchmarks (IMB) provides a set of elementary benchmarks that
-conform with versions 1, 2, and 3 of the Message Passing Interface (MPI).")
- (license
- (fsf-free "https://directory.fsf.org/wiki/License:CPL-1.0"
- "https://www.gnu.org/licenses/license-list.html#CommonPublicLicense10"))))
-
(define-public python-mpi4py
(package
(name "python-mpi4py")