From 543e07d0d229369861b704f281fd7cfdf1708919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludovic.courtes@inria.fr>
Date: Fri, 23 Dec 2022 14:02:58 +0100
Subject: [PATCH] Remove input labels.
Obtained by running:
specs="$(guix package -A . -L . -L ~/src/guix-hpc |grep -E '(bsc|hacky|inria|non-free)/'|cut -f1,2 --output-delimiter=@|sed -'es/[[:space:]]*//g')"
guix style -S inputs -L . -L ~/src/guix-hpc $specs
---
bsc/alya.scm | 3 +--
bsc/slurm17.scm | 14 +++++++-------
hacky/gitlab.scm | 3 +--
hacky/pastix-5-mkl.scm | 5 +++--
hacky/suitesparse-mkl.scm | 5 +++--
inria/energy-scope.scm | 3 +--
inria/hawen.scm | 20 ++++++++++----------
inria/tainted/hiepacs.scm | 21 +++++++++++----------
inria/tainted/storm.scm | 15 ++++++++-------
non-free/cuda.scm | 4 ++--
non-free/cudnn.scm | 2 +-
non-free/hlibpro.scm | 2 +-
non-free/medit.scm | 3 +--
non-free/mkl.scm | 6 +-----
non-free/parmetis.scm | 2 +-
15 files changed, 52 insertions(+), 56 deletions(-)
diff --git a/bsc/alya.scm b/bsc/alya.scm
index b52badf..9865d02 100644
--- a/bsc/alya.scm
+++ b/bsc/alya.scm
@@ -55,7 +55,6 @@ propagation, etc.")
("maphys" ,maphys)
("maphys++" ,maphys++)
("openblas" ,openblas)))
- (native-inputs `(("gfortran" ,gfortran)
- ("pkg-config" ,pkg-config)))
+ (native-inputs (list gfortran pkg-config))
(license #f)))
diff --git a/bsc/slurm17.scm b/bsc/slurm17.scm
index f8fdb80..159521b 100644
--- a/bsc/slurm17.scm
+++ b/bsc/slurm17.scm
@@ -59,13 +59,13 @@
#t))))
;; FIXME: More optional inputs could be added,
;; in particular mysql and gtk+.
- (inputs `(("freeipmi" ,freeipmi)
- ("hwloc" ,hwloc-1 "lib")
- ("json-c" ,json-c)
- ("linux-pam" , linux-pam)
- ("munge" ,munge)
- ("numactl" ,numactl)
- ("readline" ,readline)))
+ (inputs (list freeipmi
+ `(,hwloc-1 "lib")
+ json-c
+ linux-pam
+ munge
+ numactl
+ readline))
(native-inputs
`(("autoconf" ,autoconf)
("expect" ,expect)
diff --git a/hacky/gitlab.scm b/hacky/gitlab.scm
index b676360..fe12bac 100644
--- a/hacky/gitlab.scm
+++ b/hacky/gitlab.scm
@@ -52,8 +52,7 @@
(wrap-program executable
`("PATH" ":" prefix (,git-dir)))))))
(inputs
- `(("git" ,git)
- ("bash" ,bash)))
+ (list git bash))
(synopsis "Gitlab Runner")
(description
"The official GitLab Runner written in Go. It runs tests and sends the
diff --git a/hacky/pastix-5-mkl.scm b/hacky/pastix-5-mkl.scm
index 3220afa..e4358ea 100644
--- a/hacky/pastix-5-mkl.scm
+++ b/hacky/pastix-5-mkl.scm
@@ -15,8 +15,9 @@
(inherit pastix-5)
(name "pastix-5-mkl")
(inputs
- `(("mkl" ,mkl)
- ,@(alist-delete "openblas" (package-inputs pastix-5))))
+ (modify-inputs (package-inputs pastix-5)
+ (delete "openblas")
+ (prepend mkl)))
(arguments
(substitute-keyword-arguments
(package-arguments pastix-5)
diff --git a/hacky/suitesparse-mkl.scm b/hacky/suitesparse-mkl.scm
index e867cb2..641c18d 100644
--- a/hacky/suitesparse-mkl.scm
+++ b/hacky/suitesparse-mkl.scm
@@ -16,8 +16,9 @@
(inherit suitesparse)
(name "suitesparse-mkl")
(inputs
- `(("mkl" ,mkl) ("libomp" ,libomp)
- ,@(alist-delete "openblas" (package-inputs suitesparse))))
+ (modify-inputs (package-inputs suitesparse)
+ (delete "openblas")
+ (prepend mkl libomp)))
(arguments
`(#:modules ((guix build utils) (guix build gnu-build-system) (srfi srfi-1))
,@(substitute-keyword-arguments
diff --git a/inria/energy-scope.scm b/inria/energy-scope.scm
index 8841a32..265bf59 100644
--- a/inria/energy-scope.scm
+++ b/inria/energy-scope.scm
@@ -48,8 +48,7 @@
(chmod file #o555))
(find-files "." "\\.(py|sh)$")))))))
(inputs
- `(("bash-minimal" ,bash-minimal)
- ("python-wrapper" ,python-wrapper)))
+ (list bash-minimal python-wrapper))
(synopsis "Recording module of Energy Scope")
(description
"Record the energy consumption of programs.")
diff --git a/inria/hawen.scm b/inria/hawen.scm
index d4cd1e4..41725b8 100644
--- a/inria/hawen.scm
+++ b/inria/hawen.scm
@@ -107,17 +107,17 @@ DEPENDENCY_ARPACK=1
DEPENDENCY_PARPACK=1
" ,direction ,problem)))))))))
(native-inputs
- `(("gfortran" ,gfortran)))
+ (list gfortran))
(inputs
- `(("mumps-openmpi" ,mumps-openmpi)
- ("arpack-ng-openmpi" , arpack-ng-openmpi)
- ("metis" ,metis)
- ("openblas" ,openblas)
- ("scalapack" ,scalapack)
- ("pt-scotch" ,pt-scotch)
- ("scotch" ,scotch)
- ("openmpi" ,openmpi)
- ("arb" ,arb)))
+ (list mumps-openmpi
+ arpack-ng-openmpi
+ metis
+ openblas
+ scalapack
+ pt-scotch
+ scotch
+ openmpi
+ arb))
(synopsis "Hawen")
(description
"Hawen is a DG wave propagation simulating library for
diff --git a/inria/tainted/hiepacs.scm b/inria/tainted/hiepacs.scm
index 2da0a6b..fbcaaa5 100644
--- a/inria/tainted/hiepacs.scm
+++ b/inria/tainted/hiepacs.scm
@@ -42,8 +42,9 @@
((#:configure-flags flags '())
`(cons "-DCHAMELEON_USE_CUDA=ON" ,flags))))
(native-inputs
- `(;; ("gcc" ,gcc-8) ;CUDA requires GCC <= 8
- ,@(package-native-inputs chameleon)))
+ (modify-inputs (package-native-inputs chameleon)
+ (prepend ;; ("gcc" ,gcc-8) ;CUDA requires GCC <= 8
+ )))
(propagated-inputs `(("cuda" ,cuda)
("starpu" ,starpu+cuda)
,@(delete `("starpu" ,starpu) (package-inputs chameleon))))))
@@ -87,8 +88,9 @@
((#:configure-flags flags '())
`(cons "-DCHAMELEON_USE_CUDA=ON" ,flags))))
(native-inputs
- `(;; ("gcc" ,gcc-8) ;CUDA requires GCC <= 8
- ,@(package-native-inputs chameleon+mkl+mt)))
+ (modify-inputs (package-native-inputs chameleon+mkl+mt)
+ (prepend ;; ("gcc" ,gcc-8) ;CUDA requires GCC <= 8
+ )))
(propagated-inputs `(("cuda" ,cuda)
("starpu" ,starpu+cuda)
,@(delete `("starpu" ,starpu) (package-inputs chameleon+mkl+mt))))))
@@ -125,8 +127,9 @@ gemm in C++, with Cuda support.")
((#:configure-flags flags '())
`(cons "-DPASTIX_WITH_CUDA=ON" ,flags))))
(native-inputs
- `(;; ("gcc" ,gcc-8) ;CUDA requires GCC <= 8
- ,@(package-native-inputs pastix)))
+ (modify-inputs (package-native-inputs pastix)
+ (prepend ;; ("gcc" ,gcc-8) ;CUDA requires GCC <= 8
+ )))
(propagated-inputs
`(("cuda" ,cuda)
("starpu" ,starpu+cuda)
@@ -152,8 +155,7 @@ gemm in C++, with Cuda support.")
("bzip2" , bzip2)
("hdf5" , hdf5-1.10)
("lapack" ,mkl)))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("gfortran" ,gfortran)))
+ (native-inputs (list pkg-config gfortran))
(synopsis "Fast and accurate Methods for Randomized numerical linear algebra")
(description
"This project provides routines for performing low-rank matrix
@@ -235,8 +237,7 @@ approximations based on randomized techniques.")
("hdf5" , hdf5-1.10)
("lapack" ,mkl)
("fmr" ,fmr)))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("gfortran" ,gfortran)))
+ (native-inputs (list pkg-config gfortran))
(synopsis "Librairies for Multivariate Data Analysis and
Dimensionality Reduction for very large datasets")
diff --git a/inria/tainted/storm.scm b/inria/tainted/storm.scm
index 20195ec..3f48e47 100644
--- a/inria/tainted/storm.scm
+++ b/inria/tainted/storm.scm
@@ -50,9 +50,10 @@
(inherit starpu)
(name "starpu-cuda")
(native-inputs
- `(;; ("gcc" ,gcc-8) ;CUDA requires GCC <= 8
- ("gfortran" ,gfortran-sans-libstdc++)
- ,@(alist-delete "gfortran" (package-native-inputs starpu))))
+ (modify-inputs (package-native-inputs starpu)
+ (delete "gfortran")
+ (prepend ;; ("gcc" ,gcc-8) ;CUDA requires GCC <= 8
+ gfortran-sans-libstdc++)))
(inputs
`(("cuda" ,cuda)
,@(package-inputs starpu)))
@@ -96,13 +97,13 @@
(package
(inherit starpu+cuda)
(name "starpu-cuda-fxt")
- (inputs `(("fxt" ,fxt)
- ,@(package-inputs starpu+cuda)))
+ (inputs (modify-inputs (package-inputs starpu+cuda)
+ (prepend fxt)))
(arguments
(substitute-keyword-arguments (package-arguments starpu+cuda)
((#:configure-flags flags '())
`(cons "--with-fxt" ,flags))))
;; some tests require python.
(native-inputs
- `(("python-wrapper" ,python-wrapper)
- ,@(package-native-inputs starpu+cuda)))))
+ (modify-inputs (package-native-inputs starpu+cuda)
+ (prepend python-wrapper)))))
diff --git a/non-free/cuda.scm b/non-free/cuda.scm
index cf98eb1..38d8a41 100644
--- a/non-free/cuda.scm
+++ b/non-free/cuda.scm
@@ -207,8 +207,8 @@ libraries for NVIDIA GPUs, all of which are proprietary.")
;; XXX: No documentation for now.
(delete 'move-documentation)))))
(native-inputs
- `(("which" ,which)
- ,@(package-native-inputs cuda-8.0)))))
+ (modify-inputs (package-native-inputs cuda-8.0)
+ (prepend which)))))
(define-public cuda-11.7
(package
diff --git a/non-free/cudnn.scm b/non-free/cudnn.scm
index b5473be..1450dad 100644
--- a/non-free/cudnn.scm
+++ b/non-free/cudnn.scm
@@ -107,7 +107,7 @@
(copy-recursively (string-append "." "/include")
includedir)))))))
(native-inputs
- `(("patchelf1G" ,patchelf1G)))
+ (list patchelf1G))
(inputs
`(("gcc:lib" ,gcc "lib")))
(synopsis "NVIDIA CUDA Deep Neural Network library")
diff --git a/non-free/hlibpro.scm b/non-free/hlibpro.scm
index 33f6bf1..2dff69e 100644
--- a/non-free/hlibpro.scm
+++ b/non-free/hlibpro.scm
@@ -180,7 +180,7 @@
;; to sources.
(invoke "./examples/bem1d") #t)))))
(native-inputs
- `(("patchelf" ,patchelf)))
+ (list patchelf))
(inputs
`(("gcc:lib" ,gcc "lib")
;; Required for building examples.
diff --git a/non-free/medit.scm b/non-free/medit.scm
index ee1a523..e241a72 100644
--- a/non-free/medit.scm
+++ b/non-free/medit.scm
@@ -39,8 +39,7 @@
(let ((out (assoc-ref outputs "out")))
(setenv "HOME" out)))))))
(inputs
- `(("mesa" ,mesa)
- ("freeglut" ,freeglut)))
+ (list mesa freeglut))
(synopsis "Mesh visualization tool")
(description
"Medit was developped to visualize numerical simulation results on
diff --git a/non-free/mkl.scm b/non-free/mkl.scm
index e4faacb..1f84d3d 100644
--- a/non-free/mkl.scm
+++ b/non-free/mkl.scm
@@ -85,11 +85,7 @@
;; Let's not publish or obtain substitutes for that.
#:substitutable? #f))
(native-inputs
- `(("tar" ,tar)
- ("gzip" ,gzip)
-
- ("cpio" ,cpio)
- ("rpm" ,rpm)))
+ (list tar gzip cpio rpm))
;; 32-bit libraries are not installed.
(supported-systems '("x86_64-linux"))
diff --git a/non-free/parmetis.scm b/non-free/parmetis.scm
index 260aac9..a3f5ae5 100644
--- a/non-free/parmetis.scm
+++ b/non-free/parmetis.scm
@@ -26,7 +26,7 @@
(base32
"0pvfpvb36djvqlcc3lq7si0c5xpb2cqndjg8wvzg35ygnwqs5ngj"))))
(build-system cmake-build-system)
- (native-inputs `(("openmpi" ,openmpi)))
+ (native-inputs (list openmpi))
(arguments
`(#:tests? #f ;no tests
#:configure-flags `("-DSHARED=ON"
--
GitLab