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

Merge branch 'devel' into 'main'

Browse source 
openmpi-glicid is now the name of openmpi with all component uptodate

See merge request glicid-public/guix-glicid!172
This commit is contained in:
Yann Dupont 2023-01-02 14:04:34 +00:00
commit 0840827974
1 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
glicid/packages/mpi.scm
View file

@ -10,21 +10,6 @@
#:use-module (glicid packages parallel) #:use-module (glicid packages parallel)
#:use-module (gnu packages)) #:use-module (gnu packages))
(define-public openmpi-upstream-4.1.2
(package
(inherit gnu:openmpi)
(name "openmpi-upstream")
(version "4.1.2")
(source (origin
(method url-fetch)
(uri (string-append "https://www.open-mpi.org/software/ompi/v"
(version-major+minor version)
"/downloads/openmpi-" version ".tar.bz2"))
(sha256
(base32
"09xmlr4mfs02kwcf5cmdgkcdjj81fjwjmpa3rz2k28f3gz7wfy4v"))
(patches (search-patches "openmpi-mtl-priorities.patch"))))))
(define-public openmpi-upstream-4.1.4 (define-public openmpi-upstream-4.1.4
(package (package
(inherit gnu:openmpi) (inherit gnu:openmpi)
@ -46,31 +31,19 @@
(define-public openmpi-latest (define-public openmpi-latest
(latest-version local-openmpi gnu:openmpi)) (latest-version local-openmpi gnu:openmpi))
(define-public openmpi-glicid (define openmpi-slurm-glicid
(package (package
(inherit (transform-package ((instead-of "slurm" slurm-glicid) (inherit (transform-package ((instead-of "slurm" slurm-glicid)
openmpi-latest) "glicid")))) openmpi-latest) "glicid"))))
(define openmpi-glicid-libfabric (define openmpi-glicid-libfabric
(transform-package ((instead-of "libfabric" libfabric-latest) (transform-package ((instead-of "libfabric" libfabric-latest)
openmpi-glicid) "libfabric")) openmpi-slurm-glicid) "libfabric"))
;(define-public openmpi-glicid-rdma
; (transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid) "rdma-core")
;)
;(define-public openmpi-glicid-ucx
; (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid) "ucx" )
;)
(define openmpi-glicid-libfabric-rdma (define openmpi-glicid-libfabric-rdma
(transform-package ((instead-of "rdma-core" rdma-core-latest) (transform-package ((instead-of "rdma-core" rdma-core-latest)
openmpi-glicid-libfabric) "rdma")) openmpi-glicid-libfabric) "rdma"))
;(define-public openmpi-glicid-libfabric-ucx
; (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric) "ucx")
;)
(define openmpi-glicid-libfabric-rdma-ucx (define openmpi-glicid-libfabric-rdma-ucx
(transform-package ((instead-of "ucx" ucx-latest-glicid) (transform-package ((instead-of "ucx" ucx-latest-glicid)
openmpi-glicid-libfabric-rdma) "ucx")) openmpi-glicid-libfabric-rdma) "ucx"))
@ -79,6 +52,8 @@
(transform-package ((instead-of "psm2" psm2-latest) (transform-package ((instead-of "psm2" psm2-latest)
openmpi-glicid-libfabric-rdma-ucx) "psm2")) openmpi-glicid-libfabric-rdma-ucx) "psm2"))
(define-public openmpi-glicid openmpi-glicid-libfabric-rdma-ucx-psm2)
(define-public openmpi-glicid-waves (define-public openmpi-glicid-waves
(package (package
(inherit (transform-package ((instead-of "slurm-glicid" slurm-ccipl) (inherit (transform-package ((instead-of "slurm-glicid" slurm-ccipl)