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/mpi.scm (ucx): Update to 1.17.0.
[source]: Remove patch.  Add snippet to add missing header.
[supported-systems]: Add riscv64-linux.
* gnu/packages/patches/ucx-tcp-iface-ioctl.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.

Change-Id: I56db18f32ec0baa8439a31a1781763f318e8726e
This commit is contained in:
Efraim Flashner 2024-12-01 13:17:08 +02:00
parent 0aae7c333d
commit 7c36577cde
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
3 changed files with 12 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -2254,7 +2254,6 @@ dist_patch_DATA = \
%D%/packages/patches/u-boot-calloc-visibility.patch \
%D%/packages/patches/u-boot-nintendo-nes-serial.patch \
%D%/packages/patches/u-boot-rockchip-inno-usb.patch \
%D%/packages/patches/ucx-tcp-iface-ioctl.patch \
%D%/packages/patches/ultrastar-deluxe-no-freesans.patch \
%D%/packages/patches/ungoogled-chromium-extension-search-path.patch \
%D%/packages/patches/ungoogled-chromium-ffmpeg-compat.patch \

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

@ -185,17 +185,22 @@ testing InfiniBand networks.")
(define-public ucx
(package
(name "ucx")
(version "1.15.0")
(version "1.17.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/openucx/ucx")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(patches (search-patches "ucx-tcp-iface-ioctl.patch"))
(sha256
(base32
"1mk46vyfp8hsivk88s8gv0nf458jfs59fczpf66wwa3a9yp324jp"))))
"09182kx60kq7iyjyz3mpcrgp1mm0lnpc0f4hd4hlw5yyabkxrpa1"))
(snippet
;; As seen in commit b0a275a5492125a13020cd095fe9934e0b5e7c6a.
#~(begin (use-modules (guix build utils))
(substitute* "src/ucs/time/time.h"
(("#include <limits.h>")
"#include <limits.h>\n#include <math.h>"))))))
(build-system gnu-build-system)
(arguments
(list
@ -236,6 +241,7 @@ memory mechanisms for efficient intra-node communication.")
(home-page "https://www.openucx.org/")
(license bsd-3)
;; <ucm/bistro/bistro.h> lists only PowerPC64, AArch64, and x86_64 as
;; supported.
(supported-systems '("x86_64-linux" "aarch64-linux" "powerpc64le-linux"))))
;; <ucm/bistro/bistro.h> lists only PowerPC64, AArch64, RISC-V
;; and x86_64 as supported.
(supported-systems '("x86_64-linux" "aarch64-linux" "powerpc64le-linux"
"riscv64-linux"))))

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

@ -1,127 +0,0 @@
Since /sys is unavailable in build environments, the list of available
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 6a6cd34fa..af32bb2e9 100644
--- a/src/uct/tcp/tcp_iface.c
+++ b/src/uct/tcp/tcp_iface.c
@@ -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"
@@ -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 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 *devices, *tmp;
+ unsigned num_devices;
+ ucs_status_t status;
+ struct ifconf conf;
+
+ conf.ifc_len = 0;
+ conf.ifc_req = NULL;
+
+ 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("ioctl(SIOCGIFCONF) failed: %m");
+ status = UCS_ERR_IO_ERROR;
+ goto out;
+ }
+
+ 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, family)) {
+ continue;
+ }
+
+ tmp = ucs_realloc(devices, sizeof(*devices) * (num_devices + 1),
+ "tcp devices");
+ if (tmp == NULL) {
+ ucs_free(devices);
+ status = UCS_ERR_NO_MEMORY;
+ goto out_free;
+ }
+ devices = tmp;
+
+ ucs_snprintf_zero(devices[num_devices].name,
+ sizeof(devices[num_devices].name),
+ "%s", name);
+ devices[num_devices].type = UCT_DEVICE_TYPE_NET;
+ ++num_devices;
+ }
+
+ *num_devices_p = num_devices;
+ *devices_p = devices;
+ status = UCS_OK;
+
+out_free:
+ ucs_free(conf.ifc_req);
+out:
+ 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)
@@ -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 uct_tcp_query_devices_ioctl(md, devices_p, num_devices_p);
}
devices = NULL;
@@ -963,7 +1044,6 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
out_closedir:
closedir(dir);
-out:
return status;
}