Accepting request 812864 from science:HPC
OBS-URL: https://build.opensuse.org/request/show/812864 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openmpi4?expand=0&rev=2
This commit is contained in:
commit
749ec1d035
2
_service
2
_service
@ -8,7 +8,7 @@
|
||||
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
<param name="versionrewrite-replacement">\1</param>
|
||||
<param name="revision">cb5f4e737a9d9cf47511b940179d620dd11249b3</param>
|
||||
<param name="revision">8b4a8cd34cb33f3eb89c22adc46243e9df19d7b0</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">openmpi*.tar</param>
|
||||
|
@ -1,24 +0,0 @@
|
||||
commit aa60ad84658b3433bcecb968f8dea2031fec27c3
|
||||
Author: Maxwell Coil <mcoil@nd.edu>
|
||||
Date: Sun Dec 8 13:56:00 2019 -0500
|
||||
|
||||
memory/patcher: fix compiler warning
|
||||
|
||||
syscall() returns a long, but we are invoking shmat(), which returns
|
||||
a void*.
|
||||
|
||||
Signed-off-by: Maxwell Coil <mcoil@nd.edu>
|
||||
|
||||
diff --git opal/mca/memory/patcher/memory_patcher_component.c opal/mca/memory/patcher/memory_patcher_component.c
|
||||
index 687d430fa362..272ec721225b 100644
|
||||
--- opal/mca/memory/patcher/memory_patcher_component.c
|
||||
+++ opal/mca/memory/patcher/memory_patcher_component.c
|
||||
@@ -440,7 +440,7 @@ static void *_intercept_shmat(int shmid, const void *shmaddr, int shmflg)
|
||||
|
||||
if (!original_shmat) {
|
||||
#if defined(SYS_shmat)
|
||||
- result = memory_patcher_syscall(SYS_shmat, shmid, shmaddr, shmflg);
|
||||
+ result = (void*) memory_patcher_syscall(SYS_shmat, shmid, shmaddr, shmflg);
|
||||
#else // IPCOP_shmat
|
||||
unsigned long ret;
|
||||
ret = memory_patcher_syscall(SYS_ipc, IPCOP_shmat,
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c2798b5679a61c052c876c00f700b7c8c556d32dd7585350c0dd1434bfcb73c5
|
||||
size 6267972
|
3
openmpi-4.0.3.0.8b4a8cd34cb3.tar.bz2
Normal file
3
openmpi-4.0.3.0.8b4a8cd34cb3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fb2ebe6551fdcb4c00bc822af158d6a5d11d6cb1468e50c30c39349e3a48f7d2
|
||||
size 6291443
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 9 08:40:06 UTC 2020 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||
|
||||
- Update to version 4.0.3
|
||||
- See NEWS for the detailled changelog
|
||||
- Fixes compilation with UCX 1.8
|
||||
- Drop memory-patcher-fix-compiler-warning.patch which was merged upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 19 08:28:04 UTC 2020 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package openmpi4
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
# University Research and Technology
|
||||
# Corporation. All rights reserved.
|
||||
@ -42,8 +42,8 @@
|
||||
# % define build_static_devel 1
|
||||
|
||||
%define pname openmpi
|
||||
%define vers 4.0.2
|
||||
%define _vers 4_0_2
|
||||
%define vers 4.0.3
|
||||
%define _vers 4_0_3
|
||||
%define m_f_ver 4
|
||||
%bcond_with ringdisabled
|
||||
|
||||
@ -115,7 +115,7 @@ ExclusiveArch: do_not_build
|
||||
%global hpc_openmpi_pack_version %{hpc_openmpi_dep_version}
|
||||
%endif
|
||||
|
||||
%define git_ver .0.cb5f4e737a9d
|
||||
%define git_ver .0.8b4a8cd34cb3
|
||||
|
||||
#############################################################################
|
||||
#
|
||||
@ -129,14 +129,13 @@ Release: 0
|
||||
Summary: An implementation of MPI/SHMEM (Version %{m_f_ver})
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/Parallel
|
||||
Url: http://www.open-mpi.org/
|
||||
URL: http://www.open-mpi.org/
|
||||
Source0: openmpi-%{version}%{git_ver}.tar.bz2
|
||||
Source2: openmpi4-rpmlintrc
|
||||
Source3: macros.hpc-openmpi
|
||||
Source4: mpivars.sh
|
||||
Source5: mpivars.csh
|
||||
Patch0: reproducible.patch
|
||||
patch1: memory-patcher-fix-compiler-warning.patch
|
||||
Provides: mpi
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: autoconf
|
||||
@ -403,7 +402,6 @@ EOF
|
||||
%endif
|
||||
|
||||
%patch0 -p1
|
||||
%patch1
|
||||
|
||||
# Live patch the VERSION file
|
||||
sed -i -e 's/^greek=.*$/greek=%{git_ver}/' -e 's/^repo_rev=.*$/repo_rev=%{version}%{git_ver}/' \
|
||||
|
Loading…
Reference in New Issue
Block a user