diff --git a/UCT-UD-fixed-compilation-by-gcc8.patch b/UCT-UD-fixed-compilation-by-gcc8.patch deleted file mode 100644 index 6f8ee20..0000000 --- a/UCT-UD-fixed-compilation-by-gcc8.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 851a26c3e553f88386658129ad2d4dca060e164c -Author: Sergey Oblomov -Date: Mon Mar 19 07:25:32 2018 +0200 - - UCT/UD: fixed compilation by gcc8 - - - removed 'packed' attribute from uct_ud_send_skb_inl_t structure - -diff --git src/uct/ib/ud/base/ud_def.h src/uct/ib/ud/base/ud_def.h -index 0ccc0bb8495a..44d50ec643f8 100644 ---- src/uct/ib/ud/base/ud_def.h -+++ src/uct/ib/ud/base/ud_def.h -@@ -172,8 +172,8 @@ typedef struct uct_ud_zcopy_desc { - - typedef struct uct_ud_send_skb_inl { - uct_ud_send_skb_t super; -- uct_ud_neth_t neth; --} UCS_S_PACKED uct_ud_send_skb_inl_t; -+ uct_ud_neth_t neth; /* placeholder for super.neth, should not be used directly */ -+} uct_ud_send_skb_inl_t; - - - typedef struct uct_ud_recv_skb { diff --git a/openucx-s390x-support.patch b/openucx-s390x-support.patch index 646324c..0b40d2c 100644 --- a/openucx-s390x-support.patch +++ b/openucx-s390x-support.patch @@ -1,20 +1,16 @@ -From: Nicolas Morey-Chaisemartin -Date: 2017-06-29 08:09:49 +0000 +commit c4261cb194ce2f87c564c22f5cb795f33fce6f5f +Author: Nicolas Morey-Chaisemartin +Date: Thu Aug 9 07:41:24 2018 +0200 ---- - src/ucs/Makefile.am | 2 + - src/ucs/arch/atomic.h | 2 + - src/ucs/arch/bitops.h | 2 + - src/ucs/arch/cpu.h | 2 + - src/ucs/arch/s390x/bitops.h | 32 +++++++++++++++++++++++++++ - src/ucs/arch/s390x/cpu.h | 51 ++++++++++++++++++++++++++++++++++++++++++++ - 6 files changed, 91 insertions(+) + openucx s390x support + + Signed-off-by: Nicolas Morey-Chaisemartin -Index: ucx-1.2.1/src/ucs/Makefile.am -=================================================================== ---- ucx-1.2.1.orig/src/ucs/Makefile.am -+++ ucx-1.2.1/src/ucs/Makefile.am -@@ -26,6 +26,8 @@ nobase_dist_libucs_la_HEADERS = \ +diff --git src/ucs/Makefile.am src/ucs/Makefile.am +index 74edce424728..43a50e893f77 100644 +--- src/ucs/Makefile.am ++++ src/ucs/Makefile.am +@@ -53,6 +53,8 @@ noinst_HEADERS = \ arch/generic/cpu.h \ arch/ppc64/bitops.h \ arch/ppc64/cpu.h \ @@ -23,10 +19,10 @@ Index: ucx-1.2.1/src/ucs/Makefile.am arch/x86_64/atomic.h \ arch/x86_64/bitops.h \ arch/x86_64/cpu.h \ -Index: ucx-1.2.1/src/ucs/arch/atomic.h -=================================================================== ---- ucx-1.2.1.orig/src/ucs/arch/atomic.h -+++ ucx-1.2.1/src/ucs/arch/atomic.h +diff --git src/ucs/arch/atomic.h src/ucs/arch/atomic.h +index 7649971b407b..7bb2bc36c483 100644 +--- src/ucs/arch/atomic.h ++++ src/ucs/arch/atomic.h @@ -15,6 +15,8 @@ # include "generic/atomic.h" #elif defined(__aarch64__) @@ -36,10 +32,10 @@ Index: ucx-1.2.1/src/ucs/arch/atomic.h #else # error "Unsupported architecture" #endif -Index: ucx-1.2.1/src/ucs/arch/bitops.h -=================================================================== ---- ucx-1.2.1.orig/src/ucs/arch/bitops.h -+++ ucx-1.2.1/src/ucs/arch/bitops.h +diff --git src/ucs/arch/bitops.h src/ucs/arch/bitops.h +index f4dd3ab45964..de53bde0d33f 100644 +--- src/ucs/arch/bitops.h ++++ src/ucs/arch/bitops.h @@ -14,6 +14,8 @@ # include "ppc64/bitops.h" #elif defined(__aarch64__) @@ -49,11 +45,11 @@ Index: ucx-1.2.1/src/ucs/arch/bitops.h #else # error "Unsupported architecture" #endif -Index: ucx-1.2.1/src/ucs/arch/cpu.h -=================================================================== ---- ucx-1.2.1.orig/src/ucs/arch/cpu.h -+++ ucx-1.2.1/src/ucs/arch/cpu.h -@@ -52,6 +52,8 @@ typedef enum ucs_cpu_flag { +diff --git src/ucs/arch/cpu.h src/ucs/arch/cpu.h +index 1c362bc92fba..14172218e24c 100644 +--- src/ucs/arch/cpu.h ++++ src/ucs/arch/cpu.h +@@ -56,6 +56,8 @@ typedef enum ucs_cpu_flag { # include "ppc64/cpu.h" #elif defined(__aarch64__) # include "aarch64/cpu.h" @@ -62,10 +58,11 @@ Index: ucx-1.2.1/src/ucs/arch/cpu.h #else # error "Unsupported architecture" #endif -Index: ucx-1.2.1/src/ucs/arch/s390x/bitops.h -=================================================================== +diff --git src/ucs/arch/s390x/bitops.h src/ucs/arch/s390x/bitops.h +new file mode 100644 +index 000000000000..39ad125107e9 --- /dev/null -+++ ucx-1.2.1/src/ucs/arch/s390x/bitops.h ++++ src/ucs/arch/s390x/bitops.h @@ -0,0 +1,32 @@ +/** +* Copyright (C) Mellanox Technologies Ltd. 2001-2015. ALL RIGHTS RESERVED. @@ -99,10 +96,11 @@ Index: ucx-1.2.1/src/ucs/arch/s390x/bitops.h +} + +#endif -Index: ucx-1.2.1/src/ucs/arch/s390x/cpu.h -=================================================================== +diff --git src/ucs/arch/s390x/cpu.h src/ucs/arch/s390x/cpu.h +new file mode 100644 +index 000000000000..f5131ea30a8f --- /dev/null -+++ ucx-1.2.1/src/ucs/arch/s390x/cpu.h ++++ src/ucs/arch/s390x/cpu.h @@ -0,0 +1,51 @@ +/** +* Copyright (C) Mellanox Technologies Ltd. 2001-2013. ALL RIGHTS RESERVED. diff --git a/openucx.changes b/openucx.changes index ff9c117..65dc888 100644 --- a/openucx.changes +++ b/openucx.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Thu Aug 9 05:57:24 UTC 2018 - nmoreychaisemartin@suse.com + +- Update to v1.3.0 (bsc#1104159) + - Added stream-based communication API to UCP + - Added support for GPU platforms: Nvidia CUDA and AMD ROCM software stacks + - Added API for client/server based connection establishment + - Added support for TCP transport + - Support for InfiniBand tag-matching offload for DC and accelerated transports + - Multi-rail support for eager and rendezvous protocols + - Added support for tag-matching communications with CUDA buffers + - Added ucp_rkey_ptr() to obtain pointer for shared memory region + - Avoid progress overhead on unused transports + - Improved scalability of software tag-matching by using a hash table + - Added transparent huge-pages allocator + - Added non-blocking flush and disconnect for UCP + - Support fixed-address memory allocation via ucp_mem_map() + - Added ucp_tag_send_nbr() API to avoid send request allocation + - Support global addressing in all IB transports + - Add support for external epoll fd and edge-triggered events + - Added registration cache for knem + - Initial support for Java bindings + - Multiple bugfixes (full list on github) +- Drop UCT-UD-fixed-compilation-by-gcc8.patch as it was fixed upstream +- Refresh openucx-s390x-support.patch against latest sources + ------------------------------------------------------------------- Wed Jun 13 12:45:34 UTC 2018 - nmoreychaisemartin@suse.com diff --git a/openucx.spec b/openucx.spec index 24e3c11..7167ad2 100644 --- a/openucx.spec +++ b/openucx.spec @@ -20,7 +20,7 @@ Name: openucx Summary: Unifieid Communication X License: BSD-3-Clause Group: Development/Libraries/C and C++ -Version: 1.2.2 +Version: 1.3.0 Release: 0 Url: http://openucx.org/ @@ -28,7 +28,6 @@ Url: http://openucx.org/ #Git-Web: https://github.com/openucx/ucx Source: https://github.com/openucx/ucx/releases/download/v%version/ucx-%version.tar.gz Patch1: openucx-s390x-support.patch -Patch2: UCT-UD-fixed-compilation-by-gcc8.patch BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1.10 BuildRequires: binutils-devel @@ -133,8 +132,7 @@ underlying hardware. %prep %setup -qn ucx-%version -%patch -P 1 -p1 -%patch2 +%patch1 %build autoreconf -fi @@ -151,7 +149,7 @@ export UCX_CFLAGS="$UCX_CFLAGS -mno-sse -mno-sse2" --disable-numa \ %endif %endif - --docdir="%_docdir/%name" + --docdir="%_docdir/%name" make %{?_smp_mflags} V=1 @@ -167,11 +165,13 @@ make %{?_smp_mflags} V=1 %install %make_install rm -fv "%buildroot/%_libdir"/*.la +# Rename example dir for consistency with the package name +mv %buildroot/%_datadir/ucx %buildroot/%_datadir/openucx %files tools %defattr(-,root,root) %_bindir/ucx_* -%_docdir/%name/ +%_datadir/%{name}/ %_libdir/pkgconfig/ucx.pc %doc LICENSE diff --git a/ucx-1.2.2.tar.gz b/ucx-1.2.2.tar.gz deleted file mode 100644 index 843d054..0000000 --- a/ucx-1.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:914d10fee8f970d4fb286079dd656cf8a260ec7d724d5f751b3109ed32a6da63 -size 1513611 diff --git a/ucx-1.3.0.tar.gz b/ucx-1.3.0.tar.gz new file mode 100644 index 0000000..28af063 --- /dev/null +++ b/ucx-1.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71e69e6d78a4950cc5a1edcbe59bf7a8f8e38d59c9f823109853927c4d442952 +size 1707317