Compare commits
No commits in common. "rawhide" and "f43" have entirely different histories.
5 changed files with 44 additions and 104 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -24,4 +24,3 @@
|
|||
/ucx-1.16.0.tar.gz
|
||||
/ucx-1.17.0.tar.gz
|
||||
/ucx-1.18.1.tar.gz
|
||||
/ucx-1.19.0.tar.gz
|
||||
|
|
|
|||
38
10664.patch
Normal file
38
10664.patch
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
From 2e6f69db88da2c38c89c688a932817b6b4912920 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Vegas <tvegas@nvidia.com>
|
||||
Date: Tue, 29 Apr 2025 05:22:28 +0000
|
||||
Subject: [PATCH] TOOLS/PERF: Include omp.h outside of extern C declarations
|
||||
|
||||
---
|
||||
src/tools/perf/lib/libperf_int.h | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/tools/perf/lib/libperf_int.h b/src/tools/perf/lib/libperf_int.h
|
||||
index 3e6d9f77f53..ae3f489f2df 100644
|
||||
--- a/src/tools/perf/lib/libperf_int.h
|
||||
+++ b/src/tools/perf/lib/libperf_int.h
|
||||
@@ -11,6 +11,12 @@
|
||||
|
||||
#include <tools/perf/api/libperf.h>
|
||||
|
||||
+
|
||||
+#if _OPENMP
|
||||
+#include <omp.h>
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
BEGIN_C_DECLS
|
||||
|
||||
/** @file libperf_int.h */
|
||||
@@ -20,11 +26,6 @@ BEGIN_C_DECLS
|
||||
#include <ucs/sys/math.h>
|
||||
|
||||
|
||||
-#if _OPENMP
|
||||
-#include <omp.h>
|
||||
-#endif
|
||||
-
|
||||
-
|
||||
#define TIMING_QUEUE_SIZE 2048
|
||||
#define UCT_PERF_TEST_AM_ID 5
|
||||
#define ADDR_BUF_SIZE 4096
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
From 0ee91e1c571668732ee05b1525e7fa8f72427c0f Mon Sep 17 00:00:00 2001
|
||||
From: Kamal Heib <kheib@redhat.com>
|
||||
Date: Fri, 5 Dec 2025 12:00:49 -0500
|
||||
Subject: [PATCH] Avoid build failure
|
||||
|
||||
Signed-off-by: Kamal Heib <kheib@redhat.com>
|
||||
---
|
||||
src/tools/perf/perftest_params.c | 2 +-
|
||||
src/ucs/config/parser.c | 2 +-
|
||||
src/uct/ib/base/ib_device.c | 7 ++++---
|
||||
3 files changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/tools/perf/perftest_params.c b/src/tools/perf/perftest_params.c
|
||||
index 9098cdaed2f6..b7a5dcde01e2 100644
|
||||
--- a/src/tools/perf/perftest_params.c
|
||||
+++ b/src/tools/perf/perftest_params.c
|
||||
@@ -560,7 +560,7 @@ static ucs_status_t init_daemon_params(ucx_perf_params_t *params)
|
||||
ucs_status_t parse_test_params(perftest_params_t *params, char opt,
|
||||
const char *opt_arg)
|
||||
{
|
||||
- char *optarg2 = NULL;
|
||||
+ const char *optarg2 = NULL;
|
||||
test_type_t *test;
|
||||
unsigned i;
|
||||
|
||||
diff --git a/src/ucs/config/parser.c b/src/ucs/config/parser.c
|
||||
index 696a4ebd2186..2338ceab0380 100644
|
||||
--- a/src/ucs/config/parser.c
|
||||
+++ b/src/ucs/config/parser.c
|
||||
@@ -644,7 +644,7 @@ int ucs_config_sprintf_bw(char *buf, size_t max, const void *src,
|
||||
int ucs_config_sscanf_bw_spec(const char *buf, void *dest, const void *arg)
|
||||
{
|
||||
ucs_config_bw_spec_t *dst = (ucs_config_bw_spec_t*)dest;
|
||||
- char *delim;
|
||||
+ const char *delim;
|
||||
|
||||
delim = strchr(buf, ':');
|
||||
if (!delim) {
|
||||
diff --git a/src/uct/ib/base/ib_device.c b/src/uct/ib/base/ib_device.c
|
||||
index bcef1b0a4025..f77809be5a9a 100644
|
||||
--- a/src/uct/ib/base/ib_device.c
|
||||
+++ b/src/uct/ib/base/ib_device.c
|
||||
@@ -1305,7 +1305,8 @@ ucs_status_t uct_ib_device_find_port(uct_ib_device_t *dev,
|
||||
const char *ibdev_name;
|
||||
unsigned port_num;
|
||||
size_t devname_len;
|
||||
- char *p;
|
||||
+ const char *p;
|
||||
+ char *endptr;
|
||||
|
||||
p = strrchr(resource_dev_name, ':');
|
||||
if (p == NULL) {
|
||||
@@ -1320,8 +1321,8 @@ ucs_status_t uct_ib_device_find_port(uct_ib_device_t *dev,
|
||||
goto err; /* Device name is wrong */
|
||||
}
|
||||
|
||||
- port_num = strtod(p + 1, &p);
|
||||
- if (*p != '\0') {
|
||||
+ port_num = strtod(p + 1, &endptr);
|
||||
+ if (*endptr != '\0') {
|
||||
goto err; /* Failed to parse port number */
|
||||
}
|
||||
if ((port_num < dev->first_port) || (port_num >= dev->first_port + dev->num_ports)) {
|
||||
--
|
||||
2.51.1
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (ucx-1.19.0.tar.gz) = bcd727df3e3e281424bc8da5247bd5396b7b1b0f3113265d4dc2e401442710776aa3c251e05db633321171359c63e3166c95d21b2296207a37eb6e2e29845f90
|
||||
SHA512 (ucx-1.18.1.tar.gz) = bcab4a93c1fbf154275c6cdedfc981600cbac43d850f70e2cbfa0dfc73160be8808442acb86154ea964aaea0364aa9a37c41f4c643fa143f54e9d238b13820c7
|
||||
|
|
|
|||
41
ucx.spec
41
ucx.spec
|
|
@ -10,7 +10,6 @@
|
|||
%bcond_with vfs
|
||||
%bcond_with mad
|
||||
%bcond_without mlx5
|
||||
%bcond_with efa
|
||||
|
||||
%ifarch x86_64
|
||||
%if 0%{?fedora} <= 42
|
||||
|
|
@ -23,8 +22,8 @@
|
|||
%endif
|
||||
|
||||
Name: ucx
|
||||
Version: 1.19.0
|
||||
Release: 3%{?dist}
|
||||
Version: 1.18.1
|
||||
Release: 2%{?dist}
|
||||
Summary: UCX is a communication library implementing high-performance messaging
|
||||
|
||||
License: BSD-3-Clause AND MIT AND CC-PDDC AND (BSD-3-Clause OR Apache-2.0)
|
||||
|
|
@ -40,7 +39,9 @@ License: BSD-3-Clause AND MIT AND CC-PDDC AND (BSD-3-Clause OR Apache-2.0)
|
|||
|
||||
URL: http://www.openucx.org
|
||||
Source: https://github.com/openucx/%{name}/releases/download/v%{version}/ucx-%{version}.tar.gz
|
||||
Patch: Avoid-build-failure.patch
|
||||
# TOOLS/PERF: Include omp.h outside of extern C declarations
|
||||
Patch0: https://github.com/openucx/%{name}/pull/10664.patch
|
||||
|
||||
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
Prefix: %{_prefix}
|
||||
|
|
@ -70,9 +71,6 @@ BuildRequires: libibverbs-devel
|
|||
%if %{with mlx5}
|
||||
BuildRequires: rdma-core-devel
|
||||
%endif
|
||||
%if %{with efa}
|
||||
BuildRequires: rdma-core-devel
|
||||
%endif
|
||||
%if %{with knem}
|
||||
BuildRequires: knem
|
||||
%endif
|
||||
|
|
@ -124,9 +122,6 @@ Provides header files and examples for developing with UCX.
|
|||
# Remove this nonexistent library
|
||||
sed -i 's@-lhsakmt@@' config/m4/rocm.m4
|
||||
|
||||
# Relax use of -Werror
|
||||
sed -i 's@-Werror@@' config/m4/compiler.m4
|
||||
|
||||
autoreconf -fiv
|
||||
# https://github.com/openucx/ucx/commit/b0a275a5492125a13020cd095fe9934e0b5e7c6a
|
||||
# can be removed on release after 1.17.0
|
||||
|
|
@ -153,7 +148,6 @@ export CFLAGS="$CFLAGS -std=gnu17"
|
|||
%_with_arg gdrcopy gdrcopy \
|
||||
%_with_arg ib verbs \
|
||||
%_with_arg mlx5 mlx5 \
|
||||
%_with_arg efa efa \
|
||||
%_with_arg knem knem \
|
||||
%_with_arg rdmacm rdmacm \
|
||||
%_with_arg xpmem xpmem \
|
||||
|
|
@ -384,19 +378,6 @@ devices.
|
|||
%{_libdir}/ucx/libuct_ib_mlx5.so.*
|
||||
%endif
|
||||
|
||||
%if %{with efa}
|
||||
%package ib-efa
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Summary: UCX EFA device RDMA support
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description ib-efa
|
||||
Provides support for EFA device as an IBTA transport for UCX.
|
||||
|
||||
%files ib-efa
|
||||
%{_libdir}/ucx/libuct_ib_efa.so.*
|
||||
%endif
|
||||
|
||||
%if %{with mad}
|
||||
%package mad
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
|
@ -412,18 +393,6 @@ Infiniband datagrams for out-of-band communications.
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Fri Jan 16 2026 Tom Rix <Tom.Rix@amd.com> - 1.19.0-2
|
||||
- Relax use of -Werror
|
||||
|
||||
* Fri Dec 05 2025 Kamal Heib <kheib@redhat.com> - 1.19.0-1
|
||||
- Update to version 1.19.0
|
||||
|
||||
* Mon Nov 24 2025 Tom Rix <Tom.Rix@amd.com> - 1.18.1-3
|
||||
- Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue