~ruther/guix-local

b1feaa61ea721da11941323c13ab2c3340874e44 — Ludovic Courtès 5 months ago de5d211
gnu: libfabric: Update to 2.3.0.

* gnu/packages/linux.scm (libfabric): Update to 2.3.0.
(libfabric-1): New variable.
* gnu/packages/mpi.scm (openmpi-4)[inputs]: Use ‘libfabric-1’ instead of ‘libfabric’.
(openmpi-5)[inputs]: Replace ‘libfabric-1’ by ‘libfabric’.

Change-Id: I2cd739f1891960b0e8c6125589e3b05c82956353
2 files changed, 19 insertions(+), 4 deletions(-)

M gnu/packages/linux.scm
M gnu/packages/mpi.scm
M gnu/packages/linux.scm => gnu/packages/linux.scm +15 -2
@@ 10111,7 10111,7 @@ known as Slingshot.")
(define-public libfabric
  (package
    (name "libfabric")
    (version "1.22.0")
    (version "2.3.0")
    (source
     (origin
       (method url-fetch)


@@ 10119,7 10119,7 @@ known as Slingshot.")
        (string-append "https://github.com/ofiwg/libfabric/releases/download/v"
                       version "/libfabric-" version ".tar.bz2"))
       (sha256
        (base32 "1znmw83rmippv0fwz0x7lgylfk17dr9ckll8lrm4z7kclspnqpj8"))))
        (base32 "02gb12ijj19aad4c3dwckrrnjlsmy9fizkgw8a5zdzpqd3lgq60x"))))
    (build-system gnu-build-system)
    (inputs
     (let ((if-supported                          ;XXX: modified from openmpi


@@ 10169,6 10169,19 @@ applications deal with directly.  It works in conjunction with provider
libraries, which are often integrated directly into libfabric.")
    (license (list license:bsd-2 license:gpl2)))) ;dual

(define-public libfabric-1                        ;needed by Open MPI 4.x
  (package
    (inherit libfabric)
    (version "1.22.0")
    (source
     (origin
       (method url-fetch)
       (uri
        (string-append "https://github.com/ofiwg/libfabric/releases/download/v"
                       version "/libfabric-" version ".tar.bz2"))
       (sha256
        (base32 "1znmw83rmippv0fwz0x7lgylfk17dr9ckll8lrm4z7kclspnqpj8"))))))

(define-public psm
  (package
    (name "psm")

M gnu/packages/mpi.scm => gnu/packages/mpi.scm +4 -2
@@ 1,6 1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2018, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017 Dave Love <fx@gnu.org>


@@ 231,7 231,7 @@ bind processes, and much more.")
                  '()))))
       (append (list `(,hwloc-2 "lib")
                     gfortran
                     libfabric
                     libfabric-1                  ;fails to build with 2.3
                     libevent
                     opensm
                     openssh-sans-x)


@@ 376,6 376,8 @@ software vendors, application developers and computer science researchers.")
              ;; As of Open MPI 5.0.X, PMIx is used to communicate
              ;; with SLURM, so SLURM'S PMI is no longer needed.
              (delete "slurm")
              ;; Replace libfabric 1.x with a newer version.
              (replace "libfabric" libfabric)
              (append openpmix)        ;for PMI support (launching via "srun")
              (append prrte)))         ;for PMI support (launching via "srun")
    (native-inputs (modify-inputs (package-native-inputs openmpi)