Accepting request 851870 from home:eeich:branches:science:HPC

- Preliminary %check stage. A number of checks fail currently.
  These need to be looked at.

OBS-URL: https://build.opensuse.org/request/show/851870
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mpiP?expand=0&rev=35
This commit is contained in:
Egbert Eich 2020-11-30 16:43:27 +00:00 committed by Git OBS Bridge
parent e21a8d51f8
commit 4b2404ff02
3 changed files with 48 additions and 7 deletions

View File

@ -0,0 +1,23 @@
From: Egbert Eich <eich@suse.com>
Date: Sun Nov 29 20:38:47 2020 +0100
Subject: Add return value to non-void function
Patch-mainline: Not yet
Git-commit: 98cc1a7453a2f55dfe2477d62e8ce3f049e0ed1f
References:
Signed-off-by: Egbert Eich <eich@suse.com>
---
testing/mt/mt_common.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/testing/mt/mt_common.c b/testing/mt/mt_common.c
index ff92d9e..bda59c3 100644
--- a/testing/mt/mt_common.c
+++ b/testing/mt/mt_common.c
@@ -310,6 +310,7 @@ void* _mt_common_proxy_thread(void *id_ptr)
{
test_thr_data_t *tdata = (test_thr_data_t*)id_ptr;
tdata->fptr(tdata->tid);
+ return NULL;
}
void mt_common_exec(mt_common_thrptr_t *workers)

View File

@ -65,6 +65,8 @@ Sat Nov 28 11:49:04 UTC 2020 - Egbert Eich <eich@suse.com>
* Adding fortran symbol failure output for debugging configure issues.
- Add build support for gcc10 to HPC build (bsc#1174439).
- Add openmpi4 flavors.
- Preliminary %check stage. A number of checks fail currently.
These need to be looked at.
-------------------------------------------------------------------
Wed May 13 19:38:31 UTC 2020 - Egbert Eich <eich@suse.com>

View File

@ -264,14 +264,16 @@ Release: 0
URL: https://github.com/LLNL/mpiP
Source0: https://github.com/LLNL/mpiP/releases/download/%{version}/mpip-%{version}.tgz#/%{pname}-%{version}.tgz
Patch1: mpip.unwinder.patch
Patch2: Add-return-value-to-non-void-function.patch
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
BuildRequires: %{mpi_family}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
BuildRequires: binutils-devel
BuildRequires: dejagnu
BuildRequires: libunwind-devel
BuildRequires: lua-lmod
BuildRequires: python
BuildRequires: slurm-node
#BuildRequires: slurm-node
BuildRequires: suse-hpc
%{?hpc_requires}
@ -305,6 +307,8 @@ Group: Development/Libraries/C and C++
%description devel-static
mpiP is a profiling library for MPI applications.
This package contains the static libraries.
%package doc
Summary: Documentation for the mpiP profiling library
Group: Documentation/Other
@ -318,16 +322,18 @@ This contains the documentation.
%prep
%setup -q -n %{pname}-%{version}
%patch1 -p1
%autopatch -p1
sed -i -e "/-shared -o \$@/s#\(\${LDFLAGS}\)#\1 -Wl,-soname,\$@#" Makefile.in
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
%hpc_setup
CC=mpicc
CXX=mpicxx
FC=mpif90
CFLAGS="-D__DATE__=\\\"NODATE\\\" -D__TIME__=\\\"NOTIME\\\""
export LDFLAGS=-Wl,-soname,libmpiP.so
export CC=mpicc
export CXX=mpicxx
export FC=mpifort
export F77=$FC
export CFLAGS="-D__DATE__=\\\"NODATE\\\" -D__TIME__=\\\"NOTIME\\\""
export FFLAGS="-std=legacy"
%hpc_configure \
--enable-demangling \
%ifarch aarch64
@ -383,6 +389,16 @@ setenv %{hpc_upcase %pname}_LIB %{hpc_libdir}
EOF
%check
%hpc_setup
export CC=mpicc
export CXX=mpicxx
export FC=mpifort
export F77=$FC
export FFLAGS="-std=legacy"
LD_LIBRARY_PATH=$(pwd)${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
make FFLAGS+=${FFLAGS} check || exit 0
%postun
%hpc_module_delete_if_default