SLFO-pool/openucx
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main openucx revision 049e74ae71bd34cbb9c8c23d171b6a18

Browse Source
This commit is contained in:
Adrian Schröter 2024-11-04 17:28:41 +01:00
parent 7ed9b3ac39
commit e8ea51b652
6 changed files with 138 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
UCS-TIME-Add-math.h-to-provide-INFINITY.patch Normal file
View File

@ -0,0 +1,18 @@
commit c49bd7a5d183a57f41c801c7f5c9691bcd7d23da
Author: Thomas Vegas <tvegas@nvidia.com>
Date: Mon Jun 24 16:52:04 2024 +0300
UCS/TIME: Add math.h to provide INFINITY
diff --git src/ucs/time/time.h src/ucs/time/time.h
index cff9810cdad8..c51362273f8d 100644
--- src/ucs/time/time.h
+++ 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

154
openucx-s390x-support.patch
View File

@ -1,6 +1,6 @@
commit 328a69d07b618e0aa83fe2351e8d7ca4fc1b2f00 commit 70e243c8a6685a03d5faa65e706d318196ad712b
Author: Nicolas Morey <nmorey@suse.com> Author: Nicolas Morey <nmorey@suse.com>
Date: Mon Feb 13 17:04:14 2023 +0100 Date: Wed Jun 26 17:36:58 2024 +0200
openucx s390x support openucx s390x support
@ -32,42 +32,26 @@ index e5e66266d695..ef7e4ede93ce 100644
AS_IF([test "x$bistro_hooks_happy" = "xyes"], AS_IF([test "x$bistro_hooks_happy" = "xyes"],
[AC_DEFINE([UCM_BISTRO_HOOKS], [1], [Enable BISTRO hooks])], [AC_DEFINE([UCM_BISTRO_HOOKS], [1], [Enable BISTRO hooks])],
diff --git src/tools/info/sys_info.c src/tools/info/sys_info.c
index e5aff871d491..2b7c54319f53 100644
--- src/tools/info/sys_info.c
+++ src/tools/info/sys_info.c
@@ -47,7 +47,8 @@ static const char* cpu_vendor_names[] = {
[UCS_CPU_VENDOR_GENERIC_ARM] = "Generic ARM",
[UCS_CPU_VENDOR_GENERIC_PPC] = "Generic PPC",
[UCS_CPU_VENDOR_FUJITSU_ARM] = "Fujitsu ARM",
- [UCS_CPU_VENDOR_ZHAOXIN] = "Zhaoxin"
+ [UCS_CPU_VENDOR_ZHAOXIN] = "Zhaoxin",
+ [UCS_CPU_VENDOR_GENERIC_IBM] = "Generic IBM"
};
static double measure_memcpy_bandwidth(size_t size)
diff --git src/ucm/Makefile.am src/ucm/Makefile.am diff --git src/ucm/Makefile.am src/ucm/Makefile.am
index 48b82bf89cbe..582f83d1ea82 100644 index fa7a722f2d31..e6df414a4ecb 100644
--- src/ucm/Makefile.am --- src/ucm/Makefile.am
+++ src/ucm/Makefile.am +++ src/ucm/Makefile.am
@@ -31,7 +31,8 @@ noinst_HEADERS = \ @@ -34,6 +34,7 @@ noinst_HEADERS = \
bistro/bistro.h \
bistro/bistro_x86_64.h \
bistro/bistro_aarch64.h \ bistro/bistro_aarch64.h \
- bistro/bistro_ppc64.h bistro/bistro_ppc64.h \
+ bistro/bistro_ppc64.h \ bistro/bistro_rv64.h
+ bistro/bistro_s390x.h + bistro/bistro_s390x.h
libucm_la_SOURCES = \ libucm_la_SOURCES = \
event/event.c \ event/event.c \
diff --git src/ucm/bistro/bistro.h src/ucm/bistro/bistro.h diff --git src/ucm/bistro/bistro.h src/ucm/bistro/bistro.h
index b622e3c14fbb..4acd9e9cdb83 100644 index 8d0b90751676..a0b9d3f064c3 100644
--- src/ucm/bistro/bistro.h --- src/ucm/bistro/bistro.h
+++ src/ucm/bistro/bistro.h +++ src/ucm/bistro/bistro.h
@@ -20,6 +20,8 @@ typedef struct ucm_bistro_restore_point ucm_bistro_restore_point_t; @@ -23,6 +23,8 @@ typedef struct ucm_bistro_restore_point ucm_bistro_restore_point_t;
# include "bistro_aarch64.h"
#elif defined(__x86_64__)
# include "bistro_x86_64.h" # include "bistro_x86_64.h"
#elif defined(__riscv)
# include "bistro_rv64.h"
+#elif defined(__s390x__) +#elif defined(__s390x__)
+# include "bistro_s390x.h" +# include "bistro_s390x.h"
#else #else
@ -75,10 +59,10 @@ index b622e3c14fbb..4acd9e9cdb83 100644
#endif #endif
diff --git src/ucm/bistro/bistro_s390x.h src/ucm/bistro/bistro_s390x.h diff --git src/ucm/bistro/bistro_s390x.h src/ucm/bistro/bistro_s390x.h
new file mode 100644 new file mode 100644
index 000000000000..c0f427f4984a index 000000000000..2beb5de54fab
--- /dev/null --- /dev/null
+++ src/ucm/bistro/bistro_s390x.h +++ src/ucm/bistro/bistro_s390x.h
@@ -0,0 +1,18 @@ @@ -0,0 +1,27 @@
+#ifndef UCM_BISTRO_BISTRO_S390X_H_ +#ifndef UCM_BISTRO_BISTRO_S390X_H_
+#define UCM_BISTRO_BISTRO_S390X_H_ +#define UCM_BISTRO_BISTRO_S390X_H_
+ +
@ -90,55 +74,65 @@ index 000000000000..c0f427f4984a
+#define UCM_BISTRO_PROLOGUE +#define UCM_BISTRO_PROLOGUE
+#define UCM_BISTRO_EPILOGUE +#define UCM_BISTRO_EPILOGUE
+ +
+typedef struct ucm_bistro_patch {
+} UCS_S_PACKED ucm_bistro_patch_t;
+typedef struct {
+} UCS_S_PACKED ucm_bistro_lock_t;
+
+static inline ucs_status_t ucm_bistro_patch(void *func_ptr, void *hook, const char *symbol, +static inline ucs_status_t ucm_bistro_patch(void *func_ptr, void *hook, const char *symbol,
+ void **orig_func_p, + void **orig_func_p,
+ ucm_bistro_restore_point_t **rp){ + ucm_bistro_restore_point_t **rp){
+ return UCS_ERR_UNSUPPORTED; + return UCS_ERR_UNSUPPORTED;
+} +}
+ +
+static inline void ucm_bistro_patch_lock(void * UCS_V_UNUSED dst)
+{
+}
+
+#endif +#endif
diff --git src/ucs/Makefile.am src/ucs/Makefile.am diff --git src/ucs/Makefile.am src/ucs/Makefile.am
index c7696d56f25d..c63b32bad844 100644 index 4a05f47b6369..c1cd2fb2cb57 100644
--- src/ucs/Makefile.am --- src/ucs/Makefile.am
+++ src/ucs/Makefile.am +++ src/ucs/Makefile.am
@@ -22,6 +22,7 @@ libucs_la_LIBADD = $(LIBM) $(top_builddir)/src/ucm/libucm.la $(BFD_LIBS) @@ -24,6 +24,7 @@ nobase_dist_libucs_la_HEADERS = \
nobase_dist_libucs_la_HEADERS = \
arch/aarch64/bitops.h \ arch/aarch64/bitops.h \
arch/ppc64/bitops.h \ arch/ppc64/bitops.h \
arch/rv64/bitops.h \
+ arch/s390x/bitops.h \ + arch/s390x/bitops.h \
arch/x86_64/bitops.h \ arch/x86_64/bitops.h \
arch/bitops.h \ arch/bitops.h \
algorithm/crc.h \ algorithm/crc.h \
@@ -82,12 +83,14 @@ nobase_dist_libucs_la_HEADERS = \ @@ -87,6 +88,7 @@ nobase_dist_libucs_la_HEADERS = \
arch/aarch64/global_opts.h \
arch/generic/atomic.h \ arch/generic/atomic.h \
arch/ppc64/global_opts.h \ arch/ppc64/global_opts.h \
arch/rv64/global_opts.h \
+ arch/s390x/global_opts.h \ + arch/s390x/global_opts.h \
arch/global_opts.h arch/global_opts.h
noinst_HEADERS = \ noinst_HEADERS = \
arch/aarch64/cpu.h \ @@ -94,6 +96,7 @@ noinst_HEADERS = \
arch/generic/cpu.h \ arch/generic/cpu.h \
arch/ppc64/cpu.h \ arch/ppc64/cpu.h \
arch/rv64/cpu.h \
+ arch/s390x/cpu.h \ + arch/s390x/cpu.h \
arch/x86_64/cpu.h \ arch/x86_64/cpu.h \
arch/cpu.h \ arch/cpu.h \
config/ucm_opts.h \ config/ucm_opts.h \
@@ -138,6 +141,7 @@ libucs_la_SOURCES = \ @@ -149,6 +152,7 @@ libucs_la_SOURCES = \
algorithm/string_distance.c \ algorithm/string_distance.c \
arch/aarch64/cpu.c \ arch/aarch64/cpu.c \
arch/aarch64/global_opts.c \ arch/aarch64/global_opts.c \
+ arch/s390x/global_opts.c \ + arch/s390x/global_opts.c \
arch/ppc64/timebase.c \ arch/ppc64/timebase.c \
arch/ppc64/global_opts.c \ arch/ppc64/global_opts.c \
arch/x86_64/cpu.c \ arch/rv64/cpu.c \
diff --git src/ucs/arch/atomic.h src/ucs/arch/atomic.h diff --git src/ucs/arch/atomic.h src/ucs/arch/atomic.h
index 52be711c1d0a..8f1d62a28dc9 100644 index 849647902fab..a328c37e2020 100644
--- src/ucs/arch/atomic.h --- src/ucs/arch/atomic.h
+++ src/ucs/arch/atomic.h +++ src/ucs/arch/atomic.h
@@ -15,6 +15,8 @@ @@ -18,6 +18,8 @@
# include "generic/atomic.h" # include "generic/atomic.h"
#elif defined(__aarch64__) #elif defined(__riscv)
# include "generic/atomic.h" # include "generic/atomic.h"
+#elif defined(__s390x__) +#elif defined(__s390x__)
+# include "generic/atomic.h" +# include "generic/atomic.h"
@ -146,23 +140,23 @@ index 52be711c1d0a..8f1d62a28dc9 100644
# error "Unsupported architecture" # error "Unsupported architecture"
#endif #endif
diff --git src/ucs/arch/bitops.h src/ucs/arch/bitops.h diff --git src/ucs/arch/bitops.h src/ucs/arch/bitops.h
index e89a37d0b673..dd2b9d5b6bcb 100644 index 3e0e530f1336..f887e03ebac0 100644
--- src/ucs/arch/bitops.h --- src/ucs/arch/bitops.h
+++ src/ucs/arch/bitops.h +++ src/ucs/arch/bitops.h
@@ -20,6 +20,8 @@ BEGIN_C_DECLS @@ -23,6 +23,8 @@ BEGIN_C_DECLS
# include "ppc64/bitops.h"
#elif defined(__aarch64__)
# include "aarch64/bitops.h" # include "aarch64/bitops.h"
#elif defined(__riscv)
# include "rv64/bitops.h"
+#elif defined(__s390x__) +#elif defined(__s390x__)
+# include "s390x/bitops.h" +# include "s390x/bitops.h"
#else #else
# error "Unsupported architecture" # error "Unsupported architecture"
#endif #endif
diff --git src/ucs/arch/cpu.c src/ucs/arch/cpu.c diff --git src/ucs/arch/cpu.c src/ucs/arch/cpu.c
index ece8f7fb82dd..b35b10ad090a 100644 index 307fb61bfc4a..4356fff36f8b 100644
--- src/ucs/arch/cpu.c --- src/ucs/arch/cpu.c
+++ src/ucs/arch/cpu.c +++ src/ucs/arch/cpu.c
@@ -63,6 +63,10 @@ const ucs_cpu_builtin_memcpy_t ucs_cpu_builtin_memcpy[UCS_CPU_VENDOR_LAST] = { @@ -64,6 +64,10 @@ const ucs_cpu_builtin_memcpy_t ucs_cpu_builtin_memcpy[UCS_CPU_VENDOR_LAST] = {
.min = UCS_MEMUNITS_INF, .min = UCS_MEMUNITS_INF,
.max = UCS_MEMUNITS_INF .max = UCS_MEMUNITS_INF
}, },
@ -173,43 +167,67 @@ index ece8f7fb82dd..b35b10ad090a 100644
[UCS_CPU_VENDOR_FUJITSU_ARM] = { [UCS_CPU_VENDOR_FUJITSU_ARM] = {
.min = UCS_MEMUNITS_INF, .min = UCS_MEMUNITS_INF,
.max = UCS_MEMUNITS_INF .max = UCS_MEMUNITS_INF
@@ -78,6 +82,7 @@ const size_t ucs_cpu_est_bcopy_bw[UCS_CPU_VENDOR_LAST] = { @@ -89,6 +93,7 @@ const size_t ucs_cpu_est_bcopy_bw[UCS_CPU_VENDOR_LAST] = {
[UCS_CPU_VENDOR_INTEL] = UCS_CPU_EST_BCOPY_BW_DEFAULT, [UCS_CPU_VENDOR_GENERIC_ARM] = UCS_CPU_EST_BCOPY_BW_DEFAULT,
[UCS_CPU_VENDOR_AMD] = UCS_CPU_EST_BCOPY_BW_AMD, [UCS_CPU_VENDOR_GENERIC_PPC] = UCS_CPU_EST_BCOPY_BW_DEFAULT,
[UCS_CPU_VENDOR_GENERIC_ARM] = UCS_CPU_EST_BCOPY_BW_DEFAULT, [UCS_CPU_VENDOR_GENERIC_RV64G] = UCS_CPU_EST_BCOPY_BW_DEFAULT,
+ [UCS_CPU_VENDOR_GENERIC_IBM] = UCS_CPU_EST_BCOPY_BW_DEFAULT, + [UCS_CPU_VENDOR_GENERIC_IBM] = UCS_CPU_EST_BCOPY_BW_DEFAULT,
[UCS_CPU_VENDOR_GENERIC_PPC] = UCS_CPU_EST_BCOPY_BW_DEFAULT, [UCS_CPU_VENDOR_FUJITSU_ARM] = UCS_CPU_EST_BCOPY_BW_FUJITSU_ARM,
[UCS_CPU_VENDOR_FUJITSU_ARM] = UCS_CPU_EST_BCOPY_BW_FUJITSU_ARM, [UCS_CPU_VENDOR_ZHAOXIN] = UCS_CPU_EST_BCOPY_BW_DEFAULT,
[UCS_CPU_VENDOR_ZHAOXIN] = UCS_CPU_EST_BCOPY_BW_DEFAULT [UCS_CPU_VENDOR_NVIDIA] = UCS_CPU_EST_BCOPY_BW_DEFAULT
@@ -183,6 +188,7 @@ const char *ucs_cpu_vendor_name()
[UCS_CPU_VENDOR_GENERIC_ARM] = "Generic ARM",
[UCS_CPU_VENDOR_GENERIC_PPC] = "Generic PPC",
[UCS_CPU_VENDOR_GENERIC_RV64G] = "Generic RV64G",
+ [UCS_CPU_VENDOR_GENERIC_IBM] = "Generic IBM",
[UCS_CPU_VENDOR_FUJITSU_ARM] = "Fujitsu ARM",
[UCS_CPU_VENDOR_ZHAOXIN] = "Zhaoxin",
[UCS_CPU_VENDOR_NVIDIA] = "Nvidia"
@@ -212,6 +218,7 @@ const char *ucs_cpu_model_name()
[UCS_CPU_MODEL_ZHAOXIN_WUDAOKOU] = "Wudaokou",
[UCS_CPU_MODEL_ZHAOXIN_LUJIAZUI] = "Lujiazui",
[UCS_CPU_MODEL_RV64G] = "RV64G",
+ [UCS_CPU_MODEL_S390X] = "S390x",
[UCS_CPU_MODEL_NVIDIA_GRACE] = "Grace"
};
diff --git src/ucs/arch/cpu.h src/ucs/arch/cpu.h diff --git src/ucs/arch/cpu.h src/ucs/arch/cpu.h
index eb557d385670..cfd297e24558 100644 index ca25e714d141..e97405c30d52 100644
--- src/ucs/arch/cpu.h --- src/ucs/arch/cpu.h
+++ src/ucs/arch/cpu.h +++ src/ucs/arch/cpu.h
@@ -64,6 +64,7 @@ typedef enum ucs_cpu_vendor { @@ -39,6 +39,7 @@ typedef enum ucs_cpu_model {
UCS_CPU_MODEL_ZHAOXIN_WUDAOKOU,
UCS_CPU_MODEL_ZHAOXIN_LUJIAZUI,
UCS_CPU_MODEL_RV64G,
+ UCS_CPU_MODEL_S390X,
UCS_CPU_MODEL_NVIDIA_GRACE,
UCS_CPU_MODEL_LAST
} ucs_cpu_model_t;
@@ -68,6 +69,7 @@ typedef enum ucs_cpu_vendor {
UCS_CPU_VENDOR_AMD, UCS_CPU_VENDOR_AMD,
UCS_CPU_VENDOR_GENERIC_ARM, UCS_CPU_VENDOR_GENERIC_ARM,
UCS_CPU_VENDOR_GENERIC_PPC, UCS_CPU_VENDOR_GENERIC_PPC,
+ UCS_CPU_VENDOR_GENERIC_IBM, + UCS_CPU_VENDOR_GENERIC_IBM,
UCS_CPU_VENDOR_FUJITSU_ARM, UCS_CPU_VENDOR_FUJITSU_ARM,
UCS_CPU_VENDOR_ZHAOXIN, UCS_CPU_VENDOR_ZHAOXIN,
UCS_CPU_VENDOR_LAST UCS_CPU_VENDOR_GENERIC_RV64G,
@@ -99,6 +100,8 @@ typedef struct ucs_cpu_builtin_memcpy { @@ -107,6 +109,8 @@ typedef struct ucs_cpu_builtin_memcpy {
# include "ppc64/cpu.h"
#elif defined(__aarch64__)
# include "aarch64/cpu.h" # include "aarch64/cpu.h"
#elif defined(__riscv)
# include "rv64/cpu.h"
+#elif defined(__s390x__) +#elif defined(__s390x__)
+# include "s390x/cpu.h" +# include "s390x/cpu.h"
#else #else
# error "Unsupported architecture" # error "Unsupported architecture"
#endif #endif
diff --git src/ucs/arch/global_opts.h src/ucs/arch/global_opts.h diff --git src/ucs/arch/global_opts.h src/ucs/arch/global_opts.h
index 75d086177a7f..96c670cb60d3 100644 index 550d22b8b751..d8e4a7cca694 100644
--- src/ucs/arch/global_opts.h --- src/ucs/arch/global_opts.h
+++ src/ucs/arch/global_opts.h +++ src/ucs/arch/global_opts.h
@@ -15,6 +15,8 @@ @@ -18,6 +18,8 @@
# include "ppc64/global_opts.h"
#elif defined(__aarch64__)
# include "aarch64/global_opts.h" # include "aarch64/global_opts.h"
#elif defined(__riscv)
# include "rv64/global_opts.h"
+#elif defined(__s390x__) +#elif defined(__s390x__)
+# include "s390x/global_opts.h" +# include "s390x/global_opts.h"
#else #else
@ -260,7 +278,7 @@ index 000000000000..ce48ff1ff451
+#endif +#endif
diff --git src/ucs/arch/s390x/cpu.h src/ucs/arch/s390x/cpu.h diff --git src/ucs/arch/s390x/cpu.h src/ucs/arch/s390x/cpu.h
new file mode 100644 new file mode 100644
index 000000000000..4f0a87006118 index 000000000000..0aee278010d2
--- /dev/null --- /dev/null
+++ src/ucs/arch/s390x/cpu.h +++ src/ucs/arch/s390x/cpu.h
@@ -0,0 +1,84 @@ @@ -0,0 +1,84 @@
@ -290,7 +308,7 @@ index 000000000000..4f0a87006118
+#define ucs_memory_bus_fence() asm volatile (""::: "memory") +#define ucs_memory_bus_fence() asm volatile (""::: "memory")
+#define ucs_memory_bus_store_fence() ucs_memory_bus_fence() +#define ucs_memory_bus_store_fence() ucs_memory_bus_fence()
+#define ucs_memory_bus_load_fence() ucs_memory_bus_fence() +#define ucs_memory_bus_load_fence() ucs_memory_bus_fence()
+#define ucs_memory_bus_wc_flush() ucs_memory_bus_fence() +#define ucs_memory_bus_cacheline_wc_flush() ucs_memory_bus_fence()
+#define ucs_memory_cpu_fence() ucs_memory_bus_fence() +#define ucs_memory_cpu_fence() ucs_memory_bus_fence()
+#define ucs_memory_cpu_store_fence() ucs_memory_bus_fence() +#define ucs_memory_cpu_store_fence() ucs_memory_bus_fence()
+#define ucs_memory_cpu_load_fence() ucs_memory_bus_fence() +#define ucs_memory_cpu_load_fence() ucs_memory_bus_fence()
@ -308,7 +326,7 @@ index 000000000000..4f0a87006118
+ +
+static inline ucs_cpu_model_t ucs_arch_get_cpu_model() +static inline ucs_cpu_model_t ucs_arch_get_cpu_model()
+{ +{
+ return UCS_CPU_MODEL_UNKNOWN; + return UCS_CPU_MODEL_S390X;
+} +}
+ +
+static inline ucs_cpu_vendor_t ucs_arch_get_cpu_vendor() +static inline ucs_cpu_vendor_t ucs_arch_get_cpu_vendor()
@ -410,7 +428,7 @@ index 000000000000..225e4e5e896a
+#endif +#endif
+ +
diff --git src/ucs/sys/sys.c src/ucs/sys/sys.c diff --git src/ucs/sys/sys.c src/ucs/sys/sys.c
index 58e67835c4d0..308f03606d5b 100644 index 42ff75f64af5..b22418e3f4b0 100644
--- src/ucs/sys/sys.c --- src/ucs/sys/sys.c
+++ src/ucs/sys/sys.c +++ src/ucs/sys/sys.c
@@ -1258,8 +1258,19 @@ void *ucs_sys_realloc(void *old_ptr, size_t old_length, size_t new_length) @@ -1258,8 +1258,19 @@ void *ucs_sys_realloc(void *old_ptr, size_t old_length, size_t new_length)

24
openucx.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Sat Sep 7 14:22:20 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
- Refresh openucx-s390x-support.patch to fix compilation on s390x
-------------------------------------------------------------------
Sat Jun 29 16:55:27 UTC 2024 - Andreas Schwab <schwab@suse.de>
- Enable build on riscv64
-------------------------------------------------------------------
Wed Jun 26 15:43:05 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
- Update to 1.17.0
- See NEWS for the complete CHANGELOG
- Refresh openucx-s390x-support.patch against the latest sources
- Add upstream fix UCS-TIME-Add-math.h-to-provide-INFINITY.patch
to fix compilation on ppc64
-------------------------------------------------------------------
Mon Feb 26 12:49:43 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 2 08:00:54 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com> Mon Oct 2 08:00:54 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>

14
openucx.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package openucx # spec file for package openucx
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%define version_suf %{nil} %define version_suf %{nil}
Name: openucx Name: openucx
Version: 1.15.0 Version: 1.17.0
Release: 0 Release: 0
Summary: Communication layer for Message Passing (MPI) Summary: Communication layer for Message Passing (MPI)
License: BSD-3-Clause License: BSD-3-Clause
@ -32,6 +32,7 @@ URL: http://openucx.org/
Source: https://github.com/openucx/ucx/releases/download/v%version%{?version_suf}/ucx-%version.tar.gz Source: https://github.com/openucx/ucx/releases/download/v%version%{?version_suf}/ucx-%version.tar.gz
Patch1: openucx-s390x-support.patch Patch1: openucx-s390x-support.patch
Patch2: ucm-fix-UCX_MEM_MALLOC_RELOC.patch Patch2: ucm-fix-UCX_MEM_MALLOC_RELOC.patch
Patch3: UCS-TIME-Add-math.h-to-provide-INFINITY.patch
BuildRequires: autoconf >= 2.63 BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1.10 BuildRequires: automake >= 1.10
BuildRequires: binutils-devel BuildRequires: binutils-devel
@ -48,7 +49,7 @@ BuildRequires: libtool
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: aarch64 %power64 x86_64 s390x ExclusiveArch: aarch64 %power64 x86_64 s390x riscv64
%description %description
UCX stands for Unified Communication X. UCX provides a communication UCX stands for Unified Communication X. UCX provides a communication
@ -136,10 +137,7 @@ hardware.
%prep %prep
%setup -qn ucx-%version %setup -qn ucx-%version
%ifarch s390x %autopatch -p0
%patch1
%endif
%patch2
%build %build
autoreconf -fi autoreconf -fi
@ -192,6 +190,8 @@ mv %buildroot/%_bindir/io_demo %buildroot/%_libexecdir/%{name}/
%_libdir/pkgconfig/ucx.pc %_libdir/pkgconfig/ucx.pc
%dir %_libdir/cmake/ %dir %_libdir/cmake/
%_libdir/cmake/ucx/ %_libdir/cmake/ucx/
%dir %{_sysconfdir}/ucx/
%config %{_sysconfdir}/ucx/ucx.conf
%license LICENSE %license LICENSE
%doc NEWS %doc NEWS

BIN
ucx-1.15.0.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

BIN
ucx-1.17.0.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.