mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-06 21:20:33 +02:00
gnu: ucx: Update to 1.19.0.
* gnu/packages/fabric-management.scm (ucx): Update to 1.19.0. * gnu/packages/patches/ucx-tcp-iface-ioctl.patch: Update. Change-Id: I40dafb5173048804cb2368d0c45e71d1ed014482 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Merges: #4675
This commit is contained in:
@@ -185,7 +185,7 @@ testing InfiniBand networks.")
|
||||
(define-public ucx
|
||||
(package
|
||||
(name "ucx")
|
||||
(version "1.17.0")
|
||||
(version "1.19.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -195,7 +195,7 @@ testing InfiniBand networks.")
|
||||
(patches (search-patches "ucx-tcp-iface-ioctl.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"09182kx60kq7iyjyz3mpcrgp1mm0lnpc0f4hd4hlw5yyabkxrpa1"))
|
||||
"12j9200iyg6d0yr84r25hcpq8qqzfaa08klbhvgrqpflpfcljz4z"))
|
||||
(snippet
|
||||
;; As seen in commit b0a275a5492125a13020cd095fe9934e0b5e7c6a.
|
||||
#~(begin (use-modules (guix build utils))
|
||||
|
||||
@@ -5,8 +5,6 @@ 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 f90d54fef..a2f74dc32 100644
|
||||
--- a/src/uct/tcp/tcp_iface.c
|
||||
+++ b/src/uct/tcp/tcp_iface.c
|
||||
@@ -18,6 +18,8 @@
|
||||
@@ -18,8 +16,8 @@ index f90d54fef..a2f74dc32 100644
|
||||
|
||||
#define UCT_TCP_IFACE_NETDEV_DIR "/sys/class/net"
|
||||
|
||||
@@ -873,6 +875,85 @@ static int uct_tcp_is_bridge(const char *if_name)
|
||||
return (stat(path, &st) == 0) && S_ISDIR(st.st_mode);
|
||||
@@ -921,6 +923,85 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
+/* Fetch information about available network devices through an ioctl. */
|
||||
@@ -36,7 +34,7 @@ index f90d54fef..a2f74dc32 100644
|
||||
+ conf.ifc_len = 0;
|
||||
+ conf.ifc_req = NULL;
|
||||
+
|
||||
+ status = ucs_socket_create(AF_INET, SOCK_STREAM, &sock);
|
||||
+ status = ucs_socket_create(AF_INET, SOCK_STREAM, 0, &sock);
|
||||
+ if (status != UCS_OK) {
|
||||
+ goto out;
|
||||
+ }
|
||||
@@ -104,7 +102,7 @@ index f90d54fef..a2f74dc32 100644
|
||||
ucs_status_t uct_tcp_query_devices(uct_md_h md,
|
||||
uct_tl_device_resource_t **devices_p,
|
||||
unsigned *num_devices_p)
|
||||
@@ -890,9 +971,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
|
||||
@@ -938,9 +1019,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
|
||||
|
||||
n = scandir(UCT_TCP_IFACE_NETDEV_DIR, &entries, NULL, alphasort);
|
||||
if (n == -1) {
|
||||
@@ -117,11 +115,3 @@ index f90d54fef..a2f74dc32 100644
|
||||
}
|
||||
|
||||
devices = NULL;
|
||||
@@ -959,7 +1040,6 @@ out_release:
|
||||
}
|
||||
|
||||
free(entries);
|
||||
-out:
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user