diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index cb6f8ec..8b923d5 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -106,19 +106,33 @@ (package (inherit gnu:openmpi) (version (string-append (package-version openmpi-latest) "-glicid" )) - + (inputs `( -; ("ucx",ucx-latest) ;; should be latest beetween guix and glicid - ("rdma-core",rdma-core-latest) ;; should be latest beetween guix and glicid - ("libfabric",libfabric-latest) - ("slurm-glicid@20.02",slurm-20.02-glicid) + (package-input-rewriting `( + (,slurm . ,slurm-20.02.6) ;; we need this for glicid + )) ,@(package-inputs openmpi-latest))) ) ) -(define openmpi-glicid-transform-gcc-10 - (gcc10-instead-of-gcc openmpi-glicid)) +(define-public openmpi-glicid-with-newer-rdma-core + (package + (inherit openmpi-glicid) + (version (string-append (package-version openmpi-glicid) "-with-newer-rdma-core" )) + + (inputs `( + (package-input-rewriting `( + (,rdma-core . ,rdma-core-latest) ;; we need this for glicid + )) + + ,@(package-inputs openmpi-glicid))) + ) +) + + +;(define openmpi-glicid-transform-gcc-10 +; (gcc10-instead-of-gcc openmpi-glicid)) (define openmpi-glicid-transform-gcc-11 (gcc11-instead-of-gcc openmpi-glicid)) @@ -130,12 +144,12 @@ ) ) -(define-public openmpi-glicid-gcc-10 - (package - (inherit openmpi-glicid-transform-gcc-10) - (version (string-append (package-version openmpi-glicid-transform-gcc-10) "-gcc-10" )) - ) -) +;(define-public openmpi-glicid-gcc-10 +; (package +; (inherit openmpi-glicid-transform-gcc-10) +; (version (string-append (package-version openmpi-glicid-transform-gcc-10) "-gcc-10" )) +; ) +;)