GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-30 14:18:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

formatting

Browse source
This commit is contained in:
Jean-François GUILLAUME 2021-12-03 09:56:33 +01:00
parent 66a2647fd2
commit a5b5e6d9d6
Signed by: Jean-François GUILLAUME
GPG key ID: 38751DAE145EFB5A
3 changed files with 133 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
glicid/packages/algebra.scm
View file

@ -7,27 +7,19 @@
#:use-module (guix download) #:use-module (guix download)
) )
;;;;;;;;
(define-public fftw-openmpi-with-fortran (define-public fftw-openmpi-with-fortran
(package (package
(inherit fftw-openmpi) (inherit fftw-openmpi)
(name "fftw-openmpi-with-fortran") (name "fftw-openmpi-with-fortran")
(version "3.3.10") (version "3.3.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.fftw.org/fftw-" (uri (string-append "https://www.fftw.org/fftw-" version ".tar.gz"))
version".tar.gz")) (sha256 (base32 "0rv4w90b65b2kvjpj8g9bdkl4xqc42q20f5bzpxdrkajk1a35jan"))
(sha256 ))
(base32 (inputs `(
"0rv4w90b65b2kvjpj8g9bdkl4xqc42q20f5bzpxdrkajk1a35jan")))) ("gfortran-toolchain", gfortran-toolchain)
,@(package-inputs fftw-openmpi)
(inputs `(("gfortran-toolchain", gfortran-toolchain ) ))
,@(package-inputs fftw-openmpi)))
) )
) )
;;; glicid/algebra.scm ends here

89
glicid/packages/benchmark.scm
View file

@ -1,20 +1,18 @@
(define-module (glicid packages benchmark) (define-module (glicid packages benchmark)
#:use-module (guix packages) #:use-module (guix build-system gnu)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages mpi) #:use-module (guix packages)
#:use-module ((gnu packages benchmark) #:prefix gnu:) #:use-module ((gnu packages benchmark) #:prefix gnu:)
#:use-module (glicid packages mpi)
#:use-module (glicid utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages commencement) #:use-module (gnu packages commencement)
#:use-module (gnu packages compression)
#:use-module (gnu packages mpi)
#:use-module (glicid packages mpi)
#:use-module (glicid packages gcc)
#:use-module (glicid utils)
) )
;;;;;;;;
(define-public intel-mpi-benchmarks/openmpi-2021.3 (define-public intel-mpi-benchmarks/openmpi-2021.3
(package (package
(inherit gnu:intel-mpi-benchmarks/openmpi) (inherit gnu:intel-mpi-benchmarks/openmpi)
@ -26,25 +24,27 @@
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/intel/mpi-benchmarks") (url "https://github.com/intel/mpi-benchmarks")
(commit (string-append "IMB-v" version)))) (commit (string-append "IMB-v" version))
))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256 (base32 "04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h"))
(base32
"04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h"))
) )
) )
) )
) )
(define-public intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma (define-public intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma
(transform-package (transform-package (
((instead-of "openmpi" openmpi-glicid-libfabric-rdma ) intel-mpi-benchmarks/openmpi-2021.3 ) "fab+rdma")) (instead-of "openmpi" openmpi-glicid-libfabric-rdma)
intel-mpi-benchmarks/openmpi-2021.3
) "fab+rdma")
)
(define intel-mpi-benchmark-transform-gcc-11 (define intel-mpi-benchmark-transform-gcc-11
(gcc11-instead-of-gcc intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma)) (gcc11-instead-of-gcc intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma)
)
(define-public intel-mpi-benchmarks/openmpi-2021.3-gcc-11 (define-public intel-mpi-benchmarks/openmpi-2021.3-gcc-11
(package (package
@ -53,13 +53,6 @@
) )
) )
(use-modules (guix packages))
(use-modules (guix download))
(use-modules (guix build-system gnu))
(use-modules (gnu packages compression))
(use-modules (guix git-download))
(use-modules (gnu packages commencement))
(use-modules (glicid packages gcc))
(define-public stream-benchmarks (define-public stream-benchmarks
(package (package
@ -73,12 +66,9 @@
(commit "HEAD") (commit "HEAD")
) )
) )
(sha256 (base32 "1b5ka2h6rhp2103app6p0vq29y7qixcli9w874hb33y05ggjin8m")) (sha256 (base32 "1b5ka2h6rhp2103app6p0vq29y7qixcli9w874hb33y05ggjin8m"))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
) ))
)
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -89,21 +79,25 @@
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Le Makefile du paquet ne fournit pas de règle « install » ;; Le Makefile du paquet ne fournit pas de règle « install »
;; alors on le fait nous-mêmes. ;; alors on le fait nous-mêmes.
(let ((bin (string-append (assoc-ref outputs "out") (let
"/bin"))) ((bin (string-append (assoc-ref outputs "out") "/bin")))
(install-file "stream_c.exe" bin) (install-file "stream_c.exe" bin)
(install-file "stream_f.exe" bin) (install-file "stream_f.exe" bin)
#t
#t)))
) )
) )
) )
(inputs `(("gfortran-toolchain" ,gfortran-toolchain))) )
)
)
(inputs `(
("gfortran-toolchain" ,gfortran-toolchain)
))
(synopsis "STREAM benchmark") (synopsis "STREAM benchmark")
(description "STREAM benchmark") (description "STREAM benchmark")
(home-page "https://") (home-page "https://")
(license "")) (license "")
)
) )
;;defined by gricad / PA Boutier ;;defined by gricad / PA Boutier
@ -115,9 +109,8 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-" version ".tgz")) (uri (string-append "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-" version ".tgz"))
(sha256 (sha256 (base32 "19a4wg0msipibkxsi8i0c34d07512yfaj2k37dxg5541ysdw690f"))
(base32 ))
"19a4wg0msipibkxsi8i0c34d07512yfaj2k37dxg5541ysdw690f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -126,14 +119,18 @@
(lambda _ (lambda _
(setenv "CC" (which "mpicc")) (setenv "CC" (which "mpicc"))
(setenv "CXX" (which "mpic++")) (setenv "CXX" (which "mpic++"))
#t))))) #t
(propagated-inputs )
`(("openmpi" ,openmpi))) )
)
)
)
(propagated-inputs `(
("openmpi" ,openmpi)
))
(synopsis "OSU micro benchmarks") (synopsis "OSU micro benchmarks")
(description "OSU micro benchmark for mpi") (description "OSU micro benchmark for mpi")
(home-page "https://mvapich.cse.ohio-state.edu/benchmarks/") (home-page "https://mvapich.cse.ohio-state.edu/benchmarks/")
(license license:gpl2+))) (license license:gpl2+)
)
)
;;; glicid/benchmark.scm ends here

