Merge branch 'devel' into 'main'

bump psm2 version

See merge request glicid-public/guix-glicid!54
This commit is contained in:
Yann Dupont 2022-06-17 17:17:43 +00:00
commit 7a7d730537
2 changed files with 44 additions and 14 deletions

View file

@ -170,6 +170,30 @@
(define-public libfabric-latest (latest-version local-libfabric gnu:libfabric)) (define-public libfabric-latest (latest-version local-libfabric gnu:libfabric))
(define-public psm2-upstream-11.2.228
(package
(inherit gnu:psm2)
(name "psm2-upstream")
(version "11.2.228")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cornelisnetworks/opa-psm2")
(commit (string-append "PSM2_" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz"))))
)
)
(define local-psm2 psm2-upstream-11.2.228)
(define-public psm2-latest (latest-version local-psm2 gnu:psm2))
;(define-public apptainer ;(define-public apptainer
; (package ; (package
; (name "apptainer") ; (name "apptainer")
@ -289,3 +313,4 @@
;) ;)
; ;
;local-libfabric ;local-libfabric
psm2-upstream-11.2.228

View file

@ -62,32 +62,37 @@
) )
) )
(define-public openmpi-glicid-libfabric (define openmpi-glicid-libfabric
(transform-package ((instead-of "libfabric" libfabric-latest) openmpi-glicid) "libfabric") (transform-package ((instead-of "libfabric" libfabric-latest) openmpi-glicid) "libfabric")
) )
(define-public openmpi-glicid-rdma ;(define-public openmpi-glicid-rdma
(transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid) "rdma-core") ; (transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid) "rdma-core")
) ;)
(define-public openmpi-glicid-ucx ;(define-public openmpi-glicid-ucx
(transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid) "ucx" ) ; (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid) "ucx" )
) ;)
(define-public openmpi-glicid-libfabric-rdma (define openmpi-glicid-libfabric-rdma
(transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid-libfabric) "rdma") (transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid-libfabric) "rdma")
) )
(define-public openmpi-glicid-libfabric-ucx ;(define-public openmpi-glicid-libfabric-ucx
(transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric) "ucx") ; (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric) "ucx")
) ;)
(define-public openmpi-glicid-libfabric-rdma-ucx (define openmpi-glicid-libfabric-rdma-ucx
(transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric-rdma) "ucx") (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric-rdma) "ucx")
) )
(define-public openmpi-glicid-libfabric-rdma-ucx-ccipl (define openmpi-glicid-libfabric-rdma-ucx-psm2
(transform-package ((instead-of "slurm-glicid" slurm-ccipl) openmpi-glicid-libfabric-rdma-ucx) "ccipl") (transform-package ((instead-of "psm2" ucx-latest-glicid) openmpi-glicid-libfabric-rdma-ucx) "psm2")
)
(define-public openmpi-glicid-waves
(transform-package ((instead-of "slurm-glicid" slurm-ccipl) openmpi-glicid-libfabric-rdma-ucx-psm2) "waves")
) )