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

Accepting request 702623 from science:HPC

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/702623
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mvapich2?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2019-05-14 11:42:34 +00:00 committed by Git OBS Bridge
commit d4562e3827
8 changed files with 60 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0001-Drop-GCC-check.patch
View File

@ -1,7 +1,19 @@
diff -Nrua autogen.sh autogen.sh commit b609280fc0d0f0f5a728b08e874977cb16f921b8
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
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 <nmoreychaisemartin@suse.com>
diff --git autogen.sh autogen.sh
index a0b3d897d15b..f13f3ad543f0 100755
--- autogen.sh --- autogen.sh
+++ autogen.sh +++ autogen.sh
@@ -516,7 +516,7 @@ @@ -516,7 +516,7 @@ fi
echo_n "Checking for automake version... " echo_n "Checking for automake version... "
recreate_tmp recreate_tmp
@ -10,19 +22,20 @@ diff -Nrua autogen.sh autogen.sh
cat > .tmp/configure.ac<<EOF cat > .tmp/configure.ac<<EOF
AC_INIT(testver,1.0) AC_INIT(testver,1.0)
AC_CONFIG_AUX_DIR([m4]) AC_CONFIG_AUX_DIR([m4])
@@ -554,7 +554,7 @@ @@ -554,7 +554,7 @@ fi
echo_n "Checking for libtool version... " echo_n "Checking for libtool version... "
recreate_tmp recreate_tmp
-ver=2.4.3 -ver=2.4.4
+ver=2.4.2 +ver=2.4.2
cat <<EOF >.tmp/configure.ac cat <<EOF >.tmp/configure.ac
AC_INIT(testver,1.0) AC_INIT(testver,1.0)
AC_CONFIG_AUX_DIR([m4]) 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
+++ src/binding/cxx/buildiface +++ src/binding/cxx/buildiface
@@ -1454,21 +1454,6 @@ @@ -1454,21 +1454,6 @@ sub printDefineChecks {
#endif\n\n"; #endif\n\n";
} }

3
mvapich2-2.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:791a6fc2b23de63b430b3e598bf05b1b25b82ba8bf7e0622fc81ba593b3bb131
size 16422868

3
mvapich2-2.3.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:314e12829f75f3ed83cd4779a972572d1787aac6543a3d024ea7c6080e0ee3bf
size 16978520

29
mvapich2-arm-support.patch
View File

@ -1,28 +1,27 @@
commit 55640b711726705a0127eb7ce767ef69e7642790
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
Date: Thu Jun 8 15:14:01 2017 +0200
mvapich2 arm support
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
diff --git src/mpid/ch3/channels/common/include/mv2_clock.h src/mpid/ch3/channels/common/include/mv2_clock.h 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
+++ 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() @@ -92,7 +92,14 @@ static inline cycles_t get_cycles()
asm volatile ("mov %0=ar.itc" : "=r" (ret));
return ret; return ret;
} }
+#elif defined(__ARM_ARCH_7A__) || defined(__arm__) -
+#elif defined(__ARM_ARCH_7A__)
+typedef unsigned long long cycles_t; +typedef unsigned long long cycles_t;
+static inline cycles_t get_cycles(void) +static inline cycles_t get_cycles(void)
+{ +{
+ cycles_t clk; + cycles_t clk;
+ asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (clk)); + asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (clk));
+ return clk; + return clk;
+}
+#elif defined(__aarch64__)
+typedef unsigned long cycles_t;
+static inline cycles_t get_cycles()
+{
+ cycles_t cval;
+ asm volatile("isb" : : : "memory");
+ asm volatile("mrs %0, cntvct_el0" : "=r" (cval));
+ return cval;
+} +}
#elif defined(__s390__) || defined(__s390x__) #elif defined(__s390__) || defined(__s390x__)
typedef unsigned long cycles_t; typedef unsigned long cycles_t;

24
mvapich2-fix-double-free.patch
View File

@ -1,24 +0,0 @@
commit 02b05116e1586422a933c4a8f6d4e4d29d4e9531
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
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 <nmoreychaisemartin@suse.com>
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;
}

14
mvapich2-s390_get_cycles.patch
View File

@ -1,9 +1,17 @@
commit 92d5b11beaf8919979705f44d56eb0569feceb93
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
Date: Thu Jun 8 15:11:12 2017 +0200
mvapich2-s390_get_cycles
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
diff --git src/mpid/ch3/channels/common/include/mv2_clock.h src/mpid/ch3/channels/common/include/mv2_clock.h diff --git src/mpid/ch3/channels/common/include/mv2_clock.h src/mpid/ch3/channels/common/include/mv2_clock.h
index 7edc148..ac117c2 100644 index dba8e51bf129..af8bb2b77d08 100644
--- src/mpid/ch3/channels/common/include/mv2_clock.h --- src/mpid/ch3/channels/common/include/mv2_clock.h
+++ src/mpid/ch3/channels/common/include/mv2_clock.h +++ src/mpid/ch3/channels/common/include/mv2_clock.h
@@ -82,6 +82,14 @@ static inline cycles_t get_cycles() @@ -93,6 +93,14 @@ static inline cycles_t get_cycles()
return ret; return ret;
} }
+#elif defined(__s390__) || defined(__s390x__) +#elif defined(__s390__) || defined(__s390x__)

11
mvapich2.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon May 13 07:59:22 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
- 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
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 2 08:00:51 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> Thu May 2 08:00:51 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>

6
mvapich2.spec
View File

@ -19,8 +19,8 @@
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%define pname mvapich2 %define pname mvapich2
%define vers 2.2 %define vers 2.3.1
%define _vers 2_2 %define _vers 2_3_1
%if "%{flavor}" == "" %if "%{flavor}" == ""
ExclusiveArch: do_not_build ExclusiveArch: do_not_build
@ -167,7 +167,6 @@ Patch2: mvapich2-arm-support.patch
# PATCH-FIX-UPSTREAM 0001-Drop-GCC-check.patch (bnc#1129421) # PATCH-FIX-UPSTREAM 0001-Drop-GCC-check.patch (bnc#1129421)
# It's been merged upstream, should be removed with the next release # It's been merged upstream, should be removed with the next release
Patch3: 0001-Drop-GCC-check.patch Patch3: 0001-Drop-GCC-check.patch
Patch4: mvapich2-fix-double-free.patch
Url: http://mvapich.cse.ohio-state.edu/overview/mvapich2/ Url: http://mvapich.cse.ohio-state.edu/overview/mvapich2/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -298,7 +297,6 @@ is based on MPICH2 and MVICH. This package contains the static libraries
%patch0 %patch0
%patch2 %patch2
%patch3 %patch3
%patch4
cp /usr/share/automake*/config.* . cp /usr/share/automake*/config.* .
%build %build