commit mvapich2 for openSUSE:Factory

2020-08-03 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2020-08-03 14:13:57

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new.3592 (New)


Package is "mvapich2"

Mon Aug  3 14:13:57 2020 rev:24 rq:823141 version:2.3.4

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2020-07-24 
12:10:51.941893600 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.3592/mvapich2.changes  
2020-08-03 14:14:23.016438775 +0200
@@ -1,0 +2,6 @@
+Sat Jul 25 07:03:57 UTC 2020 - Egbert Eich 
+
+- For HPC builds check for gnu compiler suite version >= 10 and
+  set -fallow-argument-mismatch.
+
+---



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.cXc790/_old  2020-08-03 14:14:26.456442225 +0200
+++ /var/tmp/diff_new_pack.cXc790/_new  2020-08-03 14:14:26.456442225 +0200
@@ -405,7 +405,7 @@
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 
 # GCC10 needs an extra flag to allow badly passed parameters
-%if 0%{?suse_version} > 1500
+%if 0%{?suse_version} > 1500 || 0%{?hpc_gnu_dep_version} >= 10
 export FFLAGS="-fallow-argument-mismatch $FFLAGS"
 %endif

commit mvapich2 for openSUSE:Factory

2020-07-24 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2020-07-24 12:10:45

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new.3592 (New)


Package is "mvapich2"

Fri Jul 24 12:10:45 2020 rev:23 rq:822495 version:2.3.4

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2020-06-11 
10:03:45.434978759 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.3592/mvapich2.changes  
2020-07-24 12:10:51.941893600 +0200
@@ -1,0 +2,5 @@
+Thu Jul 23 15:53:00 UTC 2020 - Egbert Eich 
+
+- Add build support for gcc8/9/10 to HPC build (bsc#1174439).
+
+---



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.mVbyyz/_old  2020-07-24 12:10:53.205894871 +0200
+++ /var/tmp/diff_new_pack.mVbyyz/_new  2020-07-24 12:10:53.209894875 +0200
@@ -113,6 +113,90 @@
 %{bcond_without hpc}
 %endif
 
+%if "%flavor" == "gnu8-hpc"
+%define compiler_family gnu
+%define c_f_ver 8
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+%if "%flavor" == "gnu8-hpc-testsuite"
+%define compiler_family gnu
+%define c_f_ver 8
+%define testsuite 1
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu8-hpc-psm"
+%define compiler_family gnu
+%define c_f_ver 8
+%define build_flavor psm
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu8-hpc-psm2"
+%define compiler_family gnu
+%define c_f_ver 8
+%define build_flavor psm2
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu9-hpc"
+%define compiler_family gnu
+%define c_f_ver 9
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+%if "%flavor" == "gnu9-hpc-testsuite"
+%define compiler_family gnu
+%define c_f_ver 9
+%define testsuite 1
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu9-hpc-psm"
+%define compiler_family gnu
+%define c_f_ver 9
+%define build_flavor psm
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu9-hpc-psm2"
+%define compiler_family gnu
+%define c_f_ver 9
+%define build_flavor psm2
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu10-hpc"
+%define compiler_family gnu
+%define c_f_ver 10
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+%if "%flavor" == "gnu10-hpc-testsuite"
+%define compiler_family gnu
+%define c_f_ver 10
+%define testsuite 1
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu10-hpc-psm"
+%define compiler_family gnu
+%define c_f_ver 10
+%define build_flavor psm
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu10-hpc-psm2"
+%define compiler_family gnu
+%define c_f_ver 10
+%define build_flavor psm2
+%{bcond_without hpc}
+%endif
+
 %if "%{build_flavor}" != "verbs"
 %define pack_suff %{?build_flavor:-%{build_flavor}}
 %endif

commit mvapich2 for openSUSE:Factory

2020-06-11 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2020-06-11 10:02:39

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new.3606 (New)


Package is "mvapich2"

Thu Jun 11 10:02:39 2020 rev:22 rq:813107 version:2.3.4

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2020-01-27 
20:15:42.804459366 +0100
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.3606/mvapich2.changes  
2020-06-11 10:03:45.434978759 +0200
@@ -1,0 +2,11 @@
+Wed Jun  3 08:13:07 UTC 2020 - Nicolas Morey-Chaisemartin 

+
+- Update so mvapich2 2.3.4
+  - See CHANGELOG for fixes and new features
+- Add fix-missing-return-code.patch to fix compilation errors
+- Add 0001-Drop-Real-16.patch to disable Real(16) support on Armv7
+- Add wrapper-revert-ldflag-order-change.patch to revert LDFLAGS order
+  change done in 2.3.4.
+  This allows legacy builds to work without adding a -lmpi flag
+
+---

Old:

  mvapich2-2.3.3.tar.gz

New:

  0001-Drop-Real-16.patch
  fix-missing-return-code.patch
  mvapich2-2.3.4.tar.gz
  wrapper-revert-ldflag-order-change.patch



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.lXLANK/_old  2020-06-11 10:03:53.743005517 +0200
+++ /var/tmp/diff_new_pack.lXLANK/_new  2020-06-11 10:03:53.747005530 +0200
@@ -19,8 +19,8 @@
 %global flavor @BUILD_FLAVOR@%{nil}
 
 %define pname mvapich2
-%define vers  2.3.3
-%define _vers 2_3_3
+%define vers  2.3.4
+%define _vers 2_3_4
 
 %if "%{flavor}" == ""
 ExclusiveArch:  do_not_build
@@ -168,8 +168,13 @@
 # It's been merged upstream, should be removed with the next release
 Patch3: 0001-Drop-GCC-check.patch
 Patch4: reproducible.patch
+Patch5: fix-missing-return-code.patch
+Patch6: wrapper-revert-ldflag-order-change.patch
+## Armv7 specific patches
 # PATCH-FIX-UPSTREAM 0001-Drop-real128.patch 
(https://github.com/pmodels/mpich/issues/4005)
-Patch5: 0001-Drop-real128.patch
+Patch50:0001-Drop-real128.patch
+Patch51:0001-Drop-Real-16.patch
+
 URL:http://mvapich.cse.ohio-state.edu/overview/mvapich2/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -182,6 +187,7 @@
 BuildRequires:  automake
 BuildRequires:  automake
 BuildRequires:  bison
+BuildRequires:  flex
 %ifnarch s390 s390x %{arm}
 BuildRequires:  libnuma-devel
 %endif
@@ -301,14 +307,24 @@
 %patch2
 %patch3
 %patch4 -p1
-# Only apply this patch on Armv7
+%patch5
+%patch6
+
+# Only apply these patches on Armv7
 %ifarch armv7hl
-%patch5 -p1
+%patch50 -p1
+%patch51
 %endif
 cp /usr/share/automake*/config.* .
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
+
+# GCC10 needs an extra flag to allow badly passed parameters
+%if 0%{?suse_version} > 1500
+export FFLAGS="-fallow-argument-mismatch $FFLAGS"
+%endif
+
 PERL_USE_UNSAFE_INC=1 ./autogen.sh
 %if %{with hpc}
 %{hpc_setup}

++ 0001-Drop-Real-16.patch ++
commit 55d03ccf1f3969b185f00e5572c5a0675e000264
Author: Nicolas Morey-Chaisemartin 
Date:   Fri Jun 5 10:11:12 2020 +0200

0001 Drop Real(16)

Real(16) does not work on armv7

Signed-off-by: Nicolas Morey-Chaisemartin 

diff --git src/binding/fortran/mpif_h/Makefile.mk 
src/binding/fortran/mpif_h/Makefile.mk
index d2de6bc779ac..73049dbd9379 100644
--- src/binding/fortran/mpif_h/Makefile.mk
+++ src/binding/fortran/mpif_h/Makefile.mk
@@ -390,7 +390,6 @@ mpi_f77_sources += src/binding/fortran/mpif_h/sendf.c \
src/binding/fortran/mpif_h/null_type_copy_fnf.c 
 mpi_core_sources += src/binding/fortran/mpif_h/fdebug.c \
src/binding/fortran/mpif_h/setbot.c \
-src/binding/fortran/mpif_h/fortran_ops.F \
src/binding/fortran/mpif_h/setbotf.f
 mpi_sources += src/binding/fortran/mpif_h/statusf2c.c 
src/binding/fortran/mpif_h/statusc2f.c
 
diff --git src/binding/fortran/mpif_h/buildiface 
src/binding/fortran/mpif_h/buildiface
index 2b7a77f22c90..9eebc69a4359 100755
--- src/binding/fortran/mpif_h/buildiface
+++ src/binding/fortran/mpif_h/buildiface
@@ -1045,7 +1045,6 @@ EOT
 print MAKEFD <
Date:   Wed Jun 3 12:01:54 2020 +0200

fix missing return code

src/pmi/upmi/upmi.c: In function 'UPMI_GET_LOCAL_RANK':
src/pmi/upmi/upmi.c:746:1: error: control reaches end of non-void function 
[-Werror=return-type]
  746 | }
  | ^
src/pmi/upmi/upmi.c: In function 'UPMI_GET_LOCAL_SIZE':
src/pmi/upmi/upmi.c:764:1: error: control reaches end of non-void function 
[-Werror=return-type]
  764 | }
  | ^
