diff --git a/glicid/packages/benchmark.scm b/glicid/packages/benchmark.scm index d9ddbc8..17f0bb0 100644 --- a/glicid/packages/benchmark.scm +++ b/glicid/packages/benchmark.scm @@ -93,6 +93,7 @@ #:use-module (glicid packages storage) #:use-module (glicid packages mpi) #:use-module (glicid packages gcc) + #:use-module (glicid utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -130,7 +131,9 @@ (inherit gnu:intel-mpi-benchmarks/openmpi) (name "intel-mpi-benchmarks-newer") (version "2021.3") - (source (origin + (source + (origin + (inherit (package-source gnu:intel-mpi-benchmarks/openmpi)) (method git-fetch) (uri (git-reference (url "https://github.com/intel/mpi-benchmarks") @@ -139,21 +142,20 @@ (sha256 (base32 "04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Some source configuration files in the original tarball - ;; have inappropriate execute permissions, which interferes - ;; with the install phase below. - (for-each (lambda (file) (chmod file #o444)) - (find-files "WINDOWS" ".")) - #t)))) + ) + ) + ) ) -) + + +(define-public intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma + (transform-package + ((instead-of "openmpi" openmpi-glicid-libfabric-rdma ) intel-mpi-benchmarks/openmpi-2021.3 ) "fab+rdma")) + (define intel-mpi-benchmark-transform-gcc-11 - (gcc11-instead-of-gcc intel-mpi-benchmarks/openmpi-2021.3)) + (gcc11-instead-of-gcc intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma)) (define-public intel-mpi-benchmarks/openmpi-2021.3-gcc-11 (package diff --git a/glicid/utils.scm b/glicid/utils.scm index 2c9029e..c5c5359 100644 --- a/glicid/utils.scm +++ b/glicid/utils.scm @@ -8,7 +8,7 @@ #:export (latest-version) #:export (gcc11-instead-of-gcc) #:export (gcc10-instead-of-gcc) - + #:export (transform-package) ) ;; helper function