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

Accepting request 1008219 from science:HPC

Browse Source 
- Update openucx-s390x-support.patch to add missing ucs_ffs32 on s390x
- Drop baselibs.conf as openucx only works on 64b systems

OBS-URL: https://build.opensuse.org/request/show/1008219
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openucx?expand=0&rev=23
This commit is contained in:
Fabian Vogt 2022-10-10 16:44:15 +00:00 committed by Git OBS Bridge
commit ec8c3382db
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
baselibs.conf
View File

@ -1,4 +0,0 @@
libucm0
libucp0
libucs0
libuct0

11
openucx-s390x-support.patch
View File

@ -1,4 +1,4 @@
commit 9d5c0d189d4cd5413089bd65fed1e87293e15763 commit d85339a86c0902ca36f4306f8d971cf46ae87eaf
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
Date: Tue Sep 27 17:47:15 2022 +0200 Date: Tue Sep 27 17:47:15 2022 +0200
@ -217,10 +217,10 @@ index 8786f130290a..0d251fb91868 100644
#endif #endif
diff --git src/ucs/arch/s390x/bitops.h src/ucs/arch/s390x/bitops.h diff --git src/ucs/arch/s390x/bitops.h src/ucs/arch/s390x/bitops.h
new file mode 100644 new file mode 100644
index 000000000000..39ad125107e9 index 000000000000..ce48ff1ff451
--- /dev/null --- /dev/null
+++ src/ucs/arch/s390x/bitops.h +++ src/ucs/arch/s390x/bitops.h
@@ -0,0 +1,32 @@ @@ -0,0 +1,37 @@
+/** +/**
+* Copyright (C) Mellanox Technologies Ltd. 2001-2015. ALL RIGHTS RESERVED. +* Copyright (C) Mellanox Technologies Ltd. 2001-2015. ALL RIGHTS RESERVED.
+* +*
@ -247,6 +247,11 @@ index 000000000000..39ad125107e9
+ return 63 - __builtin_clz(n); + 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) +static inline unsigned ucs_ffs64(uint64_t n)
+{ +{
+ return __ucs_ilog2_u64(n & -n); + return __ucs_ilog2_u64(n & -n);

6
openucx.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 4 16:39:30 UTC 2022 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
- 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 <nmoreychaisemartin@suse.com> Tue Sep 27 15:55:19 UTC 2022 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>

1
openucx.spec
View File

@ -27,7 +27,6 @@ URL: http://openucx.org/
#Git-Clone: git://github.com/openucx/ucx #Git-Clone: git://github.com/openucx/ucx
#Git-Web: https://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 Source: https://github.com/openucx/ucx/releases/download/v%version/ucx-%version.tar.gz
Source1: baselibs.conf
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-DEBUG-replace-PTR-with-void.patch Patch3: UCS-DEBUG-replace-PTR-with-void.patch