From f04ee73f4cd14dd27dc6a6014250ac253a784ff6 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 22 Nov 2021 21:40:37 +0100 Subject: [PATCH] test gcc replacement --- glicid/packages/mpi.scm | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index e0558ae..f58f284 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -112,33 +112,20 @@ ) ) -(define-public openmpi-glicid-gcc-11 - (package - (inherit openmpi-glicid) - (version (string-append (package-version openmpi-glicid) "-gcc-11" )) -; (name "glicid-openpmi-gcc-11") +(use-modules (guix transformations)) - (inputs `(("gcc-11", gcc-11) - ("gfortran-11", gfortran-11) -; ("glicid-ucx-gcc-11",glicid-ucx-gcc-11) -; ("glicid-rdma-core-gcc-11",glicid-rdma-core-gcc-11) -; ("libfabric",glicid-libfabric-gcc-11) - ,@(package-inputs openmpi-glicid))) - ) -) +;(define transform-to-gcc11 +; ;; The package transformation procedure. +; (options->transformation +; '( +; (with-c-toolchain . "gcc-toolchain@11")))) + +(define gcc11-instead-of-gcc + ;; This is a procedure to replace GCC by GCC11, + ;; recursively. + (package-input-rewriting `((,gcc-toolchain . ,gcc-toolchain-11)))) -;(define-public glicid-specific-openmpi -; (package -; (inherit glicid-openmpi-gcc-11) -; (name "glicid-specific-openmpi") -; (inputs `( -; ("gcc",gcc-11) -; ("rdma-core",glicid-rdma-core-gcc-11) -; ("ucx",glicid-ucx-gcc-10) -; ("libfabric",glicid-libfabric-gcc-11) -;; ("slurm", glicid-specific-slurm) -; ,@(package-inputs glicid-openmpi-gcc-11))) -; ) -;) +(define-public openmpi-glicid-gcc-11 + (gcc11-instead-of-gcc openmpi-glicid))