src/pmi/upmi/upmi.c: In function 'UPMI_GET_LOWEST_RANK':
src/pmi/upmi/upmi.c:782:1

commit mvapich2 for openSUSE:Factory

2020-01-27 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2020-01-27 20:15:40

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new.26092 (New)


Package is "mvapich2"

Mon Jan 27 20:15:40 2020 rev:21 rq:767611 version:2.3.3

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2020-01-25 
13:25:01.688059378 +0100
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.26092/mvapich2.changes 
2020-01-27 20:15:42.804459366 +0100
@@ -4 +4 @@
-- Update to mvapich2 2.3.3 (jsc#SLE-8544)
+- Update to mvapich2 2.3.3 (jsc#SLE-8497)



Other differences:
--

commit mvapich2 for openSUSE:Factory

2020-01-25 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2020-01-25 13:24:56

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new.26092 (New)


Package is "mvapich2"

Sat Jan 25 13:24:56 2020 rev:20 rq:766945 version:2.3.3

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2019-10-02 
11:59:38.254917606 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.26092/mvapich2.changes 
2020-01-25 13:25:01.688059378 +0100
@@ -1,0 +2,6 @@
+Tue Jan 21 08:17:00 UTC 2020 - Nicolas Morey-Chaisemartin 

+
+- Update to mvapich2 2.3.3 (jsc#SLE-8544)
+  - See CHANGELOG for fixes and new features
+
+---

Old:

  mvapich2-2.3.2.tar.gz

New:

  mvapich2-2.3.3.tar.gz



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.FIBDRz/_old  2020-01-25 13:25:03.008059957 +0100
+++ /var/tmp/diff_new_pack.FIBDRz/_new  2020-01-25 13:25:03.012059959 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package mvapich2
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,8 +19,8 @@
 %global flavor @BUILD_FLAVOR@%{nil}
 
 %define pname mvapich2
-%define vers  2.3.2
-%define _vers 2_3_2
+%define vers  2.3.3
+%define _vers 2_3_3
 
 %if "%{flavor}" == ""
 ExclusiveArch:  do_not_build
@@ -157,7 +157,7 @@
 Group:  Development/Libraries/Parallel
 Version:%{vers}
 Release:0
-Source0:mvapich2-%{version}.tar.gz
+Source0:
http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-%{version}.tar.gz
 Source1:mpivars.sh
 Source2:mpivars.csh
 Source3:macros.hpc-mvapich2
@@ -170,7 +170,7 @@
 Patch4: reproducible.patch
 # PATCH-FIX-UPSTREAM 0001-Drop-real128.patch 
(https://github.com/pmodels/mpich/issues/4005)
 Patch5: 0001-Drop-real128.patch
-Url:http://mvapich.cse.ohio-state.edu/overview/mvapich2/
+URL:http://mvapich.cse.ohio-state.edu/overview/mvapich2/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %if %{without skip_hpc_build}

++ mvapich2-2.3.2.tar.gz -> mvapich2-2.3.3.tar.gz ++
/work/SRC/openSUSE:Factory/mvapich2/mvapich2-2.3.2.tar.gz 
/work/SRC/openSUSE:Factory/.mvapich2.new.26092/mvapich2-2.3.3.tar.gz differ: 
char 5, line 1

commit mvapich2 for openSUSE:Factory

2019-10-02 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2019-10-02 11:59:34

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new.2352 (New)


Package is "mvapich2"

Wed Oct  2 11:59:34 2019 rev:19 rq:734305 version:2.3.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2019-08-05 
10:41:02.827301142 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.2352/mvapich2.changes  
2019-10-02 11:59:38.254917606 +0200
@@ -1,0 +2,10 @@
+Fri Sep  6 08:10:21 UTC 2019 - Nicolas Morey-Chaisemartin 

+
+- Update to mvapich2 2.3.2 (jsc#SLE-8544)
+  - See CHANGELOG for fixes and new features
+- Drop 
mvapich2-make-sure-ibv_get_device_list-returned-one-before-freeing-it.patch
+  as it was fixed upstream.
+- Use FAT LTO objects in order to provide proper static library.
+- Add 0001-Drop-real128.patch to fix compilation on armv7
+
+---

Old:

  mvapich2-2.3.1.tar.gz
  mvapich2-make-sure-ibv_get_device_list-returned-one-before-freeing-it.patch

New:

  0001-Drop-real128.patch
  mvapich2-2.3.2.tar.gz



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.USeJ8t/_old  2019-10-02 11:59:39.070915514 +0200
+++ /var/tmp/diff_new_pack.USeJ8t/_new  2019-10-02 11:59:39.070915514 +0200
@@ -19,8 +19,8 @@
 %global flavor @BUILD_FLAVOR@%{nil}
 
 %define pname mvapich2
-%define vers  2.3.1
-%define _vers 2_3_1
+%define vers  2.3.2
+%define _vers 2_3_2
 
 %if "%{flavor}" == ""
 ExclusiveArch:  do_not_build
@@ -168,7 +168,8 @@
 # It's been merged upstream, should be removed with the next release
 Patch3: 0001-Drop-GCC-check.patch
 Patch4: reproducible.patch
-Patch5: 
mvapich2-make-sure-ibv_get_device_list-returned-one-before-freeing-it.patch
+# PATCH-FIX-UPSTREAM 0001-Drop-real128.patch 
(https://github.com/pmodels/mpich/issues/4005)
+Patch5: 0001-Drop-real128.patch
 Url:http://mvapich.cse.ohio-state.edu/overview/mvapich2/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -300,10 +301,14 @@
 %patch2
 %patch3
 %patch4 -p1
-%patch5
+# Only apply this patch on Armv7
+%ifarch armv7hl
+%patch5 -p1
+%endif
 cp /usr/share/automake*/config.* .
 
 %build
+%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 PERL_USE_UNSAFE_INC=1 ./autogen.sh
 %if %{with hpc}
 %{hpc_setup}

++ 0001-Drop-real128.patch ++
>From 8f0c71281b5dccd70a3f1d4204e3cc6bc7201ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
 
Date: Wed, 28 Aug 2019 10:57:55 +
Subject: [PATCH] Drop real128

https://github.com/pmodels/mpich/issues/4005
---
 .../fortran/use_mpi_f08/mpi_f08_types.f90 | 24 ---
 1 file changed, 24 deletions(-)

diff --git a/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90 
b/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
index f8b0fa811..46bdf6972 100644
--- a/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
+++ b/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
@@ -248,10 +248,8 @@ interface MPI_Sizeof
 module procedure MPI_Sizeof_xint64
 module procedure MPI_Sizeof_xreal32
 module procedure MPI_Sizeof_xreal64
-module procedure MPI_Sizeof_xreal128
 module procedure MPI_Sizeof_xcomplex32
 module procedure MPI_Sizeof_xcomplex64
-module procedure MPI_Sizeof_xcomplex128
 end interface
 
 private :: MPI_Sizeof_character
@@ -263,10 +261,8 @@ private :: MPI_Sizeof_xint32
 private :: MPI_Sizeof_xint64
 private :: MPI_Sizeof_xreal32
 private :: MPI_Sizeof_xreal64
-private :: MPI_Sizeof_xreal128
 private :: MPI_Sizeof_xcomplex32
 private :: MPI_Sizeof_xcomplex64
-private :: MPI_Sizeof_xcomplex128
 
 contains
 
@@ -350,16 +346,6 @@ subroutine MPI_Sizeof_xreal64 (x, size, ierror)
 ierror = 0
 end subroutine MPI_Sizeof_xreal64
 
-subroutine MPI_Sizeof_xreal128 (x, size, ierror)
-use,intrinsic :: iso_fortran_env, only: real128
-real(real128),dimension(..) :: x
-integer, intent(out) :: size
-integer, optional,  intent(out) :: ierror
-
-size = storage_size(x)/8
-ierror = 0
-end subroutine MPI_Sizeof_xreal128
-
 subroutine MPI_Sizeof_xcomplex32 (x, size, ierror)
 use,intrinsic :: iso_fortran_env, only: real32
 complex(real32),dimension(..) :: x
@@ -380,16 +366,6 @@ subroutine MPI_Sizeof_xcomplex64 (x, size, ierror)
 ierror = 0
 end subroutine MPI_Sizeof_xcomplex64
 
-subroutine MPI_Sizeof_xcomplex128 (x, size, ierror)
-use,intrinsic :: iso_fortran_env, only: real128
-complex(real128),dimension(..) :: x
-integer, intent(out) :: size
-integer, optional,  intent(out) :: ierror
-
-size = storage_size(x)/8
-ierror = 0
-en

commit mvapich2 for openSUSE:Factory

2019-08-05 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2019-08-05 10:40:30

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new.4126 (New)


Package is "mvapich2"

Mon Aug  5 10:40:30 2019 rev:18 rq:720594 version:2.3.1

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2019-06-04 
12:14:16.903783629 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.4126/mvapich2.changes  
2019-08-05 10:41:02.827301142 +0200
@@ -1,0 +2,7 @@
+Fri Aug  2 08:56:21 UTC 2019 - Nicolas Morey-Chaisemartin 

+
+- Add 
mvapich2-make-sure-ibv_get_device_list-returned-one-before-freeing-it.patch
+  to Fix segfault when ib_uverbs is not loaded (bsc#1144000)
+
+
+---

New:

  mvapich2-make-sure-ibv_get_device_list-returned-one-before-freeing-it.patch



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.yw86ao/_old  2019-08-05 10:41:03.679301044 +0200
+++ /var/tmp/diff_new_pack.yw86ao/_new  2019-08-05 10:41:03.679301044 +0200
@@ -168,6 +168,7 @@
 # It's been merged upstream, should be removed with the next release
 Patch3: 0001-Drop-GCC-check.patch
 Patch4: reproducible.patch
+Patch5: 
mvapich2-make-sure-ibv_get_device_list-returned-one-before-freeing-it.patch
 Url:http://mvapich.cse.ohio-state.edu/overview/mvapich2/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -299,6 +300,7 @@
 %patch2
 %patch3
 %patch4 -p1
+%patch5
 cp /usr/share/automake*/config.* .
 
 %build

++ 
mvapich2-make-sure-ibv_get_device_list-returned-one-before-freeing-it.patch 
++
commit a99fe07d76f518d8ce98752e3251e1c6d601ca7f
Author: Nicolas Morey-Chaisemartin 
Date:   Fri Aug 2 10:53:11 2019 +0200

mvapich2: make sure ibv_get_device_list returned one before freeing it

Signed-off-by: Nicolas Morey-Chaisemartin 

diff --git src/mpid/ch3/channels/common/src/detect/hca/mv2_hca_detect.c 
src/mpid/ch3/channels/common/src/detect/hca/mv2_hca_detect.c
index 8a6f06bb43a1..0eaab4a30804 100644
--- src/mpid/ch3/channels/common/src/detect/hca/mv2_hca_detect.c
+++ src/mpid/ch3/channels/common/src/detect/hca/mv2_hca_detect.c
@@ -632,7 +632,8 @@ mv2_multirail_info_type mv2_get_multirail_info()
 g_mv2_multirail_info = mv2_num_rail_unknown;
 break;
 }
-ibv_free_device_list(dev_list);
+   if(dev_list)
+   ibv_free_device_list(dev_list);
 }
 return g_mv2_multirail_info;
 }
diff --git src/mpid/ch3/channels/mrail/src/gen2/ibv_param.c 
src/mpid/ch3/channels/mrail/src/gen2/ibv_param.c
index 0634d4ae48d2..6414bc0b76b8 100644
--- src/mpid/ch3/channels/mrail/src/gen2/ibv_param.c
+++ src/mpid/ch3/channels/mrail/src/gen2/ibv_param.c
@@ -572,7 +572,8 @@ int rdma_get_process_to_rail_mapping(int 
mrail_user_defined_p2r_type)
 }
   fn_exit:
 /* Housekeeping operations */
-ibv_free_device_list(dev_list);
+   if (dev_list)
+   ibv_free_device_list(dev_list);
 MPIU_Free(p2r_only_numbers);
 MPIU_Free(mrail_p2r_string);
 mrail_p2r_string = NULL;
diff --git src/mpid/ch3/channels/mrail/src/gen2/rdma_iba_priv.c 
src/mpid/ch3/channels/mrail/src/gen2/rdma_iba_priv.c
index 89bf75ef49ab..4d97eb107be6 100644
--- src/mpid/ch3/channels/mrail/src/gen2/rdma_iba_priv.c
+++ src/mpid/ch3/channels/mrail/src/gen2/rdma_iba_priv.c
@@ -387,7 +387,8 @@ int rdma_find_network_type(struct ibv_device **dev_list, 
int num_devices,
 *num_usable_hcas = num_unknwn_cards;
 }
 
-ibv_free_device_list(dev_list);
+   if (dev_list)
+   ibv_free_device_list(dev_list);
 
 return network_type;
 }
@@ -514,7 +515,8 @@ int ring_rdma_open_hca(struct mv2_MPIDI_CH3I_RDMA_Process_t 
*proc)
 
   fn_exit:
 /* Clean up before exit */
-ibv_free_device_list(dev_list);
+   if (dev_list)
+   ibv_free_device_list(dev_list);
 return is_device_opened;
 }
 
@@ -614,7 +616,8 @@ retry_hca_open:
 
 if (!ib_dev) {
 /* Clean up before exit */
-ibv_free_device_list(dev_list);
+   if (dev_list)
+   ibv_free_device_list(dev_list);
 MPIR_ERR_SETFATALANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**fail",
   "**fail %s", "No IB device found");
 }
