From d485735431ac64a2af02a7893cef8fee2e6d0f5aea65290403a729e8f7b0dc32 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Wed, 5 Oct 2022 07:13:29 +0000 Subject: [PATCH 1/2] Accepting request 1008115 from home:NMoreyChaisemartin:branches:science:HPC - Update openucx-s390x-support.patch to add missing ucs_ffs32 on s390x OBS-URL: https://build.opensuse.org/request/show/1008115 OBS-URL: https://build.opensuse.org/package/show/science:HPC/openucx?expand=0&rev=50 --- openucx-s390x-support.patch | 11 ++++++++--- openucx.changes | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/openucx-s390x-support.patch b/openucx-s390x-support.patch index 539f7e7..fa22dc6 100644 --- a/openucx-s390x-support.patch +++ b/openucx-s390x-support.patch @@ -1,4 +1,4 @@ -commit 9d5c0d189d4cd5413089bd65fed1e87293e15763 +commit d85339a86c0902ca36f4306f8d971cf46ae87eaf Author: Nicolas Morey-Chaisemartin Date: Tue Sep 27 17:47:15 2022 +0200 @@ -217,10 +217,10 @@ index 8786f130290a..0d251fb91868 100644 #endif diff --git src/ucs/arch/s390x/bitops.h src/ucs/arch/s390x/bitops.h new file mode 100644 -index 000000000000..39ad125107e9 +index 000000000000..ce48ff1ff451 --- /dev/null +++ src/ucs/arch/s390x/bitops.h -@@ -0,0 +1,32 @@ +@@ -0,0 +1,37 @@ +/** +* Copyright (C) Mellanox Technologies Ltd. 2001-2015. ALL RIGHTS RESERVED. +* @@ -247,6 +247,11 @@ index 000000000000..39ad125107e9 + return 63 - __builtin_clz(n); +} + ++static UCS_F_ALWAYS_INLINE unsigned ucs_ffs32(uint32_t n) ++{ ++ return __ucs_ilog2_u32(n & -n); ++} ++ +static inline unsigned ucs_ffs64(uint64_t n) +{ + return __ucs_ilog2_u64(n & -n); diff --git a/openucx.changes b/openucx.changes index e1e6145..516584c 100644 --- a/openucx.changes +++ b/openucx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 4 16:39:30 UTC 2022 - Nicolas Morey-Chaisemartin + +- Update openucx-s390x-support.patch to add missing ucs_ffs32 on s390x + ------------------------------------------------------------------- Tue Sep 27 15:55:19 UTC 2022 - Nicolas Morey-Chaisemartin From 8322be19fea1fa48360c4a51cf0d806a6ac09fa092461a68bd2d0f3751323602 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Wed, 5 Oct 2022 07:28:51 +0000 Subject: [PATCH 2/2] Accepting request 1008118 from home:NMoreyChaisemartin:branches:science:HPC - Drop baselibs.conf as openucx only works on 64b systems OBS-URL: https://build.opensuse.org/request/show/1008118 OBS-URL: https://build.opensuse.org/package/show/science:HPC/openucx?expand=0&rev=51 --- baselibs.conf | 4 ---- openucx.changes | 1 + openucx.spec | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index db87919..0000000 --- a/baselibs.conf +++ /dev/null @@ -1,4 +0,0 @@ -libucm0 -libucp0 -libucs0 -libuct0 diff --git a/openucx.changes b/openucx.changes index 516584c..cfd14d0 100644 --- a/openucx.changes +++ b/openucx.changes @@ -2,6 +2,7 @@ Tue Oct 4 16:39:30 UTC 2022 - Nicolas Morey-Chaisemartin - Update openucx-s390x-support.patch to add missing ucs_ffs32 on s390x +- Drop baselibs.conf as openucx only works on 64b systems ------------------------------------------------------------------- Tue Sep 27 15:55:19 UTC 2022 - Nicolas Morey-Chaisemartin diff --git a/openucx.spec b/openucx.spec index af804a4..17e80ba 100644 --- a/openucx.spec +++ b/openucx.spec @@ -27,7 +27,6 @@ URL: http://openucx.org/ #Git-Clone: git://github.com/openucx/ucx #Git-Web: https://github.com/openucx/ucx Source: https://github.com/openucx/ucx/releases/download/v%version/ucx-%version.tar.gz -Source1: baselibs.conf Patch1: openucx-s390x-support.patch Patch2: ucm-fix-UCX_MEM_MALLOC_RELOC.patch Patch3: UCS-DEBUG-replace-PTR-with-void.patch