| 1 |
commit: 19263a1bb7b8526d72fc9bc400bd40e13f0163ef |
| 2 |
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 10 02:58:48 2012 +0000 |
| 4 |
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 10 02:59:26 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=19263a1b |
| 7 |
|
| 8 |
Drop failing tests for now, fix #393361 |
| 9 |
|
| 10 |
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 4D7043C9) |
| 11 |
|
| 12 |
--- |
| 13 |
sys-cluster/mpich2/ChangeLog | 4 ++ |
| 14 |
sys-cluster/mpich2/files/mpich2-hvector.patch | 63 +++++++++++++++++++++++++ |
| 15 |
sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild | 11 ++++ |
| 16 |
3 files changed, 78 insertions(+), 0 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog |
| 19 |
index 388a63e..c117ec7 100644 |
| 20 |
--- a/sys-cluster/mpich2/ChangeLog |
| 21 |
+++ b/sys-cluster/mpich2/ChangeLog |
| 22 |
@@ -2,6 +2,10 @@ |
| 23 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 10 Jan 2012; Justin Bronder <jsbronder@g.o> |
| 27 |
+ +files/mpich2-hvector.patch, mpich2-1.4.1_p1.ebuild: |
| 28 |
+ Drop failing tests for now, fix #393361 |
| 29 |
+ |
| 30 |
*mpich2-1.4.1_p1 (10 Jan 2012) |
| 31 |
|
| 32 |
10 Jan 2012; Justin Bronder <jsbronder@g.o> -mpich2-1.4_rc2-r1.ebuild, |
| 33 |
|
| 34 |
diff --git a/sys-cluster/mpich2/files/mpich2-hvector.patch b/sys-cluster/mpich2/files/mpich2-hvector.patch |
| 35 |
new file mode 100644 |
| 36 |
index 0000000..9d67561 |
| 37 |
--- /dev/null |
| 38 |
+++ b/sys-cluster/mpich2/files/mpich2-hvector.patch |
| 39 |
@@ -0,0 +1,63 @@ |
| 40 |
+--- src/binding/f90/buildiface 2011-12-06 09:57:04.000000000 +0100 |
| 41 |
++++ src/binding/f90/buildiface 2011-12-06 09:57:54.000000000 +0100 |
| 42 |
+@@ -117,9 +117,13 @@ |
| 43 |
+ 'Type_hindexed-3' => 'int[]', |
| 44 |
+ 'Type_indexed-2' => 'int[]', |
| 45 |
+ 'Type_indexed-3' => 'int[]', |
| 46 |
++ 'Type_hvector-3' => 'int', |
| 47 |
+ 'Type_struct-2' => 'int[]', |
| 48 |
+ 'Type_struct-3' => 'int[]', |
| 49 |
+ 'Type_struct-4' => 'MPI_Datatype[]', |
| 50 |
++ 'Type_extent-2' => 'int', |
| 51 |
++ 'Type_lb-2' => 'int', |
| 52 |
++ 'Type_ub-2' => 'int', |
| 53 |
+ 'Waitall-2' => 'MPI_Request[]', |
| 54 |
+ 'Waitall-3' => 'MPI_Status[]', |
| 55 |
+ 'Waitany-2' => 'MPI_Request[]', |
| 56 |
+--- src/binding/f90/mpi_base.f90.in 2011-12-06 09:58:42.000000000 +0100 |
| 57 |
++++ src/binding/f90/mpi_base.f90.in 2011-12-06 10:00:30.000000000 +0100 |
| 58 |
+@@ -15,9 +15,7 @@ |
| 59 |
+ END SUBROUTINE MPI_COMM_FREE_KEYVAL |
| 60 |
+ |
| 61 |
+ SUBROUTINE MPI_TYPE_EXTENT(v0,v1,ierror) |
| 62 |
+- USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND |
| 63 |
+- INTEGER v0 |
| 64 |
+- INTEGER(KIND=MPI_ADDRESS_KIND) v1 |
| 65 |
++ INTEGER v0, v1 |
| 66 |
+ INTEGER ierror |
| 67 |
+ END SUBROUTINE MPI_TYPE_EXTENT |
| 68 |
+ |
| 69 |
+@@ -114,9 +112,7 @@ |
| 70 |
+ END SUBROUTINE MPI_OP_COMMUTATIVE |
| 71 |
+ |
| 72 |
+ SUBROUTINE MPI_TYPE_LB(v0,v1,ierror) |
| 73 |
+- USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND |
| 74 |
+- INTEGER v0 |
| 75 |
+- INTEGER(KIND=MPI_ADDRESS_KIND) v1 |
| 76 |
++ INTEGER v0, v1 |
| 77 |
+ INTEGER ierror |
| 78 |
+ END SUBROUTINE MPI_TYPE_LB |
| 79 |
+ |
| 80 |
+@@ -562,9 +558,7 @@ |
| 81 |
+ END SUBROUTINE MPI_TYPE_CREATE_RESIZED |
| 82 |
+ |
| 83 |
+ SUBROUTINE MPI_TYPE_UB(v0,v1,ierror) |
| 84 |
+- USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND |
| 85 |
+- INTEGER v0 |
| 86 |
+- INTEGER(KIND=MPI_ADDRESS_KIND) v1 |
| 87 |
++ INTEGER v0, v1 |
| 88 |
+ INTEGER ierror |
| 89 |
+ END SUBROUTINE MPI_TYPE_UB |
| 90 |
+ |
| 91 |
+@@ -822,10 +816,7 @@ |
| 92 |
+ END SUBROUTINE MPI_GET_VERSION |
| 93 |
+ |
| 94 |
+ SUBROUTINE MPI_TYPE_HVECTOR(v0,v1,v2,v3,v4,ierror) |
| 95 |
+- USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND |
| 96 |
+- INTEGER v0, v1 |
| 97 |
+- INTEGER(KIND=MPI_ADDRESS_KIND) v2 |
| 98 |
+- INTEGER v3, v4 |
| 99 |
++ INTEGER v0, v1, v2, v3, v4 |
| 100 |
+ INTEGER ierror |
| 101 |
+ END SUBROUTINE MPI_TYPE_HVECTOR |
| 102 |
+ |
| 103 |
|
| 104 |
diff --git a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild |
| 105 |
index d60b492..ab5e26a 100644 |
| 106 |
--- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild |
| 107 |
+++ b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild |
| 108 |
@@ -74,6 +74,10 @@ src_prepare() { |
| 109 |
|
| 110 |
# 369263 and 1500 upstream. |
| 111 |
epatch "${FILESDIR}"/fix-pkg-config-files.patch |
| 112 |
+ |
| 113 |
+ # 393361, backport of r8809 upstream. |
| 114 |
+ epatch "${FILESDIR}"/mpich2-hvector.patch |
| 115 |
+ |
| 116 |
AT_M4DIR="${S}"/confdb eautoreconf || die |
| 117 |
} |
| 118 |
|
| 119 |
@@ -138,6 +142,13 @@ src_test() { |
| 120 |
sed -i '/^[# ]*bcastlength/d' test/mpi/errors/coll/testlist || die |
| 121 |
sed -i '/^[# ]*non_zero_root/d' test/mpi/perf/testlist || die |
| 122 |
|
| 123 |
+ # Failing tests based on requiring MPI_THREAD_MULTIPLE. |
| 124 |
+ sed -i \ |
| 125 |
+ -e '/^[# ]*pt2pt/d' \ |
| 126 |
+ -e '/^[# ]*comm/d' \ |
| 127 |
+ -e '/^[# ]*spawn/d' \ |
| 128 |
+ test/mpi/threads/testlist || die |
| 129 |
+ |
| 130 |
emake -j1 \ |
| 131 |
CC="${S}"/bin/mpicc \ |
| 132 |
CXX="${S}"/bin/mpicxx \ |
Archives