@@ -624,7 +627,8 @@ retry_hca_open:
 proc->nic_context[rdma_num_hcas] = ibv_open_device(ib_dev);
 if (!proc->nic_context[rdma_num_hcas]) {
 /* Clean up before exit */
-ibv_free_device_list(dev_list);
+   if (dev_list)
+

commit mvapich2 for openSUSE:Factory

2019-06-04 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2019-06-04 12:14:13

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new.5148 (New)


Package is "mvapich2"

Tue Jun  4 12:14:13 2019 rev:17 rq:707350 version:2.3.1

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2019-05-14 
13:43:18.708632993 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.5148/mvapich2.changes  
2019-06-04 12:14:16.903783629 +0200
@@ -1,0 +2,6 @@
+Mon May 27 15:14:10 UTC 2019 - Bernhard Wiedemann 
+
+- Add reproducible.patch to sort readdir to make package build reproducible
+  (boo#1041090)
+
+---

New:

  reproducible.patch



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.4yllSL/_old  2019-06-04 12:14:18.927782966 +0200
+++ /var/tmp/diff_new_pack.4yllSL/_new  2019-06-04 12:14:18.927782966 +0200
@@ -167,6 +167,7 @@
 # PATCH-FIX-UPSTREAM 0001-Drop-GCC-check.patch (bnc#1129421)
 # It's been merged upstream, should be removed with the next release
 Patch3: 0001-Drop-GCC-check.patch
+Patch4: reproducible.patch
 Url:http://mvapich.cse.ohio-state.edu/overview/mvapich2/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -297,6 +298,7 @@
 %patch0
 %patch2
 %patch3
+%patch4 -p1
 cp /usr/share/automake*/config.* .
 
 %build

++ reproducible.patch ++
http://mailman.cse.ohio-state.edu/pipermail/mvapich-discuss/2019-April/006837.html

commit 2d6233b60e419059240e054e40fc6ece6fd94929
Author: Bernhard M. Wiedemann 
Date:   Mon Mar 25 11:12:56 2019 +0100

Sort input file list

so that mpich builds in a reproducible way
in spite of indeterministic filesystem readdir order

See https://reproducible-builds.org/ for why this is good.

Without this patch,
README.envvar, /usr/lib64/mpi/gcc/mpich/bin/mpivars and other
output files varied between builds.

Index: mvapich2-2.2/maint/extractcvars.in
===
--- mvapich2-2.2.orig/maint/extractcvars.in
+++ mvapich2-2.2/maint/extractcvars.in
@@ -594,7 +594,7 @@ sub ExpandDir {
 my @subdirs = ();
 my $DIR_HANDLE;
 opendir $DIR_HANDLE, "$dir" or die "Error: open directory $dir -- $!\n";
-while (my $filename = readdir $DIR_HANDLE) {
+for my $filename (sort readdir $DIR_HANDLE) {
 if ($filename =~ /^\./) {
 next;
 } elsif (-d "$dir/$filename") {
Index: mvapich2-2.2/maint/extractfixme.in
===
--- mvapich2-2.2.orig/maint/extractfixme.in
+++ mvapich2-2.2/maint/extractfixme.in
@@ -114,7 +114,7 @@ sub ExpandDir {
 my @otherdirs = ();
 my @files = ();
 opendir DIR, "$dir";
-while ($filename = readdir DIR) {
+for $filename (sort readdir DIR) {
if ($filename =~ /^\./ || $filename eq ".svn") {
next;
}
Index: mvapich2-2.2/maint/extractstrings.in
===
--- mvapich2-2.2.orig/maint/extractstrings.in
+++ mvapich2-2.2/maint/extractstrings.in
@@ -71,7 +71,7 @@ sub GetFileNamesInDirectory {
 my @filesFound = ();
 
 opendir DIR, $dir || die "Could not open $dir\n";
-while (my $file = readdir DIR) {
+for my $file (sort readdir DIR) {
if (! -f "$dir/$file") { next; }
if ($file =~ /^\.$/ || $file =~ /^\.\.$/) { next; }
if ($file =~ /$pattern/) {
@@ -244,7 +244,7 @@ sub processDirs {
 my @dirs = ();
 # Find the directories
 opendir DIR, "$dir" || die "Cannot open $dir\n";
-while (my $file = readdir DIR) {
+for my $file (sort readdir DIR) {
if (! -d "$dir/$file") { next; }
if ($file =~ /^\./) { next; }
if ($file =~ /^.svn/) { next; }
@@ -271,7 +271,7 @@ sub processDirsAndAction {
 my @dirs = ();
 # Find the directories
 opendir DIR, "$dir" || die "Cannot open $dir\n";
-while (my $file = readdir DIR) {
+for my $file (sort readdir DIR) {
if (! -d "$dir/$file") { next; }
if ($file =~ /^\./) { next; }
if ($file =~ /^.svn/) { next; }
Index: mvapich2-2.2/maint/gen_subcfg_m4
===
--- mvapich2-2.2.orig/maint/gen_subcfg_m4
+++ mvapich2-2.2/maint/gen_subcfg_m4
@@ -118,7 +118,7 @@ while (my $dir = pop @dirstack) {
 # the stack to continue the traversal
 opendir DH, $dir
 or die "unable to open dir='$dir', stopped";
-my @contents = readdir DH;
+my @contents = sort readdir DH;
 foreach my $f (@contents) {

commit mvapich2 for openSUSE:Factory

2019-05-14 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2019-05-14 13:42:34

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new.5148 (New)


Package is "mvapich2"

Tue May 14 13:42:34 2019 rev:16 rq:702623 version:2.3.1

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2019-05-02 
19:21:43.145832258 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.5148/mvapich2.changes  
2019-05-14 13:43:18.708632993 +0200
@@ -1,0 +2,11 @@
+Mon May 13 07:59:22 UTC 2019 - Nicolas Morey-Chaisemartin 

+
+- Update to mvapich2 2.3.1
+  - See CHANGELOG for fixes and new features
+- Refreshed patches against the new version:
+  - 0001-Drop-GCC-check.patch
+  - mvapich2-arm-support.patch
+  - mvapich2-s390_get_cycles.patch
+- Drop mvapich2-fix-double-free.patch as it was merged upstream
+
+---

Old:

  mvapich2-2.2.tar.gz
  mvapich2-fix-double-free.patch

New:

  mvapich2-2.3.1.tar.gz



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.LiZd38/_old  2019-05-14 13:43:19.280634202 +0200
+++ /var/tmp/diff_new_pack.LiZd38/_new  2019-05-14 13:43:19.284634211 +0200
@@ -19,8 +19,8 @@
 %global flavor @BUILD_FLAVOR@%{nil}
 
 %define pname mvapich2
-%define vers  2.2
-%define _vers 2_2
+%define vers  2.3.1
+%define _vers 2_3_1
 
 %if "%{flavor}" == ""
 ExclusiveArch:  do_not_build
@@ -167,7 +167,6 @@
 # PATCH-FIX-UPSTREAM 0001-Drop-GCC-check.patch (bnc#1129421)
 # It's been merged upstream, should be removed with the next release
 Patch3: 0001-Drop-GCC-check.patch
-Patch4: mvapich2-fix-double-free.patch
 Url:http://mvapich.cse.ohio-state.edu/overview/mvapich2/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -298,7 +297,6 @@
 %patch0
 %patch2
 %patch3
-%patch4
 cp /usr/share/automake*/config.* .
 
 %build

++ 0001-Drop-GCC-check.patch ++
--- /var/tmp/diff_new_pack.LiZd38/_old  2019-05-14 13:43:19.304634253 +0200
+++ /var/tmp/diff_new_pack.LiZd38/_new  2019-05-14 13:43:19.304634253 +0200
@@ -1,7 +1,19 @@
-diff -Nrua autogen.sh autogen.sh
+commit b609280fc0d0f0f5a728b08e874977cb16f921b8
+Author: Nicolas Morey-Chaisemartin 
+Date:   Thu May 2 08:17:42 2019 +0200
+
+0001 Drop GCC check
+
+Skip GCC badly written GCC check intended for older released that may cause
+bugs during future GCC updates
+
+Signed-off-by: Nicolas Morey-Chaisemartin 
+
+diff --git autogen.sh autogen.sh
+index a0b3d897d15b..f13f3ad543f0 100755
 --- autogen.sh
 +++ autogen.sh
-@@ -516,7 +516,7 @@
+@@ -516,7 +516,7 @@ fi
  
  echo_n "Checking for automake version... "
  recreate_tmp
@@ -10,19 +22,20 @@
  cat > .tmp/configure.ac<.tmp/configure.ac
  AC_INIT(testver,1.0)
  AC_CONFIG_AUX_DIR([m4])
-diff -Nrua src/binding/cxx/buildiface src/binding/cxx/buildiface
+diff --git src/binding/cxx/buildiface src/binding/cxx/buildiface
+index 3afd823c8bd0..9f73c84d7eb8 100755
 --- src/binding/cxx/buildiface
 +++ src/binding/cxx/buildiface
-@@ -1454,21 +1454,6 @@
+@@ -1454,21 +1454,6 @@ sub printDefineChecks {
  #endif\n\n";
  }
  

++ mvapich2-2.2.tar.gz -> mvapich2-2.3.1.tar.gz ++
/work/SRC/openSUSE:Factory/mvapich2/mvapich2-2.2.tar.gz 
/work/SRC/openSUSE:Factory/.mvapich2.new.5148/mvapich2-2.3.1.tar.gz differ: 
char 5, line 1

++ mvapich2-arm-support.patch ++
--- /var/tmp/diff_new_pack.LiZd38/_old  2019-05-14 13:43:19.360634371 +0200
+++ /var/tmp/diff_new_pack.LiZd38/_new  2019-05-14 13:43:19.364634380 +0200
@@ -1,12 +1,21 @@
+commit 55640b711726705a0127eb7ce767ef69e7642790
+Author: Nicolas Morey-Chaisemartin 
+Date:   Thu Jun 8 15:14:01 2017 +0200
+
+mvapich2 arm support
+
+Signed-off-by: Nicolas Morey-Chaisemartin 
+
 diff --git src/mpid/ch3/channels/common/include/mv2_clock.h 
src/mpid/ch3/channels/common/include/mv2_clock.h
-index ac117c2..335d07f 100644
+index af8bb2b77d08..b73a4ffa2fc0 100644
 --- src/mpid/ch3/channels/common/include/mv2_clock.h
 +++ src/mpid/ch3/channels/common/include/mv2_clock.h
-@@ -81,7 +81,24 @@ static inline cycles_t get_cycles()
- asm volatile ("mov %0=ar.itc" : "=r" (ret));
- return ret;
+@@ -92,7 +92,14 @@ static inline cycles_t get_cycles()
+ 
+return ret;
  }
-+#elif defined(__ARM_ARCH_7A__) || defined(__arm__)
+-
++#elif defined(__ARM_ARCH_7A__)
 +typedef unsigned long long cycles_t;
 +static inline cycles_t get_cycles(void)
 +{
@@ -14,16 +23,6 @@
 +  asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (clk));
 +  return clk;
 +}
-+#elif defined(__aarch64__)
- 
-+typedef unsigned long cycles_t;
-+static inline cycles_t get_cycles()
-+{
-+  cycles_t cval;
-+

commit mvapich2 for openSUSE:Factory

2019-05-02 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2019-05-02 19:21:30

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new.5148 (New)


Package is "mvapich2"

Thu May  2 19:21:30 2019 rev:15 rq:700040 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2019-03-22 
15:09:29.781384012 +0100
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.5148/mvapich2.changes  
2019-05-02 19:21:43.145832258 +0200
@@ -1,0 +2,6 @@
+Thu May  2 08:00:51 UTC 2019 - Nicolas Morey-Chaisemartin 

+
+- Add mvapich2-fix-double-free.patch to fix a segfault
+  when running on a machine with no RDMA hardware (bsc#1133797)
+
+---

New:

  mvapich2-fix-double-free.patch



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.vMHjzy/_old  2019-05-02 19:21:43.965833990 +0200
+++ /var/tmp/diff_new_pack.vMHjzy/_new  2019-05-02 19:21:43.965833990 +0200
@@ -167,6 +167,7 @@
 # PATCH-FIX-UPSTREAM 0001-Drop-GCC-check.patch (bnc#1129421)
 # It's been merged upstream, should be removed with the next release
 Patch3: 0001-Drop-GCC-check.patch
+Patch4: mvapich2-fix-double-free.patch
 Url:http://mvapich.cse.ohio-state.edu/overview/mvapich2/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -297,6 +298,7 @@
 %patch0
 %patch2
 %patch3
+%patch4
 cp /usr/share/automake*/config.* .
 
 %build

++ mvapich2-fix-double-free.patch ++
commit 02b05116e1586422a933c4a8f6d4e4d29d4e9531
Author: Nicolas Morey-Chaisemartin 
Date:   Thu May 2 09:56:40 2019 +0200

mvapich2 fix double free

Fix double free that causes a SEGV when mvapich2 fails to open
 a rdma device

Signed-off-by: Nicolas Morey-Chaisemartin 

diff --git src/mpid/ch3/channels/mrail/src/gen2/rdma_iba_priv.c 
src/mpid/ch3/channels/mrail/src/gen2/rdma_iba_priv.c
index 4366eb521fce..95d09efa75e3 100644
--- src/mpid/ch3/channels/mrail/src/gen2/rdma_iba_priv.c
+++ src/mpid/ch3/channels/mrail/src/gen2/rdma_iba_priv.c
@@ -707,8 +707,6 @@ int rdma_open_hca(struct mv2_MPIDI_CH3I_RDMA_Process_t 
*proc)
 return mpi_errno;
 
   fn_fail:
-/* Clean up before exit */
-ibv_free_device_list(dev_list);
 goto fn_exit;
 }

commit mvapich2 for openSUSE:Factory

2019-03-22 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2019-03-22 15:09:26

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new.25356 (New)


Package is "mvapich2"

Fri Mar 22 15:09:26 2019 rev:14 rq:687316 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2018-11-26 
10:26:05.737324453 +0100
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.25356/mvapich2.changes 
2019-03-22 15:09:29.781384012 +0100
@@ -1,0 +2,9 @@
+Wed Mar 20 19:01:00 UTC 2019 - Ana Guerrero Lopez 
+
+- Add patch to remove obsolete GCC check (bnc#1129421). It also patches
+  autogen.sh to get the autotools working in SLE12SP4.
+  * 0001-Drop-GCC-check.patch
+- Force to re-run autotools to generate properly the files after 
+  patching src/binding/cxx/buildiface 
+
+---

New:

  0001-Drop-GCC-check.patch



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.F9d01B/_old  2019-03-22 15:09:32.165381949 +0100
+++ /var/tmp/diff_new_pack.F9d01B/_new  2019-03-22 15:09:32.189381929 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package mvapich2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -164,6 +164,9 @@
 Source100:  _multibuild
 Patch0: mvapich2-s390_get_cycles.patch
 Patch2: mvapich2-arm-support.patch
+# PATCH-FIX-UPSTREAM 0001-Drop-GCC-check.patch (bnc#1129421)
+# It's been merged upstream, should be removed with the next release
+Patch3: 0001-Drop-GCC-check.patch
 Url:http://mvapich.cse.ohio-state.edu/overview/mvapich2/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -293,10 +296,11 @@
 %setup -q -n mvapich2-%{version}%{?rc_ver}
 %patch0
 %patch2
+%patch3
 cp /usr/share/automake*/config.* .
 
 %build
-#./autogen.sh
+PERL_USE_UNSAFE_INC=1 ./autogen.sh
 %if %{with hpc}
 %{hpc_setup}
 %{hpc_configure} \

++ 0001-Drop-GCC-check.patch ++
diff -Nrua autogen.sh autogen.sh
--- autogen.sh
+++ autogen.sh
@@ -516,7 +516,7 @@
 
 echo_n "Checking for automake version... "
 recreate_tmp
-ver=1.15
+ver=1.13
 cat > .tmp/configure.ac<.tmp/configure.ac
 AC_INIT(testver,1.0)
 AC_CONFIG_AUX_DIR([m4])
diff -Nrua src/binding/cxx/buildiface src/binding/cxx/buildiface
--- src/binding/cxx/buildiface
+++ src/binding/cxx/buildiface
@@ -1454,21 +1454,6 @@
 #endif\n\n";
 }
 
-# GCC changed the calling convention between 3.2.3 and 3.4.3 (!!!)
-# check for that
-print $OUTFD "
-// Check for incompatible GCC versions
-// GCC (specifically) g++ changed the calling convention
-// between 3.2.3 and 3.4.3 (!!)  Normally such changes
-// should only occur at major releases (e.g., version 3 to 4)
-#ifdef __GNUC__ 
-# if __GNUC__ >= \@GNUCXX_VERSION\@ 
-#  if __GNUC_MINOR__ > 2 && \@GNUCXX_MINORVERSION\@ == 2 
-#  error 'Please use the same version of GCC and g++ for compiling MPICH and 
user MPI programs'
-#  endif
-# endif 
-#endif\n";
-
 print $OUTFD "
 /* 
  * Because the API is defined, some methods have parameters that are

commit mvapich2 for openSUSE:Factory

2018-11-26 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2018-11-26 10:23:42

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new.19453 (New)


Package is "mvapich2"

Mon Nov 26 10:23:42 2018 rev:13 rq:650120 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2018-09-18 
11:44:57.495815388 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.19453/mvapich2.changes 
2018-11-26 10:26:05.737324453 +0100
@@ -1,0 +2,5 @@
+Sun Nov 18 14:21:27 UTC 2018 - e...@suse.com
+
+- Add macro _hpc_mvapich2_modules for modules support (bsc#1116458).
+
+---



Other differences:
--
++ macros.hpc-mvapich2 ++
--- /var/tmp/diff_new_pack.0OSgBG/_old  2018-11-26 10:26:06.273323823 +0100
+++ /var/tmp/diff_new_pack.0OSgBG/_new  2018-11-26 10:26:06.273323823 +0100
@@ -6,7 +6,8 @@
  %{-V: %define _mf_ver %{-V*}} \
  %{expand: %%global hpc_mvapich2_dep_version %%{?_mf_ver}} \
  %{expand: %%global hpc_mvapich2_dir mvapich2} \
- %global hpc_mvapich2_pack_version %{hpc_mvapich2_dep_version}
+ %global hpc_mvapich2_pack_version %{hpc_mvapich2_dep_version} \
+ %{expand: %%global _hpc_mvapich2_modules mvapich2}
 
 # We may have to add a version here.
 %hpc_setup_mvapich2 \

commit mvapich2 for openSUSE:Factory

2018-09-18 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2018-09-18 11:44:47

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new (New)


Package is "mvapich2"

Tue Sep 18 11:44:47 2018 rev:12 rq:636135 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2018-08-22 
14:22:12.762615917 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new/mvapich2.changes   2018-09-18 
11:44:57.495815388 +0200
@@ -1,0 +2,10 @@
+Mon Sep 10 12:15:10 UTC 2018 - nmoreychaisemar...@suse.com
+
+- Remove bashism in postun scriptlet
+
+---
+Wed Sep  5 06:54:33 UTC 2018 - nmoreychaisemar...@suse.com
+
+- Fix handling of mpi-selector during updates (bsc#1098653)
+
+---



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.H1vnLg/_old  2018-09-18 11:44:59.895812892 +0200
+++ /var/tmp/diff_new_pack.H1vnLg/_new  2018-09-18 11:44:59.895812892 +0200
@@ -429,8 +429,10 @@
 %post
 /sbin/ldconfig
 %if %{without hpc}
+# Always register. We might be already registered in the case of an udate
+# but mpi-selector handles it fine
 /usr/bin/mpi-selector \
---register %{name}%{?pack_suff}-%{version} \
+--register %{name}%{?pack_suff} \
 --source-dir %{p_bindir} \
 --yes
 %endif
@@ -438,7 +440,14 @@
 %postun
 /sbin/ldconfig
 %if %{without hpc}
-/usr/bin/mpi-selector --unregister %{name}%{?pack_suff}-%{version} --yes 
--silent
+# Only unregister when uninstalling
+if [ "$1" = "0" ]; then
+   /usr/bin/mpi-selector --unregister %{name}%{?pack_suff} --yes
+   # Deregister the default if we are uninstalling it
+   if [ "$(/usr/bin/mpi-selector --system --query)" = 
"%{name}%{?pack_suff}" ]; then
+   /usr/bin/mpi-selector --system --unset --yes
+   fi
+fi
 %else
 %hpc_module_delete_if_default
 %endif

commit mvapich2 for openSUSE:Factory

2018-08-22 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2018-08-22 14:21:56

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new (New)


Package is "mvapich2"

Wed Aug 22 14:21:56 2018 rev:11 rq:630811 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2018-07-25 
16:15:05.218155279 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new/mvapich2.changes   2018-08-22 
14:22:12.762615917 +0200
@@ -1,0 +2,6 @@
+Sun Aug 19 09:21:45 UTC 2018 - e...@suse.com
+
+- macros.hpc-mvapich2:
+  replace %%compiler_family by %%hpc_compiler_family
+
+---



Other differences:
--
++ macros.hpc-mvapich2 ++
--- /var/tmp/diff_new_pack.O9qeNC/_old  2018-08-22 14:22:13.454617555 +0200
+++ /var/tmp/diff_new_pack.O9qeNC/_new  2018-08-22 14:22:13.454617555 +0200
@@ -13,8 +13,8 @@
  module load mvapich2
 
 %hpc_mvapich2_requires \
-Requires:  
mvapich2%{hpc_mvapich2_dep_version}-%{compiler_family}%{hpc_cf_pack_version}-hpc
+Requires:  
mvapich2%{hpc_mvapich2_dep_version}-%{hpc_compiler_family}%{hpc_cf_pack_version}-hpc
 
 %hpc_mvapich2_requires_devel \
-Requires:  
mvapich2%{hpc_mvapich2_dep_version}-%{compiler_family}%{hpc_cf_pack_version}-hpc-devel
+Requires:  
mvapich2%{hpc_mvapich2_dep_version}-%{hpc_compiler_family}%{hpc_cf_pack_version}-hpc-devel

commit mvapich2 for openSUSE:Factory

2018-07-25 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2018-07-25 16:14:59

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new (New)


Package is "mvapich2"

Wed Jul 25 16:14:59 2018 rev:10 rq:625262 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2018-06-20 
15:31:09.458510114 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new/mvapich2.changes   2018-07-25 
16:15:05.218155279 +0200
@@ -1,0 +2,6 @@
+Mon Jul 16 16:13:32 UTC 2018 - msucha...@suse.com
+
+- Use sched_yield instead of pthread_yield (boo#1102421).
+  - drop mvapich2-pthread_yield.patch
+
+---

Old:

  mvapich2-pthread_yield.patch



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.74T2Wr/_old  2018-07-25 16:15:07.206159166 +0200
+++ /var/tmp/diff_new_pack.74T2Wr/_new  2018-07-25 16:15:07.206159166 +0200
@@ -163,7 +163,6 @@
 Source3:macros.hpc-mvapich2
 Source100:  _multibuild
 Patch0: mvapich2-s390_get_cycles.patch
-Patch1: mvapich2-pthread_yield.patch
 Patch2: mvapich2-arm-support.patch
 Url:http://mvapich.cse.ohio-state.edu/overview/mvapich2/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -293,7 +292,6 @@
 %{?with_hpc:%hpc_debug}
 %setup -q -n mvapich2-%{version}%{?rc_ver}
 %patch0
-%patch1
 %patch2
 cp /usr/share/automake*/config.* .
 
@@ -315,7 +313,7 @@
 %endif
--docdir=%{_datadir}/doc/%{name} \
--disable-wrapper-rpath \
-   --disable-wrapper-rpath  \
+   --enable-yield=sched_yield \
 %if "%{build_flavor}" == "psm"
--with-device=ch3:psm \
--with-psm=/usr \

commit mvapich2 for openSUSE:Factory

2018-06-20 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2018-06-20 15:30:02

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new (New)


Package is "mvapich2"

Wed Jun 20 15:30:02 2018 rev:9 rq:617508 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2018-03-28 
10:31:46.876182777 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new/mvapich2.changes   2018-06-20 
15:31:09.458510114 +0200
@@ -1,0 +2,10 @@
+Mon Jun 18 13:12:15 UTC 2018 - nmoreychaisemar...@suse.com
+
+- Add missing bsc and fate references to changelog
+
+---
+Tue Jun 12 07:07:37 UTC 2018 - nmoreychaisemar...@suse.com
+
+- Disable HPC builds for SLE12 (fate#323655) 
+
+---
@@ -72 +82 @@
-  at the same time
+  at the same time (bsc#934090)
@@ -182 +192 @@
-- Update to version 2.2rc1. Changes since 2.1:
+- Update to version 2.2rc1 (fate#319240). Changes since 2.1:



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.QJryLD/_old  2018-06-20 15:31:10.746463385 +0200
+++ /var/tmp/diff_new_pack.QJryLD/_new  2018-06-20 15:31:10.750463240 +0200
@@ -144,6 +144,13 @@
 %global hpc_mvapich2_pack_version %{hpc_mvapich2_dep_version}
 %endif
 
+# Disable hpc builds for SLE12
+%if 0%{?sle_version} > 120200 && 0%{?sle_version} < 15 && %{with hpc}
+%{bcond_with skip_hpc_build}
+%else
+%{bcond_without skip_hpc_build}
+%endif
+
 Name:   %{package_name}
 Summary:OSU MVAPICH2 MPI package
 License:BSD-3-Clause
@@ -160,6 +167,11 @@
 Patch2: mvapich2-arm-support.patch
 Url:http://mvapich.cse.ohio-state.edu/overview/mvapich2/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+
+%if %{without skip_hpc_build}
+ExclusiveArch:  do_not_build
+%endif
+
 BuildRequires:  autoconf
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -181,11 +193,11 @@
 BuildRequires:  lua-lmod
 BuildRequires:  suse-hpc
 %endif
-%if "%{build_flavor}" == "psm"
+%if "%{build_flavor}" == "psm" && %{with skip_hpc_build}
 ExclusiveArch:  %ix86 x86_64
 BuildRequires:  infinipath-psm-devel
 %endif
-%if "%{build_flavor}" == "psm2"
+%if "%{build_flavor}" == "psm2" && %{with skip_hpc_build}
 ExclusiveArch:  x86_64
 BuildRequires:  libpsm2-devel
 %endif

commit mvapich2 for openSUSE:Factory

2018-03-28 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2018-03-28 10:31:35

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new (New)


Package is "mvapich2"

Wed Mar 28 10:31:35 2018 rev:8 rq:591117 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2018-02-10 
17:58:39.667059421 +0100
+++ /work/SRC/openSUSE:Factory/.mvapich2.new/mvapich2.changes   2018-03-28 
10:31:46.876182777 +0200
@@ -1,0 +2,6 @@
+Sun Mar 25 13:07:18 UTC 2018 - kasim...@outlook.de
+
+- Change mvapich2-arm-support.patch to provide missing functions for
+  armv6hl
+
+---



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.oTmPqX/_old  2018-03-28 10:31:48.644119194 +0200
+++ /var/tmp/diff_new_pack.oTmPqX/_new  2018-03-28 10:31:48.668118330 +0200
@@ -165,7 +165,7 @@
 BuildRequires:  automake
 BuildRequires:  automake
 BuildRequires:  bison
-%ifnarch s390 s390x armv7hl
+%ifnarch s390 s390x %{arm}
 BuildRequires:  libnuma-devel
 %endif
 BuildRequires:  libtool

++ mvapich2-arm-support.patch ++
--- /var/tmp/diff_new_pack.oTmPqX/_old  2018-03-28 10:31:48.86838 +0200
+++ /var/tmp/diff_new_pack.oTmPqX/_new  2018-03-28 10:31:48.86838 +0200
@@ -6,7 +6,7 @@
  asm volatile ("mov %0=ar.itc" : "=r" (ret));
  return ret;
  }
-+#elif defined(__ARM_ARCH_7A__)
++#elif defined(__ARM_ARCH_7A__) || defined(__arm__)
 +typedef unsigned long long cycles_t;
 +static inline cycles_t get_cycles(void)
 +{

commit mvapich2 for openSUSE:Factory

2018-02-10 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2018-02-10 17:58:36

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new (New)


Package is "mvapich2"

Sat Feb 10 17:58:36 2018 rev:7 rq:574675 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2018-01-31 
19:54:47.993362618 +0100
+++ /work/SRC/openSUSE:Factory/.mvapich2.new/mvapich2.changes   2018-02-10 
17:58:39.667059421 +0100
@@ -1,0 +2,5 @@
+Fri Feb  9 11:29:26 UTC 2018 - cg...@suse.com
+
+- Fix summary in module files (bnc#1080259)
+
+---



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.c1yIVR/_old  2018-02-10 17:58:40.783019022 +0100
+++ /var/tmp/diff_new_pack.c1yIVR/_new  2018-02-10 17:58:40.787018878 +0100
@@ -391,7 +391,7 @@
 module-whatis "Name: %{pname} built with %{compiler_family} toolchain"
 module-whatis "Version: %{version}"
 module-whatis "Category: runtime library"
-module-whatis "Description: %{summary}"
+module-whatis "Description: %{SUMMARY:0}"
 module-whatis "URL: %{url}"
 
 set version %{version}

commit mvapich2 for openSUSE:Factory

2018-01-31 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2018-01-31 19:54:47

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new (New)


Package is "mvapich2"

Wed Jan 31 19:54:47 2018 rev:6 rq:571425 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2018-01-09 
14:54:43.311502425 +0100
+++ /work/SRC/openSUSE:Factory/.mvapich2.new/mvapich2.changes   2018-01-31 
19:54:47.993362618 +0100
@@ -1,0 +2,6 @@
+Tue Jan 30 20:04:01 UTC 2018 - e...@suse.com
+
+- Use macro in mpivars.(c)sh to be independent of changes to the module
+  setup for the compiler (boo#1078364).
+
+---



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.t7cfA6/_old  2018-01-31 19:54:49.061312951 +0100
+++ /var/tmp/diff_new_pack.t7cfA6/_new  2018-01-31 19:54:49.077312207 +0100
@@ -406,9 +406,13 @@
 family "MPI"
 EOF
 cat <  %{buildroot}/%{p_bindir}/mpivars.sh
-module load %{hpc_compiler_family}/%{hpc_cf_full_version} 
%{hpc_mpi_family}%{?pack_suff}/%{version}
+%hpc_setup_compiler
+module load %{hpc_mpi_family}%{?pack_suff}/%{version}
 EOF
-ln -s mpivars.sh %{buildroot}/%{p_bindir}/mpivars.csh
+sed -e "s/export/setenv/" -e "s/=/ /" \
+%{buildroot}/%{p_bindir}/mpivars.sh > \
+%{buildroot}/%{p_bindir}/mpivars.csh
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
 
 %endif # with hpc

commit mvapich2 for openSUSE:Factory

2018-01-09 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2018-01-09 14:54:42

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new (New)


Package is "mvapich2"

Tue Jan  9 14:54:42 2018 rev:5 rq:562439 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2017-10-07 
17:52:04.959566126 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new/mvapich2.changes   2018-01-09 
14:54:43.311502425 +0100
@@ -1,0 +2,6 @@
+Fri Jan  5 19:03:44 UTC 2018 - e...@suse.com
+
+- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES.
+- Fix library package requires - use HPC macro (boo#1074890).
+
+---



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.RWuzUE/_old  2018-01-09 14:54:44.207460424 +0100
+++ /var/tmp/diff_new_pack.RWuzUE/_new  2018-01-09 14:54:44.207460424 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package mvapich2
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -85,30 +85,30 @@
 %{bcond_without hpc}
 %endif
 
-%if "%flavor" == "gnu6-hpc"
+%if "%flavor" == "gnu7-hpc"
 %define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
 %define build_flavor verbs
 %{bcond_without hpc}
 %endif
-%if "%flavor" == "gnu6-hpc-testsuite"
+%if "%flavor" == "gnu7-hpc-testsuite"
 %define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
 %define testsuite 1
 %define build_flavor verbs
 %{bcond_without hpc}
 %endif
 
-%if "%flavor" == "gnu6-hpc-psm"
+%if "%flavor" == "gnu7-hpc-psm"
 %define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
 %define build_flavor psm
 %{bcond_without hpc}
 %endif
 
-%if "%flavor" == "gnu6-hpc-psm2"
+%if "%flavor" == "gnu7-hpc-psm2"
 %define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
 %define build_flavor psm2
 %{bcond_without hpc}
 %endif
@@ -202,7 +202,7 @@
 %if %{without hpc}
 Requires:   mpi-selector
 %else
-Requires:   lua-lmod
+%hpc_requires
 %endif
 
 %description

commit mvapich2 for openSUSE:Factory

2017-10-07 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2017-10-07 17:51:51

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new (New)


Package is "mvapich2"

Sat Oct  7 17:51:51 2017 rev:4 rq:532252 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2017-09-12 
19:57:59.389185180 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new/mvapich2.changes   2017-10-07 
17:52:04.959566126 +0200
@@ -1,0 +2,16 @@
+Fri Oct  6 14:06:37 UTC 2017 - nmoreychaisemar...@suse.com
+
+- Add conflicts between the macros-devel packages
+
+---
+Thu Oct  5 13:30:48 UTC 2017 - nmoreychaisemar...@suse.com
+
+- Add BuildRequires to libibmad-devel for older release (SLE <= 12.2, Leap <= 
42.2)
+
+---
+Fri Sep 12 15:38:14 UTC 2017 - e...@suse.com
+
+- Add HPC specific build targets using environment modules
+  (FATE#321712).
+
+---

New:

  macros.hpc-mvapich2



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.ugHl6d/_old  2017-10-07 17:52:08.315418597 +0200
+++ /var/tmp/diff_new_pack.ugHl6d/_new  2017-10-07 17:52:08.347417190 +0200
@@ -16,54 +16,145 @@
 #
 
 
-%global flavor @BUILD_FLAVOR@%nil
+%global flavor @BUILD_FLAVOR@%{nil}
+
+%define pname mvapich2
+%define vers  2.2
+%define _vers 2_2
 
 %if "%{flavor}" == ""
+ExclusiveArch:  do_not_build
+%{bcond_with hpc}
+%endif
+
+%if "%{flavor}" == "standard"
 %define build_flavor verbs
+%{bcond_with hpc}
 %endif
 %if "%{flavor}" == "testsuite"
 %define build_flavor verbs
 %define testsuite 1
+%{bcond_with hpc}
 %endif
 
 %if "%{flavor}" == "psm"
 %define build_flavor psm
+%{bcond_with hpc}
 %endif
 %if "%{flavor}" == "psm-testsuite"
 %define build_flavor psm
 %define testsuite 1
+%{bcond_with hpc}
 %endif
 
 %if "%{flavor}" == "psm2"
 %define build_flavor psm2
+%{bcond_with hpc}
 %endif
 %if "%{flavor}" == "psm2-testsuite"
 %define build_flavor psm2
 %define testsuite 1
+%{bcond_with hpc}
 %endif
 
-%if "%{flavor}" != ""
-%define pack_suff -%{flavor}
-%else
-%define pack_suff %{nil}
+%if "%flavor" == "gnu-hpc"
+%define compiler_family gnu
+%undefine c_f_ver
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+%if "%flavor" == "gnu-hpc-testsuite"
+%define compiler_family gnu
+%undefine c_f_ver
+%define testsuite 1
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu-hpc-psm"
+%define compiler_family gnu
+%undefine c_f_ver
+%define build_flavor psm
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu-hpc-psm2"
+%define compiler_family gnu
+%undefine c_f_ver
+%define build_flavor psm2
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu6-hpc"
+%define compiler_family gnu
+%define c_f_ver 6
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+%if "%flavor" == "gnu6-hpc-testsuite"
+%define compiler_family gnu
+%define c_f_ver 6
+%define testsuite 1
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu6-hpc-psm"
+%define compiler_family gnu
+%define c_f_ver 6
+%define build_flavor psm
+%{bcond_without hpc}
 %endif
 
-%define module_name mvapich2%{pack_suff}
-%define _prefix /usr/%_lib/mpi/gcc/%{module_name}
-%define _libexecdir %{_prefix}/%{_lib}
-%define _benchmarkdir %{_libexecdir}/osu-micro-benchmarks
+%if "%flavor" == "gnu6-hpc-psm2"
+%define compiler_family gnu
+%define c_f_ver 6
+%define build_flavor psm2
+%{bcond_without hpc}
+%endif
+
+%if "%{build_flavor}" != "verbs"
+%define pack_suff %{?build_flavor:-%{build_flavor}}
+%endif
+
+%if %{without hpc}
+%define module_name mvapich2%{?pack_suff}
+%define p_prefix /usr/%_lib/mpi/gcc/%{module_name}
+%define p_bindir  %{p_prefix}/bin
+%define p_datadir %{p_prefix}/share
+%define p_includedir %{p_prefix}/include
+%define p_mandir  %{p_datadir}/man
+%define p_libdir  %{p_prefix}/%{_lib}
+%define p_libexecdir %{p_prefix}/%{_lib}
 %define _moduledir /usr/share/modules/gnu-%{module_name}
+%define package_name mvapich2%{?pack_suff}
+%else
+%{hpc_init -M -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} -m mvapich2 
%{?pack_suff:-e %{build_flavor}}}
+%define p_prefix   %{hpc_prefix}
+%define p_bindir   %{hpc_bindir}
+%define p_datadir  %{hpc_datadir}
+%define p_includedir  %{hpc_includedir}
+%define p_mandir   %{hpc_mandir}
+%define p_libdir   %{hpc_libdir}
+%define p_libexecdir  %{hpc_libexecdir}
+%define package_name %{hpc_package_name %{_vers}}
+
+%global hpc_mvapich2_dep_version %(VER=%{?m_f_ver}; echo -n ${VER})
+%global hpc_mvapich2_dir mvapich2
+%global hpc_mvapich2_pack_version %{

commit mvapich2 for openSUSE:Factory

2017-09-12 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2017-09-12 19:57:58

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new (New)


Package is "mvapich2"

Tue Sep 12 19:57:58 2017 rev:3 rq:523634 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2017-08-10 
14:11:39.488212965 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new/mvapich2.changes   2017-09-12 
19:57:59.389185180 +0200
@@ -1,0 +2,13 @@
+Tue Sep 12 09:25:01 UTC 2017 - nmoreychaisemar...@suse.com
+
+- Drop unnecessary dependency to xorg-x11-devel
+
+---
+Mon Sep 11 09:19:37 UTC 2017 - nmoreychaisemar...@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
+
+---



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.bt2oVR/_old  2017-09-12 19:58:00.437037841 +0200
+++ /var/tmp/diff_new_pack.bt2oVR/_new  2017-09-12 19:58:00.441037279 +0200
@@ -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:  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
@@ -68,15 +84,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,15 +111,17 @@
 Summary:OSU MVAPICH2 MPI package
 Group:  Development/Libraries/Parallel
 Requires:   %{name} = %{version}
-Requires:   libibumad-devel
-Requires:   libibverbs-devel
-Requires:   librdmacm-devel
-%if "%{flavor}" == "psm"
+%if "%{build_flavor}" == "psm"
 Requires:   infinipath-psm-devel
 %endif
-%if "%{flavor}" == "psm2"
+%if "%{build_flavor}" == "psm2"
 Requires:   libpsm2-devel
 %endif
+%if "%{build_flavor}" == "verbs"
+Requires:   libibumad-devel
+Requires:   libibverbs-devel
+Requires:   librdmacm-devel
+%endif
 
 %description devel
 This is an MPI-2 implementation which includes all MPI-1 features.  It
@@ -128,11 +151,11 @@
 #./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

++ _multibuild ++
--- /var/tmp/diff_new_pack.bt2oVR/_old  2017-09-12 19:58:00.473032780 +0200
+++ /var/tmp/diff_new_pack.bt2oVR/_new  2017-09-12 19:58:00.477032218 +0200
@@ -1,5 +1,7 @@
 
   testsuite
   psm
+  psm-testsuite
   psm2
+  psm2-testsuite

commit mvapich2 for openSUSE:Factory

2017-08-10 Thread root 
Hello community,

here is the log from the commit of package mvapich2 for openSUSE:Factory 
checked in at 2017-08-10 14:03:05

Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
 and  /work/SRC/openSUSE:Factory/.mvapich2.new (New)


Package is "mvapich2"

Thu Aug 10 14:03:05 2017 rev:2 rq:510127 version:2.2

Changes:

--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes2017-07-07 
10:17:30.845937662 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new/mvapich2.changes   2017-08-10 
14:11:39.488212965 +0200
@@ -1,0 +2,10 @@
+Thu Jul 13 14:59:13 UTC 2017 - nmoreychaisemar...@suse.com
+
+- Add LD_LIBRARY_PATH to mpivars.sh and mpivars.csh
+
+---
+Thu Jul 13 07:54:38 UTC 2017 - nmoreychaisemar...@suse.com
+
+- Disable rpath in pkgconfig files
+
+---



Other differences:
--
++ mvapich2.spec ++
--- /var/tmp/diff_new_pack.XovE5b/_old  2017-08-10 14:11:40.644050227 +0200
+++ /var/tmp/diff_new_pack.XovE5b/_new  2017-08-10 14:11:40.656048538 +0200
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %global flavor @BUILD_FLAVOR@%nil
 
 %if "%{flavor}" != ""
@@ -126,6 +127,7 @@
 %build
 #./autogen.sh
 %configure \
+   --disable-wrapper-rpath  \
 %if "%{flavor}" == "psm"
--with-device=ch3:psm \
--with-psm=/usr \
@@ -145,8 +147,8 @@
 %install
 make DESTDIR=%{buildroot} V=1 install
 # make and install mpivars files
-sed 's,prefix,%_prefix,g' %{S:1} > %{buildroot}%{_bindir}/mpivars.sh
-sed 's,prefix,%_prefix,g' %{S:2} > %{buildroot}%{_bindir}/mpivars.csh
+sed -e 's,prefix,%_prefix,g' -e 's,libdir,%{_libdir},g' %{S:1} > 
%{buildroot}%{_bindir}/mpivars.sh
+sed -e 's,prefix,%_prefix,g' -e 's,libdir,%{_libdir},g' %{S:2} > 
%{buildroot}%{_bindir}/mpivars.csh
 rm -f %{buildroot}%{_libdir}/libfmpich.la \
   %{buildroot}%{_libdir}/libmpich.la \
   %{buildroot}%{_libdir}/libmpichcxx.la \

++ mpivars.csh ++
--- /var/tmp/diff_new_pack.XovE5b/_old  2017-08-10 14:11:40.808027140 +0200
+++ /var/tmp/diff_new_pack.XovE5b/_new  2017-08-10 14:11:40.808027140 +0200
@@ -7,3 +7,9 @@
 else
 setenv MANPATH prefix/man:
 endif
+
+if ($?LD_LIBRARY_PATH) then
+setenv LD_LIBRARY_PATH libdir:$LD_LIBRARY_PATH
+else
+setenv LD_LIBRARY_PATH libdir
+endif

++ mpivars.sh ++
--- /var/tmp/diff_new_pack.XovE5b/_old  2017-08-10 14:11:40.892015315 +0200
+++ /var/tmp/diff_new_pack.XovE5b/_new  2017-08-10 14:11:40.892015315 +0200
@@ -13,4 +13,19 @@
 ;;
 *)
 MANPATH=prefix/share/man:$MANPATH
+export MANPATH
+esac
+
+
+case $LD_LIBRARY_PATH in
+*libdir*)
+true
+;;
+*)
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  LD_LIBRARY_PATH=libdir
+else
+  LD_LIBRARY_PATH="libdir:$LD_LIBRARY_PATH"
+fi
+export LD_LIBRARY_PATH
 esac