amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ucx: Update to 1.17.0.

Browse source 
* gnu/packages/fabric-management.scm (ucx): Update to 1.17.0.
* gnu/packages/patches/ucx-tcp-iface-ioctl.patch: Rebase.

Change-Id: I2089de93da88f4f81c4b233eb03abae1f41dfe7f
This commit is contained in:
Ludovic Courtès 2024-11-26 17:57:13 +01:00 • committed by Ludovic Courtès
parent c25fd8eeb1
commit 8ba6651d39
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/fabric-management.scm
View file

@ -185,7 +185,7 @@ testing InfiniBand networks.")
(define-public ucx (define-public ucx
(package (package
(name "ucx") (name "ucx")
(version "1.15.0") (version "1.17.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -195,7 +195,7 @@ testing InfiniBand networks.")
(patches (search-patches "ucx-tcp-iface-ioctl.patch")) (patches (search-patches "ucx-tcp-iface-ioctl.patch"))
(sha256 (sha256
(base32 (base32
"1mk46vyfp8hsivk88s8gv0nf458jfs59fczpf66wwa3a9yp324jp")))) "09182kx60kq7iyjyz3mpcrgp1mm0lnpc0f4hd4hlw5yyabkxrpa1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list

22
gnu/packages/patches/ucx-tcp-iface-ioctl.patch
View file

@ -6,7 +6,7 @@ names of the available TCP network interfaces.
Initially submitted at <https://github.com/openucx/ucx/pull/4462>. 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 diff --git a/src/uct/tcp/tcp_iface.c b/src/uct/tcp/tcp_iface.c
index 6a6cd34fa..af32bb2e9 100644 index f90d54fef..a2f74dc32 100644
--- a/src/uct/tcp/tcp_iface.c --- a/src/uct/tcp/tcp_iface.c
+++ b/src/uct/tcp/tcp_iface.c +++ b/src/uct/tcp/tcp_iface.c
@@ -18,6 +18,8 @@ @@ -18,6 +18,8 @@
@ -18,9 +18,9 @@ index 6a6cd34fa..af32bb2e9 100644
#define UCT_TCP_IFACE_NETDEV_DIR "/sys/class/net" #define UCT_TCP_IFACE_NETDEV_DIR "/sys/class/net"
@@ -875,6 +877,85 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_tcp_iface_t, uct_iface_t, uct_md_h, @@ -873,6 +875,85 @@ static int uct_tcp_is_bridge(const char *if_name)
uct_worker_h, const uct_iface_params_t*, return (stat(path, &st) == 0) && S_ISDIR(st.st_mode);
const uct_iface_config_t*); }
+/* Fetch information about available network devices through an ioctl. */ +/* Fetch information about available network devices through an ioctl. */
+static ucs_status_t uct_tcp_query_devices_ioctl(uct_md_h md, +static ucs_status_t uct_tcp_query_devices_ioctl(uct_md_h md,
@ -104,11 +104,11 @@ index 6a6cd34fa..af32bb2e9 100644
ucs_status_t uct_tcp_query_devices(uct_md_h md, ucs_status_t uct_tcp_query_devices(uct_md_h md,
uct_tl_device_resource_t **devices_p, uct_tl_device_resource_t **devices_p,
unsigned *num_devices_p) unsigned *num_devices_p)
@@ -893,9 +974,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, @@ -890,9 +971,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
dir = opendir(UCT_TCP_IFACE_NETDEV_DIR); n = scandir(UCT_TCP_IFACE_NETDEV_DIR, &entries, NULL, alphasort);
if (dir == NULL) { if (n == -1) {
- ucs_error("opendir(%s) failed: %m", UCT_TCP_IFACE_NETDEV_DIR); - ucs_error("scandir(%s) failed: %m", UCT_TCP_IFACE_NETDEV_DIR);
- status = UCS_ERR_IO_ERROR; - status = UCS_ERR_IO_ERROR;
- goto out; - goto out;
+ /* When /sys is unavailable, as can be the case in a container, + /* When /sys is unavailable, as can be the case in a container,
@ -117,10 +117,10 @@ index 6a6cd34fa..af32bb2e9 100644
} }
devices = NULL; devices = NULL;
@@ -963,7 +1044,6 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, @@ -959,7 +1040,6 @@ out_release:
}
out_closedir: free(entries);
closedir(dir);
-out: -out:
return status; return status;
} }