me
/
guix
Archived
1
0
Fork 0
Code

gnu: intel-mpi-benchmarks: Remove top-level reference to 'openmpi'. 

This circular dependency could lead to "unbound variable" errors when
running 'guix show openmpi' or similar.

* gnu/packages/benchmark.scm (intel-mpi-benchmarks/openmpi): Inline code
formerly in 'intel-mpi-benchmarks' procedure.
(intel-mpi-benchmarks): Remove.
master
Ludovic Courtès 2021-05-28 09:13:38 +02:00
parent 90e1f9cbe1
commit c82b374979
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/benchmark.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 malte Frank Gerdes <malte.f.gerdes@gmail.com> ;;; Copyright © 2020 malte Frank Gerdes <malte.f.gerdes@gmail.com>
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -126,13 +126,9 @@ is to write a job file matching the I/O load one wants to simulate.")
(license (list license:gpl2 license:gpl2+ license:bsd-2 (license (list license:gpl2 license:gpl2+ license:bsd-2
license:public-domain)))) license:public-domain))))
;; Parameterized in anticipation of m(va)pich support (define-public intel-mpi-benchmarks/openmpi
(define (intel-mpi-benchmarks mpi)
(package (package
(name (string-append "intel-mpi-benchmarks" (name "intel-mpi-benchmarks")
(if (string=? (package-name mpi) "openmpi")
""
(string-append "-" (package-name mpi)))))
(version "2019.6") (version "2019.6")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -154,7 +150,7 @@ is to write a job file matching the I/O load one wants to simulate.")
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("mpi" ,mpi))) `(("openmpi" ,openmpi)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -194,9 +190,6 @@ Efficiency of the MPI implementation.
@end itemize") @end itemize")
(license license:cpl1.0))) (license license:cpl1.0)))
(define-public intel-mpi-benchmarks/openmpi
(intel-mpi-benchmarks openmpi))
(define-public imb-openmpi (define-public imb-openmpi
(deprecated-package "imb-openmpi" intel-mpi-benchmarks/openmpi)) (deprecated-package "imb-openmpi" intel-mpi-benchmarks/openmpi))