rpm/mvapich2
SHA256
1
0
Fork 0
forked from pool/mvapich2
Code Pull Requests Activity

Accepting request 523093 from home:NMoreyChaisemartin:branches:science:HPC

Browse Source 
- Only requires verbs libraries for verbs build.
  libibverbs devel causes a SEGV when run in a chroot using the
  psm or psm2 conduits
- Add testuite packages for all build flavours

OBS-URL: https://build.opensuse.org/request/show/523093
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=20
This commit is contained in:
Nicolas Morey-Chaisemartin 2017-09-11 12:09:49 +00:00 committed by Git OBS Bridge
parent 76845889a8
commit 13bb212a7c
3 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_multibuild
View File

@ -1,5 +1,7 @@
<multibuild>
<package>testsuite</package>
<package>psm</package>
<package>psm-testsuite</package>
<package>psm2</package>
<package>psm2-testsuite</package>
</multibuild>

8
mvapich2.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Sep 11 09:19:37 UTC 2017 - nmoreychaisemartin@suse.com
- Only requires verbs libraries for verbs build.
libibverbs devel causes a SEGV when run in a chroot using the
psm or psm2 conduits
- Add testuite packages for all build flavours
-------------------------------------------------------------------
Thu Jul 13 14:59:13 UTC 2017 - nmoreychaisemartin@suse.com

58
mvapich2.spec
View File

@ -18,16 +18,36 @@
%global flavor @BUILD_FLAVOR@%nil
%if "%{flavor}" == ""
%define build_flavor verbs
%endif
%if "%{flavor}" == "testsuite"
%define build_flavor verbs
%define testsuite 1
%endif
%if "%{flavor}" == "psm"
%define build_flavor psm
%endif
%if "%{flavor}" == "psm-testsuite"
%define build_flavor psm
%define testsuite 1
%endif
%if "%{flavor}" == "psm2"
%define build_flavor psm2
%endif
%if "%{flavor}" == "psm2-testsuite"
%define build_flavor psm2
%define testsuite 1
%endif
%if "%{flavor}" != ""
%define pack_suff -%{flavor}
%else
%define pack_suff %{nil}
%endif
%if "%flavor" == "testsuite"
%define testsuite 1
%endif
%define module_name mvapich2%{pack_suff}
%define _prefix /usr/%_lib/mpi/gcc/%{module_name}
%define _libexecdir %{_prefix}/%{_lib}
@ -56,10 +76,6 @@ BuildRequires: automake
BuildRequires: bison
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
BuildRequires: infiniband-diags-devel
BuildRequires: libibumad-devel
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel
%ifnarch s390 s390x armv7hl
BuildRequires: libnuma-devel
%endif
@ -69,14 +85,20 @@ BuildRequires: mpi-selector
BuildRequires: python-devel
BuildRequires: sysfsutils
BuildRequires: xorg-x11-devel
%if "%{flavor}" == "psm"
%if "%{build_flavor}" == "psm"
ExclusiveArch: %ix86 x86_64
BuildRequires: infinipath-psm-devel
%endif
%if "%{flavor}" == "psm2"
%if "%{build_flavor}" == "psm2"
ExclusiveArch: x86_64
BuildRequires: libpsm2-devel
%endif
%if "%{build_flavor}" == "verbs"
BuildRequires: infiniband-diags-devel
BuildRequires: libibumad-devel
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel
%endif
Requires: mpi-selector
@ -90,14 +112,16 @@ is based on MPICH2 and MVICH.
Summary: OSU MVAPICH2 MPI package
Group: Development/Libraries/Parallel
Requires: %{name} = %{version}
%if "%{build_flavor}" == "psm"
Requires: infinipath-psm-devel
%endif
%if "%{build_flavor}" == "psm2"
Requires: libpsm2-devel
%endif
%if "%{build_flavor}" == "verbs"
Requires: libibumad-devel
Requires: libibverbs-devel
Requires: librdmacm-devel
%if "%{flavor}" == "psm"
Requires: infinipath-psm-devel
%endif
%if "%{flavor}" == "psm2"
Requires: libpsm2-devel
%endif
%description devel
@ -128,11 +152,11 @@ cp /usr/share/automake*/config.* .
#./autogen.sh
%configure \
--disable-wrapper-rpath \
%if "%{flavor}" == "psm"
%if "%{build_flavor}" == "psm"
--with-device=ch3:psm \
--with-psm=/usr \
%endif
%if "%{flavor}" == "psm2"
%if "%{build_flavor}" == "psm2"
--with-device=ch3:psm \
--with-psm2=/usr \
%endif