19
glicid/utils.scm
View file

@ -7,25 +7,16 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:export (latest-version) #:export (latest-version)
#:export (gcc11-instead-of-gcc) #:export (gcc11-instead-of-gcc)
; #:export (gcc10-instead-of-gcc)
#:export (transform-package) #:export (transform-package)
#:export (instead-of) #:export (instead-of)
) )
;; helper function
;; return latest version of 2 packages
(define (latest-version v1 v2) (if (string> (package-version v1) (package-version v2)) v1 v2)) (define (latest-version v1 v2) (if (string> (package-version v1) (package-version v2)) v1 v2))
(define gcc11-instead-of-gcc (define gcc11-instead-of-gcc
;; This is a procedure to replace GCC by GCC11,
;; recursively.
; (package-input-rewriting/spec `((,gcc-toolchain . ,(const gcc-toolchain-11)))))
(package-input-rewriting `( (package-input-rewriting `(
(,gcc-toolchain . ,gcc-toolchain-11) (,gcc-toolchain . ,gcc-toolchain-11)
(,gfortran-toolchain . ,gfortran-toolchain-11) (,gfortran-toolchain . ,gfortran-toolchain-11)
) ))
)
) )
(define (transform-package original-package suffix) (define (transform-package original-package suffix)
@ -35,12 +26,8 @@
) )
) )
(define (instead-of package-a-spec package-b) (define (instead-of package-a-spec package-b)
(package-input-rewriting/spec `( (package-input-rewriting/spec `(
(,package-a-spec . ,(const package-b) (,package-a-spec . ,(const package-b))
) ))
; #:deep? #t
)
)
) )