Update to upstream release 1.18.1
Resolves: RHEL-94486 Signed-off-by: Kamal Heib <kheib@redhat.com>
This commit is contained in:
Kamal Heib
parent
74b7ff7fdc
commit
8e07b00023
1
.gitignore
vendored
1
.gitignore
vendored
@ -22,3 +22,4 @@
|
||||
/ucx-1.14.1.tar.gz
|
||||
/ucx-1.15.0.tar.gz
|
||||
/ucx-1.17.0.tar.gz
|
||||
/ucx-1.18.1.tar.gz
|
||||
|
||||
29
9558.patch
29
9558.patch
@ -1,29 +0,0 @@
|
||||
From 99264b7352e9b89bfa8cfb2862a9fabd9eb5d764 Mon Sep 17 00:00:00 2001
|
||||
From: Yaakov Selkowitz <yselkowi@redhat.com>
|
||||
Date: Tue, 19 Dec 2023 13:13:25 -0500
|
||||
Subject: [PATCH] BUILD/CONFIG: Keep CFLAGS and CXXFLAGS separate
|
||||
|
||||
If configured with CFLAGS containing flags which are specific to C and invalid in CXX, this results in errors when compiling src/tools/perf/lib/uc[pt]_tests.cc:
|
||||
|
||||
```
|
||||
cc1plus: error: '-Werror=' argument '-Werror=implicit-function-declaration' is not valid for C++ [-Werror]
|
||||
cc1plus: error: '-Werror=' argument '-Werror=implicit-int' is not valid for C++ [-Werror]
|
||||
```
|
||||
This is currently breaking the build in Fedora 40 (rawhide) and ELN (the future RHEL 10).
|
||||
---
|
||||
config/m4/compiler.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/config/m4/compiler.m4 b/config/m4/compiler.m4
|
||||
index 6aa3360e76a..2719e98983b 100644
|
||||
--- a/config/m4/compiler.m4
|
||||
+++ b/config/m4/compiler.m4
|
||||
@@ -222,7 +222,7 @@ AC_DEFUN([CHECK_COMPILER_FLAG],
|
||||
[
|
||||
AC_MSG_CHECKING([compiler flag $1])
|
||||
SAVE_CFLAGS="$CFLAGS"
|
||||
- SAVE_CXXFLAGS="$CFLAGS"
|
||||
+ SAVE_CXXFLAGS="$CXXFLAGS"
|
||||
CFLAGS="$BASE_CFLAGS $CFLAGS $2"
|
||||
CXXFLAGS="$BASE_CXXFLAGS $CXXFLAGS $2"
|
||||
AC_LINK_IFELSE([$3],
|
||||
@ -1,29 +0,0 @@
|
||||
From b0a275a5492125a13020cd095fe9934e0b5e7c6a Mon Sep 17 00:00:00 2001
|
||||
From: Aboorva Devarajan <aboorvad@linux.ibm.com>
|
||||
Date: Wed, 19 Jun 2024 13:47:14 -0400
|
||||
Subject: [PATCH] UCS/TIME: Fix undeclared INFINITY error in
|
||||
ucs_time_units_to_sec()
|
||||
|
||||
Included <math.h> in ucs_time_units_to_sec() to resolve compilation
|
||||
errors due to missing INFINITY constant.
|
||||
|
||||
Signed-off-by: Aboorva Devarajan <aboorvad@linux.ibm.com>
|
||||
---
|
||||
src/ucs/time/time.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/ucs/time/time.h b/src/ucs/time/time.h
|
||||
index cff9810cdad8..c51362273f8d 100644
|
||||
--- a/src/ucs/time/time.h
|
||||
+++ b/src/ucs/time/time.h
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <ucs/time/time_def.h>
|
||||
#include <sys/time.h>
|
||||
#include <limits.h>
|
||||
+#include <math.h>
|
||||
|
||||
BEGIN_C_DECLS
|
||||
|
||||
--
|
||||
2.47.0
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (ucx-1.17.0.tar.gz) = 1033959bd223d1b4507b2a159e6ce65e76c1c5f231afc166bb0ed2e5c6c4aaa3db96b7c35c97c8b332e6e11f4ab24deb66d484009b7dc2af52b73981c1e72a25
|
||||
SHA512 (ucx-1.18.1.tar.gz) = bcab4a93c1fbf154275c6cdedfc981600cbac43d850f70e2cbfa0dfc73160be8808442acb86154ea964aaea0364aa9a37c41f4c643fa143f54e9d238b13820c7
|
||||
|
||||
53
ucx.spec
53
ucx.spec
@ -9,10 +9,12 @@
|
||||
%bcond_with ugni
|
||||
%bcond_with xpmem
|
||||
%bcond_with vfs
|
||||
%bcond_with mad
|
||||
%bcond_without mlx5
|
||||
|
||||
Name: ucx
|
||||
Version: 1.17.0
|
||||
Release: 3%{?dist}
|
||||
Version: 1.18.1
|
||||
Release: 1%{?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)
|
||||
@ -28,10 +30,6 @@ 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
|
||||
# BUILD/CONFIG: Keep CFLAGS and CXXFLAGS separate
|
||||
# Fixes build for https://fedoraproject.org/wiki/Changes/PortingToModernC
|
||||
Patch0: 9558.patch
|
||||
Patch1: UCS-TIME-Fix-undeclared-INFINITY-error-in-ucs_time_u.patch
|
||||
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
Prefix: %{_prefix}
|
||||
@ -58,6 +56,9 @@ BuildRequires: gdrcopy
|
||||
%if %{with ib}
|
||||
BuildRequires: libibverbs-devel
|
||||
%endif
|
||||
%if %{with mlx5}
|
||||
BuildRequires: rdma-core-devel
|
||||
%endif
|
||||
%if %{with knem}
|
||||
BuildRequires: knem
|
||||
%endif
|
||||
@ -73,6 +74,9 @@ BuildRequires: xpmem-devel
|
||||
%if %{with vfs}
|
||||
BuildRequires: fuse3-devel
|
||||
%endif
|
||||
%if %{with mad}
|
||||
BuildRequires: libibmad-devel libibumad-devel
|
||||
%endif
|
||||
|
||||
%description
|
||||
UCX is an optimized communication framework for high-performance distributed
|
||||
@ -98,8 +102,6 @@ Provides header files and examples for developing with UCX.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P0 -p1
|
||||
%patch -P1 -p1
|
||||
autoreconf -fiv
|
||||
|
||||
%build
|
||||
@ -116,12 +118,14 @@ autoreconf -fiv
|
||||
%_with_arg cuda cuda \
|
||||
%_with_arg gdrcopy gdrcopy \
|
||||
%_with_arg ib verbs \
|
||||
%_with_arg mlx5 mlx5 \
|
||||
%_with_arg knem knem \
|
||||
%_with_arg rdmacm rdmacm \
|
||||
%_with_arg rocm rocm \
|
||||
%_with_arg xpmem xpmem \
|
||||
%_with_arg vfs fuse3 \
|
||||
%_with_arg ugni ugni \
|
||||
%_with_arg mad mad \
|
||||
%{?configure_options}
|
||||
make %{?_smp_mflags} V=1
|
||||
|
||||
@ -320,7 +324,40 @@ status, and more.
|
||||
%{_bindir}/ucx_vfs
|
||||
%endif
|
||||
|
||||
%if %{with mlx5}
|
||||
%package ib-mlx5
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: ucx-ib = %{version}-%{release}
|
||||
Summary: UCX IB MLX5 RDMA provider support
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description ib-mlx5
|
||||
Provides support for DevX, Direct Verbs and DC transports for Infiniband
|
||||
devices.
|
||||
|
||||
%files ib-mlx5
|
||||
%{_libdir}/ucx/libuct_ib_mlx5.so.*
|
||||
%endif
|
||||
|
||||
%if %{with mad}
|
||||
%package mad
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Summary: UCX Infiniband MAD support
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description mad
|
||||
Provide Infiniband MAD support for UCX. Enables running perftest using
|
||||
Infiniband datagrams for out-of-band communications.
|
||||
|
||||
%files mad
|
||||
%{_libdir}/ucx/libucx_perftest_mad.so.*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jun 19 2025 Kamal Heib <kheib@redhat.com> - 1.18.1-1
|
||||
- Update to upstream release 1.18.1
|
||||
- Resolves: RHEL-94486
|
||||
|
||||
* Fri Mar 14 2025 David Abdurachmanov <davidlt@rivosinc.com> - 1.17.0-3
|
||||
- Enable riscv64
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user