diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index 78f62d9..e0558ae 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -99,7 +99,7 @@ ) -(define-public openmpi +(define-public openmpi-glicid (package (inherit gnu:openmpi) (version (string-append (package-version gnu:openmpi) "-glicid" )) @@ -112,34 +112,33 @@ ) ) -(define glicid-openmpi openmpi) - -(define-public glicid-openmpi-gcc-11 +(define-public openmpi-glicid-gcc-11 (package - (inherit glicid-openmpi) - (name "glicid-openpmi-gcc-11") + (inherit openmpi-glicid) + (version (string-append (package-version openmpi-glicid) "-gcc-11" )) +; (name "glicid-openpmi-gcc-11") (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-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-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 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))) +; ) +;)