* [bug#66573] [PATCH 01/11] gnu: opensm: Use the right version string for the doc directory.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
@ 2023-10-16 7:54 ` Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 02/11] gnu: opensm: Use gexps Ludovic Courtès
` (22 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-16 7:54 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
Previously, when built with ‘--with-latest=opensm’, the package would
install its documentation under a directory with the wrong version
string.
* gnu/packages/fabric-management.scm (opensm)[arguments]: Use the name
and version of THIS-PACKAGE.
---
gnu/packages/fabric-management.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index b6b2e5176c..545cd4ff67 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -73,11 +73,11 @@ (define-public opensm
(lambda* (#:key outputs #:allow-other-keys)
(let* ((base (assoc-ref outputs "out"))
(doc (string-append base "/share/doc/"
- ,name "-" ,version)))
+ ,(package-name this-package) "-"
+ ,(package-version this-package))))
(for-each (lambda (file)
(install-file file doc))
- (find-files "doc"))
- #t))))))
+ (find-files "doc"))))))))
(home-page "https://www.openfabrics.org/")
(synopsis "OpenIB InfiniBand Subnet Manager and management utilities")
(description "\
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 02/11] gnu: opensm: Use gexps.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
@ 2023-10-16 7:54 ` Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 03/11] gnu: slurm: Add 23.02.6 Ludovic Courtès
` (21 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-16 7:54 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
* gnu/packages/fabric-management.scm (opensm)[arguments]: Use gexps.
---
gnu/packages/fabric-management.scm | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index 545cd4ff67..740c570911 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -66,18 +66,20 @@ (define-public opensm
(inputs
(list rdma-core))
(arguments
- `(#:configure-flags '("--disable-static")
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'install-doc
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((base (assoc-ref outputs "out"))
- (doc (string-append base "/share/doc/"
- ,(package-name this-package) "-"
- ,(package-version this-package))))
- (for-each (lambda (file)
- (install-file file doc))
- (find-files "doc"))))))))
+ (list
+ #:configure-flags #~'("--disable-static")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'install-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((base (assoc-ref outputs "out"))
+ (doc (string-append base "/share/doc/"
+ #$(package-name this-package)
+ "-"
+ #$(package-version this-package))))
+ (for-each (lambda (file)
+ (install-file file doc))
+ (find-files "doc"))))))))
(home-page "https://www.openfabrics.org/")
(synopsis "OpenIB InfiniBand Subnet Manager and management utilities")
(description "\
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 03/11] gnu: slurm: Add 23.02.6.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 02/11] gnu: opensm: Use gexps Ludovic Courtès
@ 2023-10-16 7:54 ` Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 04/11] gnu: hwloc: Update to 2.9.3 Ludovic Courtès
` (20 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-16 7:54 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/parallel.scm (slurm): Update to 23.02.6.
(slurm-22.05): New variable.
---
gnu/packages/parallel.scm | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index df7b498d1f..b014a404a6 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2019-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;;
@@ -185,7 +185,7 @@ (define-public xjobs
(define-public slurm
(package
(name "slurm")
- (version "22.05.1")
+ (version "23.02.6")
(source (origin
(method url-fetch)
(uri (string-append
@@ -193,7 +193,7 @@ (define-public slurm
version ".tar.bz2"))
(sha256
(base32
- "0f3hhlki8g7slllsnyj1qikbsvr62i0hig85lcdcfnmsagzlhbyi"))
+ "08rz3r1rlnb3pmfdnbh542gm44ja0fdy8rkj4vm4lclc48cvqp2a"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -281,6 +281,20 @@ (define-public slurm
;; As noted in the link, YY.MM is the release scheme, and the 'maintenance'
;; digit does not introduce incompatibilities.
+(define-public slurm-22.05
+ (package
+ (inherit slurm)
+ (version "22.05.1")
+ (source (origin
+ (inherit (package-source slurm))
+ (method url-fetch)
+ (uri (string-append
+ "https://download.schedmd.com/slurm/slurm-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "0f3hhlki8g7slllsnyj1qikbsvr62i0hig85lcdcfnmsagzlhbyi"))))))
+
(define-public slurm-21.08
(package
(inherit slurm)
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 04/11] gnu: hwloc: Update to 2.9.3.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (2 preceding siblings ...)
2023-10-16 7:54 ` [bug#66573] [PATCH 03/11] gnu: slurm: Add 23.02.6 Ludovic Courtès
@ 2023-10-16 7:54 ` Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 05/11] gnu: opensm: Update to 3.3.24 Ludovic Courtès
` (19 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-16 7:54 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/mpi.scm (hwloc-2): Update to 2.9.3.
---
gnu/packages/mpi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index baf6ce11e0..0f2747b499 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -141,7 +141,7 @@ (define-public hwloc-1
(define-public hwloc-2
(package
(inherit hwloc-1)
- (version "2.9.2")
+ (version "2.9.3")
(source (origin
(method url-fetch)
(uri (string-append "https://download.open-mpi.org/release/hwloc/v"
@@ -149,7 +149,7 @@ (define-public hwloc-2
"/hwloc-" version ".tar.bz2"))
(sha256
(base32
- "1kv0n3b9knb8aawf0hxaxn9wc9bbpwh676r2gmb0pc7qfzvgv1qa"))))
+ "1v0dzzgzp40slakdwdb8vy0hy4m2ff3gnzqpzi8k8vbgap764h2w"))))
;; libnuma is no longer needed.
(inputs (modify-inputs (package-inputs hwloc-1)
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 05/11] gnu: opensm: Update to 3.3.24.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (3 preceding siblings ...)
2023-10-16 7:54 ` [bug#66573] [PATCH 04/11] gnu: hwloc: Update to 2.9.3 Ludovic Courtès
@ 2023-10-16 7:54 ` Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 06/11] gnu: ucx: Update to 1.15.0 Ludovic Courtès
` (18 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-16 7:54 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
* gnu/packages/fabric-management.scm (opensm): Update to 3.3.24.
---
gnu/packages/fabric-management.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index 740c570911..ccdaa0ee0a 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -46,7 +46,7 @@ (define-module (gnu packages fabric-management)
(define-public opensm
(package
(name "opensm")
- (version "3.3.22")
+ (version "3.3.24")
(source
(origin
(method url-fetch)
@@ -54,7 +54,7 @@ (define-public opensm
(string-append "https://github.com/linux-rdma/opensm/releases/download/"
version "/opensm-" version ".tar.gz"))
(sha256
- (base32 "19scwwpwqhqsyq4hbr5cflcmypss828lalxxd36yby7mbimca38y"))))
+ (base32 "0q74sx8y23h7picdzb4g5r84wcvc9hr9vzsdawkl812b38vmwcx3"))))
(build-system gnu-build-system)
(native-inputs
(list bison
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 06/11] gnu: ucx: Update to 1.15.0.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (4 preceding siblings ...)
2023-10-16 7:54 ` [bug#66573] [PATCH 05/11] gnu: opensm: Update to 3.3.24 Ludovic Courtès
@ 2023-10-16 7:54 ` Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 07/11] gnu: rdma-core: Update to 48.0 Ludovic Courtès
` (17 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-16 7:54 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
* gnu/packages/fabric-management.scm (ucx): Update to 1.15.0.
---
gnu/packages/fabric-management.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index ccdaa0ee0a..f41b4e99ed 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -185,7 +185,7 @@ (define-public ibutils
(define-public ucx
(package
(name "ucx")
- (version "1.14.0")
+ (version "1.15.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -195,7 +195,7 @@ (define-public ucx
(patches (search-patches "ucx-tcp-iface-ioctl.patch"))
(sha256
(base32
- "0ki2r768wqm92qv06wxrh3kv2nl2yj4ds9fz0s0b5rr2ycjiw9ir"))))
+ "1mk46vyfp8hsivk88s8gv0nf458jfs59fczpf66wwa3a9yp324jp"))))
(build-system gnu-build-system)
(arguments
(list
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 07/11] gnu: rdma-core: Update to 48.0.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (5 preceding siblings ...)
2023-10-16 7:54 ` [bug#66573] [PATCH 06/11] gnu: ucx: Update to 1.15.0 Ludovic Courtès
@ 2023-10-16 7:54 ` Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 08/11] gnu: libfabric: Update to 1.19.0 Ludovic Courtès
` (16 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-16 7:54 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès, Leo Famulari, Tobias Geerinckx-Rice
* gnu/packages/linux.scm (rdma-core): Update to 48.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 6bb6d62182..4abc34c0b3 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6749,7 +6749,7 @@ (define-public ntfsfix/static
(define-public rdma-core
(package
(name "rdma-core")
- (version "44.0")
+ (version "48.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core"
@@ -6757,7 +6757,7 @@ (define-public rdma-core
version ".tar.gz"))
(sha256
(base32
- "12w5v74wz1akac09frw7qk1yd06b00239zh7bvbvqyzjc0g61mi5"))))
+ "0h281dw2yph8pzfsr1wblqy6pb8nd9yj1pdf5c62zwc1l9b2fa3q"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;no tests
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 08/11] gnu: libfabric: Update to 1.19.0.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (6 preceding siblings ...)
2023-10-16 7:54 ` [bug#66573] [PATCH 07/11] gnu: rdma-core: Update to 48.0 Ludovic Courtès
@ 2023-10-16 7:54 ` Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 09/11] gnu: psm2: Update to 12.0 Ludovic Courtès
` (15 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-16 7:54 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès, Leo Famulari, Tobias Geerinckx-Rice
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/linux.scm (libfabric): Update to 1.19.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4abc34c0b3..96b5cc6e16 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8572,7 +8572,7 @@ (define-public procenv
(define-public libfabric
(package
(name "libfabric")
- (version "1.11.2")
+ (version "1.19.0")
(source
(origin
(method url-fetch)
@@ -8580,7 +8580,7 @@ (define-public libfabric
(string-append "https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
- (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz"))))
+ (base32 "17pg0fb4fa77r1bmp0xk535m8n8fadpfdg93cb280ghhx55pck7i"))))
(build-system gnu-build-system)
(inputs `(("rdma-core" ,rdma-core)
,@(match (%current-system)
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 09/11] gnu: psm2: Update to 12.0.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (7 preceding siblings ...)
2023-10-16 7:54 ` [bug#66573] [PATCH 08/11] gnu: libfabric: Update to 1.19.0 Ludovic Courtès
@ 2023-10-16 7:54 ` Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 10/11] gnu: openmpi: Update to 4.1.6 Ludovic Courtès
` (14 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-16 7:54 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès, Leo Famulari, Tobias Geerinckx-Rice
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/linux.scm (psm2): Update to 12.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 96b5cc6e16..fb319d4a65 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8861,7 +8861,7 @@ (define-public mbpfan
(define-public psm2
(package
(name "psm2")
- (version "11.2.230")
+ (version "12.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -8870,7 +8870,7 @@ (define-public psm2
(file-name (git-file-name name version))
(sha256
(base32
- "1bm7ndhi8qzmd0plnggj2h52yb34bab4k38530nsnkmv9smwdivl"))))
+ "04nar65ac11qqx41vkfs7iip8kfiah0zms7l4rmsxncpiz2iqfik"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 10/11] gnu: openmpi: Update to 4.1.6.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (8 preceding siblings ...)
2023-10-16 7:54 ` [bug#66573] [PATCH 09/11] gnu: psm2: Update to 12.0 Ludovic Courtès
@ 2023-10-16 7:54 ` Ludovic Courtès
2023-10-16 7:54 ` [bug#66573] [PATCH 11/11] gnu: intel-mpi-benchmarks: Update to 2021.3 Ludovic Courtès
` (13 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-16 7:54 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/mpi.scm (openmpi): Update to 4.1.6.
---
gnu/packages/mpi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 0f2747b499..85afc8cefc 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -184,7 +184,7 @@ (define-public hwloc
(define-public openmpi
(package
(name "openmpi")
- (version "4.1.5")
+ (version "4.1.6")
(source
(origin
(method url-fetch)
@@ -192,7 +192,7 @@ (define-public openmpi
(version-major+minor version)
"/downloads/openmpi-" version ".tar.bz2"))
(sha256
- (base32 "1qyvc77diyrxmviirdwqpibgm32c4vkdlvw8g79rsf2pq9mrhh56"))
+ (base32 "05g4245v0pdqcyjmgn50519ry5v5q8ig26iinmiynvaihm29jh7p"))
(patches (search-patches "openmpi-mtl-priorities.patch"))))
(properties
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 11/11] gnu: intel-mpi-benchmarks: Update to 2021.3.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (9 preceding siblings ...)
2023-10-16 7:54 ` [bug#66573] [PATCH 10/11] gnu: openmpi: Update to 4.1.6 Ludovic Courtès
@ 2023-10-16 7:54 ` Ludovic Courtès
2023-10-19 19:36 ` [bug#66573] [PATCH v2 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
` (12 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-16 7:54 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/benchmark.scm (intel-mpi-benchmarks/openmpi): Update to
2021.3.
---
gnu/packages/benchmark.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 4d92457e59..08fece6e91 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -137,7 +137,7 @@ (define-public fio
(define-public intel-mpi-benchmarks/openmpi
(package
(name "intel-mpi-benchmarks")
- (version "2019.6")
+ (version "2021.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -146,7 +146,7 @@ (define-public intel-mpi-benchmarks/openmpi
(file-name (git-file-name name version))
(sha256
(base32
- "02hxbk9g9nl59bk5qcfl3djj7b58vsqys340m1xdbyqwcrbnahh9"))
+ "04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h"))
(modules '((guix build utils)))
(snippet
'(begin
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2 01/11] gnu: opensm: Use the right version string for the doc directory.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (10 preceding siblings ...)
2023-10-16 7:54 ` [bug#66573] [PATCH 11/11] gnu: intel-mpi-benchmarks: Update to 2021.3 Ludovic Courtès
@ 2023-10-19 19:36 ` Ludovic Courtès
2023-10-19 19:36 ` [bug#66573] [PATCH v2 02/11] gnu: opensm: Use gexps Ludovic Courtès
` (11 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-19 19:36 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
Previously, when built with ‘--with-latest=opensm’, the package would
install its documentation under a directory with the wrong version
string.
* gnu/packages/fabric-management.scm (opensm)[arguments]: Use the name
and version of THIS-PACKAGE.
---
gnu/packages/fabric-management.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index b6b2e5176c..545cd4ff67 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -73,11 +73,11 @@ (define-public opensm
(lambda* (#:key outputs #:allow-other-keys)
(let* ((base (assoc-ref outputs "out"))
(doc (string-append base "/share/doc/"
- ,name "-" ,version)))
+ ,(package-name this-package) "-"
+ ,(package-version this-package))))
(for-each (lambda (file)
(install-file file doc))
- (find-files "doc"))
- #t))))))
+ (find-files "doc"))))))))
(home-page "https://www.openfabrics.org/")
(synopsis "OpenIB InfiniBand Subnet Manager and management utilities")
(description "\
base-commit: a0d2ecde943bd1854ddbb7c0cad35a1fc64dc5ab
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2 02/11] gnu: opensm: Use gexps.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (11 preceding siblings ...)
2023-10-19 19:36 ` [bug#66573] [PATCH v2 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
@ 2023-10-19 19:36 ` Ludovic Courtès
2023-10-19 19:36 ` [bug#66573] [PATCH v2 03/11] gnu: slurm: Add 23.02.6 Ludovic Courtès
` (10 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-19 19:36 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
* gnu/packages/fabric-management.scm (opensm)[arguments]: Use gexps.
---
gnu/packages/fabric-management.scm | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index 545cd4ff67..740c570911 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -66,18 +66,20 @@ (define-public opensm
(inputs
(list rdma-core))
(arguments
- `(#:configure-flags '("--disable-static")
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'install-doc
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((base (assoc-ref outputs "out"))
- (doc (string-append base "/share/doc/"
- ,(package-name this-package) "-"
- ,(package-version this-package))))
- (for-each (lambda (file)
- (install-file file doc))
- (find-files "doc"))))))))
+ (list
+ #:configure-flags #~'("--disable-static")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'install-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((base (assoc-ref outputs "out"))
+ (doc (string-append base "/share/doc/"
+ #$(package-name this-package)
+ "-"
+ #$(package-version this-package))))
+ (for-each (lambda (file)
+ (install-file file doc))
+ (find-files "doc"))))))))
(home-page "https://www.openfabrics.org/")
(synopsis "OpenIB InfiniBand Subnet Manager and management utilities")
(description "\
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2 03/11] gnu: slurm: Add 23.02.6.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (12 preceding siblings ...)
2023-10-19 19:36 ` [bug#66573] [PATCH v2 02/11] gnu: opensm: Use gexps Ludovic Courtès
@ 2023-10-19 19:36 ` Ludovic Courtès
2023-10-19 19:36 ` [bug#66573] [PATCH v2 04/11] gnu: hwloc: Update to 2.9.3 Ludovic Courtès
` (9 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-19 19:36 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/parallel.scm (slurm): Update to 23.02.6.
(slurm-22.05): New variable.
---
gnu/packages/parallel.scm | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index df7b498d1f..b014a404a6 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2019-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;;
@@ -185,7 +185,7 @@ (define-public xjobs
(define-public slurm
(package
(name "slurm")
- (version "22.05.1")
+ (version "23.02.6")
(source (origin
(method url-fetch)
(uri (string-append
@@ -193,7 +193,7 @@ (define-public slurm
version ".tar.bz2"))
(sha256
(base32
- "0f3hhlki8g7slllsnyj1qikbsvr62i0hig85lcdcfnmsagzlhbyi"))
+ "08rz3r1rlnb3pmfdnbh542gm44ja0fdy8rkj4vm4lclc48cvqp2a"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -281,6 +281,20 @@ (define-public slurm
;; As noted in the link, YY.MM is the release scheme, and the 'maintenance'
;; digit does not introduce incompatibilities.
+(define-public slurm-22.05
+ (package
+ (inherit slurm)
+ (version "22.05.1")
+ (source (origin
+ (inherit (package-source slurm))
+ (method url-fetch)
+ (uri (string-append
+ "https://download.schedmd.com/slurm/slurm-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "0f3hhlki8g7slllsnyj1qikbsvr62i0hig85lcdcfnmsagzlhbyi"))))))
+
(define-public slurm-21.08
(package
(inherit slurm)
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2 04/11] gnu: hwloc: Update to 2.9.3.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (13 preceding siblings ...)
2023-10-19 19:36 ` [bug#66573] [PATCH v2 03/11] gnu: slurm: Add 23.02.6 Ludovic Courtès
@ 2023-10-19 19:36 ` Ludovic Courtès
2023-10-19 19:36 ` [bug#66573] [PATCH v2 05/11] gnu: opensm: Update to 3.3.24 Ludovic Courtès
` (8 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-19 19:36 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/mpi.scm (hwloc-2): Update to 2.9.3.
---
gnu/packages/mpi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index baf6ce11e0..0f2747b499 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -141,7 +141,7 @@ (define-public hwloc-1
(define-public hwloc-2
(package
(inherit hwloc-1)
- (version "2.9.2")
+ (version "2.9.3")
(source (origin
(method url-fetch)
(uri (string-append "https://download.open-mpi.org/release/hwloc/v"
@@ -149,7 +149,7 @@ (define-public hwloc-2
"/hwloc-" version ".tar.bz2"))
(sha256
(base32
- "1kv0n3b9knb8aawf0hxaxn9wc9bbpwh676r2gmb0pc7qfzvgv1qa"))))
+ "1v0dzzgzp40slakdwdb8vy0hy4m2ff3gnzqpzi8k8vbgap764h2w"))))
;; libnuma is no longer needed.
(inputs (modify-inputs (package-inputs hwloc-1)
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2 05/11] gnu: opensm: Update to 3.3.24.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (14 preceding siblings ...)
2023-10-19 19:36 ` [bug#66573] [PATCH v2 04/11] gnu: hwloc: Update to 2.9.3 Ludovic Courtès
@ 2023-10-19 19:36 ` Ludovic Courtès
2023-10-19 19:36 ` [bug#66573] [PATCH v2 06/11] gnu: ucx: Update to 1.15.0 Ludovic Courtès
` (7 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-19 19:36 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
* gnu/packages/fabric-management.scm (opensm): Update to 3.3.24.
---
gnu/packages/fabric-management.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index 740c570911..ccdaa0ee0a 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -46,7 +46,7 @@ (define-module (gnu packages fabric-management)
(define-public opensm
(package
(name "opensm")
- (version "3.3.22")
+ (version "3.3.24")
(source
(origin
(method url-fetch)
@@ -54,7 +54,7 @@ (define-public opensm
(string-append "https://github.com/linux-rdma/opensm/releases/download/"
version "/opensm-" version ".tar.gz"))
(sha256
- (base32 "19scwwpwqhqsyq4hbr5cflcmypss828lalxxd36yby7mbimca38y"))))
+ (base32 "0q74sx8y23h7picdzb4g5r84wcvc9hr9vzsdawkl812b38vmwcx3"))))
(build-system gnu-build-system)
(native-inputs
(list bison
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2 06/11] gnu: ucx: Update to 1.15.0.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (15 preceding siblings ...)
2023-10-19 19:36 ` [bug#66573] [PATCH v2 05/11] gnu: opensm: Update to 3.3.24 Ludovic Courtès
@ 2023-10-19 19:36 ` Ludovic Courtès
2023-10-19 19:41 ` Ludovic Courtès
2023-10-19 19:36 ` [bug#66573] [PATCH v2 07/11] gnu: rdma-core: Update to 48.0 Ludovic Courtès
` (6 subsequent siblings)
23 siblings, 1 reply; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-19 19:36 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
* gnu/packages/fabric-management.scm (ucx): Update to 1.15.0.
* gnu/packages/patches/ucx-tcp-iface-ioctl.patch: Update for 1.15.0.
---
gnu/packages/fabric-management.scm | 4 +-
.../patches/ucx-tcp-iface-ioctl.patch | 105 +++++++++++-------
2 files changed, 64 insertions(+), 45 deletions(-)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index ccdaa0ee0a..f41b4e99ed 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -185,7 +185,7 @@ (define-public ibutils
(define-public ucx
(package
(name "ucx")
- (version "1.14.0")
+ (version "1.15.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -195,7 +195,7 @@ (define-public ucx
(patches (search-patches "ucx-tcp-iface-ioctl.patch"))
(sha256
(base32
- "0ki2r768wqm92qv06wxrh3kv2nl2yj4ds9fz0s0b5rr2ycjiw9ir"))))
+ "1mk46vyfp8hsivk88s8gv0nf458jfs59fczpf66wwa3a9yp324jp"))))
(build-system gnu-build-system)
(arguments
(list
diff --git a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch
index c441a0861a..2a0e4ce138 100644
--- a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch
+++ b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch
@@ -3,102 +3,121 @@ TCP network interfaces cannot be obtained via /sys/class/net. This patch
provides alternative code that uses the SIOCGIFCONF ioctl to get the
names of the available TCP network interfaces.
+Initially submitted at <https://github.com/openucx/ucx/pull/4462>.
+
diff --git a/src/uct/tcp/tcp_iface.c b/src/uct/tcp/tcp_iface.c
-index cad4a2709..7c1d2c9de 100644
+index 6a6cd34fa..af32bb2e9 100644
--- a/src/uct/tcp/tcp_iface.c
+++ b/src/uct/tcp/tcp_iface.c
-@@ -17,6 +17,8 @@
- #include <sys/poll.h>
+@@ -18,6 +18,8 @@
#include <netinet/tcp.h>
#include <dirent.h>
+ #include <float.h>
+#include <net/if.h>
+#include <sys/ioctl.h>
+ #define UCT_TCP_IFACE_NETDEV_DIR "/sys/class/net"
- extern ucs_class_t UCS_CLASS_DECL_NAME(uct_tcp_iface_t);
-@@ -586,6 +588,68 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_tcp_iface_t, uct_iface_t, uct_md_h,
+@@ -875,6 +877,85 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_tcp_iface_t, uct_iface_t, uct_md_h,
uct_worker_h, const uct_iface_params_t*,
const uct_iface_config_t*);
+/* Fetch information about available network devices through an ioctl. */
-+static ucs_status_t query_devices_ioctl(uct_md_h md,
-+ uct_tl_device_resource_t **tl_devices_p,
-+ unsigned *num_tl_devices_p)
++static ucs_status_t uct_tcp_query_devices_ioctl(uct_md_h md,
++ uct_tl_device_resource_t **devices_p,
++ unsigned *num_devices_p)
+{
+ int sock, err, i;
-+ uct_tl_device_resource_t *resources, *tmp;
-+ unsigned num_resources;
++ uct_tl_device_resource_t *devices, *tmp;
++ unsigned num_devices;
+ ucs_status_t status;
+ struct ifconf conf;
-+ struct ifreq reqs[10];
+
-+ conf.ifc_len = sizeof reqs;
-+ conf.ifc_req = reqs;
++ conf.ifc_len = 0;
++ conf.ifc_req = NULL;
+
-+ sock = socket(SOCK_STREAM, AF_INET, 0);
-+ if (sock < 0) {
-+ ucs_error("socket(2) failed: %m");
-+ status = UCS_ERR_IO_ERROR;
-+ goto out;
++ status = ucs_socket_create(AF_INET, SOCK_STREAM, &sock);
++ if (status != UCS_OK) {
++ goto out;
+ }
+
+ err = ioctl(sock, SIOCGIFCONF, &conf);
+ if (err < 0) {
-+ ucs_error("SIOCGIFCONF ioctl failed: %m");
-+ status = UCS_ERR_IO_ERROR;
-+ goto out;
++ ucs_error("ioctl(SIOCGIFCONF) failed: %m");
++ status = UCS_ERR_IO_ERROR;
++ goto out;
+ }
+
-+ resources = NULL;
-+ num_resources = 0;
-+ for (i = 0; i < conf.ifc_len / sizeof(struct ifreq); i++) {
-+ const char *name = reqs[i].ifr_name;
++ conf.ifc_req = ucs_calloc(1, conf.ifc_len, "ifreq");
++ if (conf.ifc_req == NULL) {
++ ucs_error("memory alocation failed");
++ status = UCS_ERR_NO_MEMORY;
++ goto out;
++ }
++
++ err = ioctl(sock, SIOCGIFCONF, &conf);
++ if (err < 0) {
++ ucs_error("ioctl(SIOCGIFCONF) failed: %m");
++ status = UCS_ERR_IO_ERROR;
++ goto out_free;
++ }
++
++ devices = NULL;
++ num_devices = 0;
++ for (i = 0; i < (conf.ifc_len / sizeof(struct ifreq)); i++) {
++ const char *name = conf.ifc_req[i].ifr_name;
++ sa_family_t family = conf.ifc_req[i].ifr_addr.sa_family;
+
-+ if (!ucs_netif_is_active(name, AF_INET)) {
++ if (!ucs_netif_is_active(name, family)) {
+ continue;
+ }
+
-+ tmp = ucs_realloc(resources, sizeof(*resources) * (num_resources + 1),
-+ "tcp resources");
++ tmp = ucs_realloc(devices, sizeof(*devices) * (num_devices + 1),
++ "tcp devices");
+ if (tmp == NULL) {
-+ ucs_free(resources);
++ ucs_free(devices);
+ status = UCS_ERR_NO_MEMORY;
-+ goto out;
++ goto out_free;
+ }
-+ resources = tmp;
++ devices = tmp;
+
-+ ucs_snprintf_zero(resources[i].name, sizeof(resources[i].name),
++ ucs_snprintf_zero(devices[num_devices].name,
++ sizeof(devices[num_devices].name),
+ "%s", name);
-+ resources[i].type = UCT_DEVICE_TYPE_NET;
-+ ++num_resources;
++ devices[num_devices].type = UCT_DEVICE_TYPE_NET;
++ ++num_devices;
+ }
+
-+ *num_tl_devices_p = num_resources;
-+ *tl_devices_p = resources;
-+ status = UCS_OK;
++ *num_devices_p = num_devices;
++ *devices_p = devices;
++ status = UCS_OK;
+
++out_free:
++ ucs_free(conf.ifc_req);
+out:
-+ if (sock >= 0) close(sock);
++ if (sock >= 0) {
++ close(sock);
++ }
+ return status;
+}
+
ucs_status_t uct_tcp_query_devices(uct_md_h md,
uct_tl_device_resource_t **devices_p,
unsigned *num_devices_p)
-@@ -599,9 +663,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
+@@ -893,9 +974,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
dir = opendir(UCT_TCP_IFACE_NETDEV_DIR);
if (dir == NULL) {
- ucs_error("opendir(%s) failed: %m", UCT_TCP_IFACE_NETDEV_DIR);
- status = UCS_ERR_IO_ERROR;
- goto out;
-+ /* When /sys is unavailable, as can be the case in a container,
-+ * resort to a good old 'ioctl'. */
-+ return query_devices_ioctl(md, devices_p, num_devices_p);
++ /* When /sys is unavailable, as can be the case in a container,
++ * resort to a good old 'ioctl'. */
++ return uct_tcp_query_devices_ioctl(md, devices_p, num_devices_p);
}
devices = NULL;
-@@ -655,7 +719,6 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
+@@ -963,7 +1044,6 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
out_closedir:
closedir(dir);
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2 07/11] gnu: rdma-core: Update to 48.0.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (16 preceding siblings ...)
2023-10-19 19:36 ` [bug#66573] [PATCH v2 06/11] gnu: ucx: Update to 1.15.0 Ludovic Courtès
@ 2023-10-19 19:36 ` Ludovic Courtès
2023-10-19 19:36 ` [bug#66573] [PATCH v2 08/11] gnu: libfabric: Update to 1.19.0 Ludovic Courtès
` (5 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-19 19:36 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès, Leo Famulari, Tobias Geerinckx-Rice
* gnu/packages/linux.scm (rdma-core): Update to 48.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 6bb6d62182..4abc34c0b3 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6749,7 +6749,7 @@ (define-public ntfsfix/static
(define-public rdma-core
(package
(name "rdma-core")
- (version "44.0")
+ (version "48.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core"
@@ -6757,7 +6757,7 @@ (define-public rdma-core
version ".tar.gz"))
(sha256
(base32
- "12w5v74wz1akac09frw7qk1yd06b00239zh7bvbvqyzjc0g61mi5"))))
+ "0h281dw2yph8pzfsr1wblqy6pb8nd9yj1pdf5c62zwc1l9b2fa3q"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;no tests
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2 08/11] gnu: libfabric: Update to 1.19.0.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (17 preceding siblings ...)
2023-10-19 19:36 ` [bug#66573] [PATCH v2 07/11] gnu: rdma-core: Update to 48.0 Ludovic Courtès
@ 2023-10-19 19:36 ` Ludovic Courtès
2023-10-19 19:36 ` [bug#66573] [PATCH v2 09/11] gnu: psm2: Update to 12.0 Ludovic Courtès
` (4 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-19 19:36 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès, Leo Famulari, Tobias Geerinckx-Rice
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/linux.scm (libfabric): Update to 1.19.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4abc34c0b3..96b5cc6e16 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8572,7 +8572,7 @@ (define-public procenv
(define-public libfabric
(package
(name "libfabric")
- (version "1.11.2")
+ (version "1.19.0")
(source
(origin
(method url-fetch)
@@ -8580,7 +8580,7 @@ (define-public libfabric
(string-append "https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
- (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz"))))
+ (base32 "17pg0fb4fa77r1bmp0xk535m8n8fadpfdg93cb280ghhx55pck7i"))))
(build-system gnu-build-system)
(inputs `(("rdma-core" ,rdma-core)
,@(match (%current-system)
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2 09/11] gnu: psm2: Update to 12.0.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (18 preceding siblings ...)
2023-10-19 19:36 ` [bug#66573] [PATCH v2 08/11] gnu: libfabric: Update to 1.19.0 Ludovic Courtès
@ 2023-10-19 19:36 ` Ludovic Courtès
2023-10-19 19:36 ` [bug#66573] [PATCH v2 10/11] gnu: openmpi: Update to 4.1.6 Ludovic Courtès
` (3 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-19 19:36 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès, Leo Famulari, Tobias Geerinckx-Rice
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/linux.scm (psm2): Update to 12.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 96b5cc6e16..fb319d4a65 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8861,7 +8861,7 @@ (define-public mbpfan
(define-public psm2
(package
(name "psm2")
- (version "11.2.230")
+ (version "12.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -8870,7 +8870,7 @@ (define-public psm2
(file-name (git-file-name name version))
(sha256
(base32
- "1bm7ndhi8qzmd0plnggj2h52yb34bab4k38530nsnkmv9smwdivl"))))
+ "04nar65ac11qqx41vkfs7iip8kfiah0zms7l4rmsxncpiz2iqfik"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2 10/11] gnu: openmpi: Update to 4.1.6.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (19 preceding siblings ...)
2023-10-19 19:36 ` [bug#66573] [PATCH v2 09/11] gnu: psm2: Update to 12.0 Ludovic Courtès
@ 2023-10-19 19:36 ` Ludovic Courtès
2023-10-19 19:36 ` [bug#66573] [PATCH v2 11/11] gnu: intel-mpi-benchmarks: Update to 2021.3 Ludovic Courtès
` (2 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-19 19:36 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/mpi.scm (openmpi): Update to 4.1.6.
---
gnu/packages/mpi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 0f2747b499..85afc8cefc 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -184,7 +184,7 @@ (define-public hwloc
(define-public openmpi
(package
(name "openmpi")
- (version "4.1.5")
+ (version "4.1.6")
(source
(origin
(method url-fetch)
@@ -192,7 +192,7 @@ (define-public openmpi
(version-major+minor version)
"/downloads/openmpi-" version ".tar.bz2"))
(sha256
- (base32 "1qyvc77diyrxmviirdwqpibgm32c4vkdlvw8g79rsf2pq9mrhh56"))
+ (base32 "05g4245v0pdqcyjmgn50519ry5v5q8ig26iinmiynvaihm29jh7p"))
(patches (search-patches "openmpi-mtl-priorities.patch"))))
(properties
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2 11/11] gnu: intel-mpi-benchmarks: Update to 2021.3.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (20 preceding siblings ...)
2023-10-19 19:36 ` [bug#66573] [PATCH v2 10/11] gnu: openmpi: Update to 4.1.6 Ludovic Courtès
@ 2023-10-19 19:36 ` Ludovic Courtès
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
2023-11-15 16:46 ` [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
23 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-19 19:36 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/benchmark.scm (intel-mpi-benchmarks/openmpi): Update to
2021.3.
---
gnu/packages/benchmark.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 4d92457e59..08fece6e91 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -137,7 +137,7 @@ (define-public fio
(define-public intel-mpi-benchmarks/openmpi
(package
(name "intel-mpi-benchmarks")
- (version "2019.6")
+ (version "2021.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -146,7 +146,7 @@ (define-public intel-mpi-benchmarks/openmpi
(file-name (git-file-name name version))
(sha256
(base32
- "02hxbk9g9nl59bk5qcfl3djj7b58vsqys340m1xdbyqwcrbnahh9"))
+ "04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h"))
(modules '((guix build utils)))
(snippet
'(begin
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory.
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (21 preceding siblings ...)
2023-10-19 19:36 ` [bug#66573] [PATCH v2 11/11] gnu: intel-mpi-benchmarks: Update to 2021.3 Ludovic Courtès
@ 2023-10-24 9:57 ` Ludovic Courtès
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 02/11] gnu: opensm: Use gexps Ludovic Courtès
` (9 more replies)
2023-11-15 16:46 ` [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
23 siblings, 10 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-24 9:57 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
Previously, when built with ‘--with-latest=opensm’, the package would
install its documentation under a directory with the wrong version
string.
* gnu/packages/fabric-management.scm (opensm)[arguments]: Use the name
and version of THIS-PACKAGE.
---
gnu/packages/fabric-management.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index b6b2e5176c..545cd4ff67 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -73,11 +73,11 @@ (define-public opensm
(lambda* (#:key outputs #:allow-other-keys)
(let* ((base (assoc-ref outputs "out"))
(doc (string-append base "/share/doc/"
- ,name "-" ,version)))
+ ,(package-name this-package) "-"
+ ,(package-version this-package))))
(for-each (lambda (file)
(install-file file doc))
- (find-files "doc"))
- #t))))))
+ (find-files "doc"))))))))
(home-page "https://www.openfabrics.org/")
(synopsis "OpenIB InfiniBand Subnet Manager and management utilities")
(description "\
base-commit: 4d748d344bb1891e2e32bf15db24131703d2f78c
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2.1 02/11] gnu: opensm: Use gexps.
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
@ 2023-10-24 9:57 ` Ludovic Courtès
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 03/11] gnu: slurm: Add 23.02.6 Ludovic Courtès
` (8 subsequent siblings)
9 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-24 9:57 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
* gnu/packages/fabric-management.scm (opensm)[arguments]: Use gexps.
---
gnu/packages/fabric-management.scm | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index 545cd4ff67..740c570911 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -66,18 +66,20 @@ (define-public opensm
(inputs
(list rdma-core))
(arguments
- `(#:configure-flags '("--disable-static")
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'install-doc
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((base (assoc-ref outputs "out"))
- (doc (string-append base "/share/doc/"
- ,(package-name this-package) "-"
- ,(package-version this-package))))
- (for-each (lambda (file)
- (install-file file doc))
- (find-files "doc"))))))))
+ (list
+ #:configure-flags #~'("--disable-static")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'install-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((base (assoc-ref outputs "out"))
+ (doc (string-append base "/share/doc/"
+ #$(package-name this-package)
+ "-"
+ #$(package-version this-package))))
+ (for-each (lambda (file)
+ (install-file file doc))
+ (find-files "doc"))))))))
(home-page "https://www.openfabrics.org/")
(synopsis "OpenIB InfiniBand Subnet Manager and management utilities")
(description "\
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2.1 03/11] gnu: slurm: Add 23.02.6.
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 02/11] gnu: opensm: Use gexps Ludovic Courtès
@ 2023-10-24 9:57 ` Ludovic Courtès
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 04/11] gnu: hwloc: Update to 2.9.3 Ludovic Courtès
` (7 subsequent siblings)
9 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-24 9:57 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/parallel.scm (slurm): Update to 23.02.6.
(slurm-22.05): New variable.
---
gnu/packages/parallel.scm | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index df7b498d1f..b014a404a6 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2019-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;;
@@ -185,7 +185,7 @@ (define-public xjobs
(define-public slurm
(package
(name "slurm")
- (version "22.05.1")
+ (version "23.02.6")
(source (origin
(method url-fetch)
(uri (string-append
@@ -193,7 +193,7 @@ (define-public slurm
version ".tar.bz2"))
(sha256
(base32
- "0f3hhlki8g7slllsnyj1qikbsvr62i0hig85lcdcfnmsagzlhbyi"))
+ "08rz3r1rlnb3pmfdnbh542gm44ja0fdy8rkj4vm4lclc48cvqp2a"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -281,6 +281,20 @@ (define-public slurm
;; As noted in the link, YY.MM is the release scheme, and the 'maintenance'
;; digit does not introduce incompatibilities.
+(define-public slurm-22.05
+ (package
+ (inherit slurm)
+ (version "22.05.1")
+ (source (origin
+ (inherit (package-source slurm))
+ (method url-fetch)
+ (uri (string-append
+ "https://download.schedmd.com/slurm/slurm-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "0f3hhlki8g7slllsnyj1qikbsvr62i0hig85lcdcfnmsagzlhbyi"))))))
+
(define-public slurm-21.08
(package
(inherit slurm)
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2.1 04/11] gnu: hwloc: Update to 2.9.3.
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 02/11] gnu: opensm: Use gexps Ludovic Courtès
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 03/11] gnu: slurm: Add 23.02.6 Ludovic Courtès
@ 2023-10-24 9:57 ` Ludovic Courtès
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 05/11] gnu: opensm: Update to 3.3.24 Ludovic Courtès
` (6 subsequent siblings)
9 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-24 9:57 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/mpi.scm (hwloc-2): Update to 2.9.3.
---
gnu/packages/mpi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index baf6ce11e0..0f2747b499 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -141,7 +141,7 @@ (define-public hwloc-1
(define-public hwloc-2
(package
(inherit hwloc-1)
- (version "2.9.2")
+ (version "2.9.3")
(source (origin
(method url-fetch)
(uri (string-append "https://download.open-mpi.org/release/hwloc/v"
@@ -149,7 +149,7 @@ (define-public hwloc-2
"/hwloc-" version ".tar.bz2"))
(sha256
(base32
- "1kv0n3b9knb8aawf0hxaxn9wc9bbpwh676r2gmb0pc7qfzvgv1qa"))))
+ "1v0dzzgzp40slakdwdb8vy0hy4m2ff3gnzqpzi8k8vbgap764h2w"))))
;; libnuma is no longer needed.
(inputs (modify-inputs (package-inputs hwloc-1)
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2.1 05/11] gnu: opensm: Update to 3.3.24.
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
` (2 preceding siblings ...)
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 04/11] gnu: hwloc: Update to 2.9.3 Ludovic Courtès
@ 2023-10-24 9:58 ` Ludovic Courtès
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 06/11] gnu: ucx: Update to 1.15.0 Ludovic Courtès
` (5 subsequent siblings)
9 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-24 9:58 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
* gnu/packages/fabric-management.scm (opensm): Update to 3.3.24.
---
gnu/packages/fabric-management.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index 740c570911..ccdaa0ee0a 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -46,7 +46,7 @@ (define-module (gnu packages fabric-management)
(define-public opensm
(package
(name "opensm")
- (version "3.3.22")
+ (version "3.3.24")
(source
(origin
(method url-fetch)
@@ -54,7 +54,7 @@ (define-public opensm
(string-append "https://github.com/linux-rdma/opensm/releases/download/"
version "/opensm-" version ".tar.gz"))
(sha256
- (base32 "19scwwpwqhqsyq4hbr5cflcmypss828lalxxd36yby7mbimca38y"))))
+ (base32 "0q74sx8y23h7picdzb4g5r84wcvc9hr9vzsdawkl812b38vmwcx3"))))
(build-system gnu-build-system)
(native-inputs
(list bison
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2.1 06/11] gnu: ucx: Update to 1.15.0.
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
` (3 preceding siblings ...)
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 05/11] gnu: opensm: Update to 3.3.24 Ludovic Courtès
@ 2023-10-24 9:58 ` Ludovic Courtès
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 07/11] gnu: rdma-core: Update to 48.0 Ludovic Courtès
` (4 subsequent siblings)
9 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-24 9:58 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
* gnu/packages/fabric-management.scm (ucx): Update to 1.15.0.
* gnu/packages/patches/ucx-tcp-iface-ioctl.patch: Update for 1.15.0.
---
gnu/packages/fabric-management.scm | 4 +-
.../patches/ucx-tcp-iface-ioctl.patch | 105 +++++++++++-------
2 files changed, 64 insertions(+), 45 deletions(-)
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index ccdaa0ee0a..f41b4e99ed 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -185,7 +185,7 @@ (define-public ibutils
(define-public ucx
(package
(name "ucx")
- (version "1.14.0")
+ (version "1.15.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -195,7 +195,7 @@ (define-public ucx
(patches (search-patches "ucx-tcp-iface-ioctl.patch"))
(sha256
(base32
- "0ki2r768wqm92qv06wxrh3kv2nl2yj4ds9fz0s0b5rr2ycjiw9ir"))))
+ "1mk46vyfp8hsivk88s8gv0nf458jfs59fczpf66wwa3a9yp324jp"))))
(build-system gnu-build-system)
(arguments
(list
diff --git a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch
index c441a0861a..2a0e4ce138 100644
--- a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch
+++ b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch
@@ -3,102 +3,121 @@ TCP network interfaces cannot be obtained via /sys/class/net. This patch
provides alternative code that uses the SIOCGIFCONF ioctl to get the
names of the available TCP network interfaces.
+Initially submitted at <https://github.com/openucx/ucx/pull/4462>.
+
diff --git a/src/uct/tcp/tcp_iface.c b/src/uct/tcp/tcp_iface.c
-index cad4a2709..7c1d2c9de 100644
+index 6a6cd34fa..af32bb2e9 100644
--- a/src/uct/tcp/tcp_iface.c
+++ b/src/uct/tcp/tcp_iface.c
-@@ -17,6 +17,8 @@
- #include <sys/poll.h>
+@@ -18,6 +18,8 @@
#include <netinet/tcp.h>
#include <dirent.h>
+ #include <float.h>
+#include <net/if.h>
+#include <sys/ioctl.h>
+ #define UCT_TCP_IFACE_NETDEV_DIR "/sys/class/net"
- extern ucs_class_t UCS_CLASS_DECL_NAME(uct_tcp_iface_t);
-@@ -586,6 +588,68 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_tcp_iface_t, uct_iface_t, uct_md_h,
+@@ -875,6 +877,85 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_tcp_iface_t, uct_iface_t, uct_md_h,
uct_worker_h, const uct_iface_params_t*,
const uct_iface_config_t*);
+/* Fetch information about available network devices through an ioctl. */
-+static ucs_status_t query_devices_ioctl(uct_md_h md,
-+ uct_tl_device_resource_t **tl_devices_p,
-+ unsigned *num_tl_devices_p)
++static ucs_status_t uct_tcp_query_devices_ioctl(uct_md_h md,
++ uct_tl_device_resource_t **devices_p,
++ unsigned *num_devices_p)
+{
+ int sock, err, i;
-+ uct_tl_device_resource_t *resources, *tmp;
-+ unsigned num_resources;
++ uct_tl_device_resource_t *devices, *tmp;
++ unsigned num_devices;
+ ucs_status_t status;
+ struct ifconf conf;
-+ struct ifreq reqs[10];
+
-+ conf.ifc_len = sizeof reqs;
-+ conf.ifc_req = reqs;
++ conf.ifc_len = 0;
++ conf.ifc_req = NULL;
+
-+ sock = socket(SOCK_STREAM, AF_INET, 0);
-+ if (sock < 0) {
-+ ucs_error("socket(2) failed: %m");
-+ status = UCS_ERR_IO_ERROR;
-+ goto out;
++ status = ucs_socket_create(AF_INET, SOCK_STREAM, &sock);
++ if (status != UCS_OK) {
++ goto out;
+ }
+
+ err = ioctl(sock, SIOCGIFCONF, &conf);
+ if (err < 0) {
-+ ucs_error("SIOCGIFCONF ioctl failed: %m");
-+ status = UCS_ERR_IO_ERROR;
-+ goto out;
++ ucs_error("ioctl(SIOCGIFCONF) failed: %m");
++ status = UCS_ERR_IO_ERROR;
++ goto out;
+ }
+
-+ resources = NULL;
-+ num_resources = 0;
-+ for (i = 0; i < conf.ifc_len / sizeof(struct ifreq); i++) {
-+ const char *name = reqs[i].ifr_name;
++ conf.ifc_req = ucs_calloc(1, conf.ifc_len, "ifreq");
++ if (conf.ifc_req == NULL) {
++ ucs_error("memory alocation failed");
++ status = UCS_ERR_NO_MEMORY;
++ goto out;
++ }
++
++ err = ioctl(sock, SIOCGIFCONF, &conf);
++ if (err < 0) {
++ ucs_error("ioctl(SIOCGIFCONF) failed: %m");
++ status = UCS_ERR_IO_ERROR;
++ goto out_free;
++ }
++
++ devices = NULL;
++ num_devices = 0;
++ for (i = 0; i < (conf.ifc_len / sizeof(struct ifreq)); i++) {
++ const char *name = conf.ifc_req[i].ifr_name;
++ sa_family_t family = conf.ifc_req[i].ifr_addr.sa_family;
+
-+ if (!ucs_netif_is_active(name, AF_INET)) {
++ if (!ucs_netif_is_active(name, family)) {
+ continue;
+ }
+
-+ tmp = ucs_realloc(resources, sizeof(*resources) * (num_resources + 1),
-+ "tcp resources");
++ tmp = ucs_realloc(devices, sizeof(*devices) * (num_devices + 1),
++ "tcp devices");
+ if (tmp == NULL) {
-+ ucs_free(resources);
++ ucs_free(devices);
+ status = UCS_ERR_NO_MEMORY;
-+ goto out;
++ goto out_free;
+ }
-+ resources = tmp;
++ devices = tmp;
+
-+ ucs_snprintf_zero(resources[i].name, sizeof(resources[i].name),
++ ucs_snprintf_zero(devices[num_devices].name,
++ sizeof(devices[num_devices].name),
+ "%s", name);
-+ resources[i].type = UCT_DEVICE_TYPE_NET;
-+ ++num_resources;
++ devices[num_devices].type = UCT_DEVICE_TYPE_NET;
++ ++num_devices;
+ }
+
-+ *num_tl_devices_p = num_resources;
-+ *tl_devices_p = resources;
-+ status = UCS_OK;
++ *num_devices_p = num_devices;
++ *devices_p = devices;
++ status = UCS_OK;
+
++out_free:
++ ucs_free(conf.ifc_req);
+out:
-+ if (sock >= 0) close(sock);
++ if (sock >= 0) {
++ close(sock);
++ }
+ return status;
+}
+
ucs_status_t uct_tcp_query_devices(uct_md_h md,
uct_tl_device_resource_t **devices_p,
unsigned *num_devices_p)
-@@ -599,9 +663,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
+@@ -893,9 +974,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
dir = opendir(UCT_TCP_IFACE_NETDEV_DIR);
if (dir == NULL) {
- ucs_error("opendir(%s) failed: %m", UCT_TCP_IFACE_NETDEV_DIR);
- status = UCS_ERR_IO_ERROR;
- goto out;
-+ /* When /sys is unavailable, as can be the case in a container,
-+ * resort to a good old 'ioctl'. */
-+ return query_devices_ioctl(md, devices_p, num_devices_p);
++ /* When /sys is unavailable, as can be the case in a container,
++ * resort to a good old 'ioctl'. */
++ return uct_tcp_query_devices_ioctl(md, devices_p, num_devices_p);
}
devices = NULL;
-@@ -655,7 +719,6 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
+@@ -963,7 +1044,6 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
out_closedir:
closedir(dir);
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2.1 07/11] gnu: rdma-core: Update to 48.0.
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
` (4 preceding siblings ...)
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 06/11] gnu: ucx: Update to 1.15.0 Ludovic Courtès
@ 2023-10-24 9:58 ` Ludovic Courtès
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 08/11] gnu: libfabric: Update to 1.19.0 Ludovic Courtès
` (3 subsequent siblings)
9 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-24 9:58 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès, Leo Famulari, Tobias Geerinckx-Rice
* gnu/packages/linux.scm (rdma-core): Update to 48.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f02577d2d5..cbacb15824 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6716,7 +6716,7 @@ (define-public ntfsfix/static
(define-public rdma-core
(package
(name "rdma-core")
- (version "44.0")
+ (version "48.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core"
@@ -6724,7 +6724,7 @@ (define-public rdma-core
version ".tar.gz"))
(sha256
(base32
- "12w5v74wz1akac09frw7qk1yd06b00239zh7bvbvqyzjc0g61mi5"))))
+ "0h281dw2yph8pzfsr1wblqy6pb8nd9yj1pdf5c62zwc1l9b2fa3q"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;no tests
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2.1 08/11] gnu: libfabric: Update to 1.19.0.
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
` (5 preceding siblings ...)
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 07/11] gnu: rdma-core: Update to 48.0 Ludovic Courtès
@ 2023-10-24 9:58 ` Ludovic Courtès
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 09/11] gnu: psm2: Update to 12.0 Ludovic Courtès
` (2 subsequent siblings)
9 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-24 9:58 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès, Leo Famulari, Tobias Geerinckx-Rice
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/linux.scm (libfabric): Update to 1.19.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index cbacb15824..d45727ce5d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8539,7 +8539,7 @@ (define-public procenv
(define-public libfabric
(package
(name "libfabric")
- (version "1.11.2")
+ (version "1.19.0")
(source
(origin
(method url-fetch)
@@ -8547,7 +8547,7 @@ (define-public libfabric
(string-append "https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
- (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz"))))
+ (base32 "17pg0fb4fa77r1bmp0xk535m8n8fadpfdg93cb280ghhx55pck7i"))))
(build-system gnu-build-system)
(inputs `(("rdma-core" ,rdma-core)
,@(match (%current-system)
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2.1 09/11] gnu: psm2: Update to 12.0.
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
` (6 preceding siblings ...)
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 08/11] gnu: libfabric: Update to 1.19.0 Ludovic Courtès
@ 2023-10-24 9:58 ` Ludovic Courtès
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 10/11] gnu: openmpi: Update to 4.1.6 Ludovic Courtès
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 11/11] gnu: intel-mpi-benchmarks: Update to 2021.3 Ludovic Courtès
9 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-24 9:58 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès, Leo Famulari, Tobias Geerinckx-Rice
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/linux.scm (psm2): Update to 12.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d45727ce5d..d694e280f4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8828,7 +8828,7 @@ (define-public mbpfan
(define-public psm2
(package
(name "psm2")
- (version "11.2.230")
+ (version "12.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -8837,7 +8837,7 @@ (define-public psm2
(file-name (git-file-name name version))
(sha256
(base32
- "1bm7ndhi8qzmd0plnggj2h52yb34bab4k38530nsnkmv9smwdivl"))))
+ "04nar65ac11qqx41vkfs7iip8kfiah0zms7l4rmsxncpiz2iqfik"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2.1 10/11] gnu: openmpi: Update to 4.1.6.
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
` (7 preceding siblings ...)
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 09/11] gnu: psm2: Update to 12.0 Ludovic Courtès
@ 2023-10-24 9:58 ` Ludovic Courtès
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 11/11] gnu: intel-mpi-benchmarks: Update to 2021.3 Ludovic Courtès
9 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-24 9:58 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/mpi.scm (openmpi): Update to 4.1.6.
---
gnu/packages/mpi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 0f2747b499..85afc8cefc 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -184,7 +184,7 @@ (define-public hwloc
(define-public openmpi
(package
(name "openmpi")
- (version "4.1.5")
+ (version "4.1.6")
(source
(origin
(method url-fetch)
@@ -192,7 +192,7 @@ (define-public openmpi
(version-major+minor version)
"/downloads/openmpi-" version ".tar.bz2"))
(sha256
- (base32 "1qyvc77diyrxmviirdwqpibgm32c4vkdlvw8g79rsf2pq9mrhh56"))
+ (base32 "05g4245v0pdqcyjmgn50519ry5v5q8ig26iinmiynvaihm29jh7p"))
(patches (search-patches "openmpi-mtl-priorities.patch"))))
(properties
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH v2.1 11/11] gnu: intel-mpi-benchmarks: Update to 2021.3.
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
` (8 preceding siblings ...)
2023-10-24 9:58 ` [bug#66573] [PATCH v2.1 10/11] gnu: openmpi: Update to 4.1.6 Ludovic Courtès
@ 2023-10-24 9:58 ` Ludovic Courtès
9 siblings, 0 replies; 39+ messages in thread
From: Ludovic Courtès @ 2023-10-24 9:58 UTC (permalink / raw)
To: 66573; +Cc: Ludovic Courtès
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/benchmark.scm (intel-mpi-benchmarks/openmpi): Update to
2021.3.
---
gnu/packages/benchmark.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 4d92457e59..08fece6e91 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -137,7 +137,7 @@ (define-public fio
(define-public intel-mpi-benchmarks/openmpi
(package
(name "intel-mpi-benchmarks")
- (version "2019.6")
+ (version "2021.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -146,7 +146,7 @@ (define-public intel-mpi-benchmarks/openmpi
(file-name (git-file-name name version))
(sha256
(base32
- "02hxbk9g9nl59bk5qcfl3djj7b58vsqys340m1xdbyqwcrbnahh9"))
+ "04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h"))
(modules '((guix build utils)))
(snippet
'(begin
--
2.41.0
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies
2023-10-16 7:35 [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
` (22 preceding siblings ...)
2023-10-24 9:57 ` [bug#66573] [PATCH v2.1 01/11] gnu: opensm: Use the right version string for the doc directory Ludovic Courtès
@ 2023-11-15 16:46 ` Ludovic Courtès
2023-11-15 16:57 ` Guillaume Le Vaillant
23 siblings, 1 reply; 39+ messages in thread
From: Ludovic Courtès @ 2023-11-15 16:46 UTC (permalink / raw)
To: 66573
Hello,
Ludovic Courtès <ludo@gnu.org> skribis:
> gnu: opensm: Use the right version string for the doc directory.
> gnu: opensm: Use gexps.
> gnu: slurm: Add 23.02.6.
> gnu: hwloc: Update to 2.9.3.
> gnu: opensm: Update to 3.3.24.
> gnu: ucx: Update to 1.15.0.
> gnu: rdma-core: Update to 48.0.
> gnu: libfabric: Update to 1.19.0.
> gnu: psm2: Update to 12.0.
> gnu: openmpi: Update to 4.1.6.
> gnu: intel-mpi-benchmarks: Update to 2021.3.
Frustrated by the slow response of qa.guix, I pushed a
‘wip-openmpi-upgrade’ branch, got it built at
<https://guix.bordeaux.inria.fr/jobset/openmpi-upgrade> for x86_64
overnight, and pushed it to ‘master’ as
f8cad886153f4c0fa96d50e497eec5f00279f0d5 after noticing there were no
regressions.
I think we should strive to provide quick response on qa.guix, even if
that means cutting on some checks to save computing resources. Perhaps
instead of green/grey/red, we need something more progressive. Dunno!
Ludo’.
^ permalink raw reply [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies
2023-11-15 16:46 ` [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies Ludovic Courtès
@ 2023-11-15 16:57 ` Guillaume Le Vaillant
2023-11-16 12:14 ` Ludovic Courtès
0 siblings, 1 reply; 39+ messages in thread
From: Guillaume Le Vaillant @ 2023-11-15 16:57 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 66573, Peter Polidoro
[-- Attachment #1: Type: text/plain, Size: 1782 bytes --]
Ludovic Courtès <ludo@gnu.org> skribis:
> Hello,
>
> Ludovic Courtès <ludo@gnu.org> skribis:
>
>> gnu: opensm: Use the right version string for the doc directory.
>> gnu: opensm: Use gexps.
>> gnu: slurm: Add 23.02.6.
>> gnu: hwloc: Update to 2.9.3.
>> gnu: opensm: Update to 3.3.24.
>> gnu: ucx: Update to 1.15.0.
>> gnu: rdma-core: Update to 48.0.
>> gnu: libfabric: Update to 1.19.0.
>> gnu: psm2: Update to 12.0.
>> gnu: openmpi: Update to 4.1.6.
>> gnu: intel-mpi-benchmarks: Update to 2021.3.
>
> Frustrated by the slow response of qa.guix, I pushed a
> ‘wip-openmpi-upgrade’ branch, got it built at
> <https://guix.bordeaux.inria.fr/jobset/openmpi-upgrade> for x86_64
> overnight, and pushed it to ‘master’ as
> f8cad886153f4c0fa96d50e497eec5f00279f0d5 after noticing there were no
> regressions.
>
> I think we should strive to provide quick response on qa.guix, even if
> that means cutting on some checks to save computing resources. Perhaps
> instead of green/grey/red, we need something more progressive. Dunno!
>
> Ludo’.
Hi.
I can't build the updated psm2. There's an error with the git checkout:
--8<---------------cut here---------------start------------->8---
building /gnu/store/ws9m70k8rq78hc6ywpjzh54f69hjfr5g-psm2-12.0-checkout.drv...
Initialized empty Git repository in /gnu/store/m03npw5b871r4kb7c0hlv3bm1sl6lki3-psm2-12.0-checkout/.git/
fatal: couldn't find remote ref PSM2_12.0
[...]
error: pathspec 'PSM2_12.0' did not match any file(s) known to git
[...]
build of
/gnu/store/ws9m70k8rq78hc6ywpjzh54f69hjfr5g-psm2-12.0-checkout.drv failed
--8<---------------cut here---------------end--------------->8---
This blocks <https://issues.guix.gnu.org/67151> to update kicad.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread
* [bug#66573] [PATCH 00/11] Update Open MPI and its dependencies
2023-11-15 16:57 ` Guillaume Le Vaillant
@ 2023-11-16 12:14 ` Ludovic Courtès
2023-11-16 14:55 ` Guillaume Le Vaillant
0 siblings, 1 reply; 39+ messages in thread
From: Ludovic Courtès @ 2023-11-16 12:14 UTC (permalink / raw)
To: Guillaume Le Vaillant; +Cc: 66573, Peter Polidoro
Hi,
Guillaume Le Vaillant <glv@posteo.net> skribis:
> I can't build the updated psm2. There's an error with the git checkout:
>
> building /gnu/store/ws9m70k8rq78hc6ywpjzh54f69hjfr5g-psm2-12.0-checkout.drv...
> Initialized empty Git repository in /gnu/store/m03npw5b871r4kb7c0hlv3bm1sl6lki3-psm2-12.0-checkout/.git/
> fatal: couldn't find remote ref PSM2_12.0
Sorry about that; fixed in 26a403f357f4471b14db7f01bb83a4c36ca5ef1b.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 39+ messages in thread