[adios] 22/207: Add mpi_in_place patch

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository adios.

commit e193561920ccb5f4a6fc0d9cec0ef1276e4bd2f3
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Aug 15 13:48:16 2011 +0100

    Add mpi_in_place patch
---
 debian/patches/mpi_in_place.patch | 93 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 2 files changed, 94 insertions(+)

diff --git a/debian/patches/mpi_in_place.patch b/debian/patches/mpi_in_place.patch
new file mode 100644
index 0000000..c7760bf
--- /dev/null
+++ b/debian/patches/mpi_in_place.patch
@@ -0,0 +1,93 @@
+Description: LAM MPI does not have MPI_IN_PLACE, so make its use optional.
+Author: Alastair McKinstry <mckinstry at debian.org>
+Last-Updated: 2011-08-15
+Forwarded: no
+
+Index: adios-1.3/src/adios_mpi.c
+===================================================================
+--- adios-1.3.orig/src/adios_mpi.c	2011-08-15 13:16:06.000000000 +0100
++++ adios-1.3/src/adios_mpi.c	2011-08-15 13:21:50.000000000 +0100
+@@ -527,7 +527,11 @@
+                                     + last_offset;
+ #endif
+             MPI_Scatter (offsets, 1, MPI_LONG_LONG
++#ifdef MPI_IN_PLACE
+                         ,MPI_IN_PLACE, 1, MPI_LONG_LONG
++#else
++			,offsets, 1, MPI_LONG_LONG
++#endif
+                         ,0, md->group_comm
+                         );
+             fd->base_offset = offsets [0];
+@@ -540,11 +544,18 @@
+             offset[0] = fd->write_size_bytes;
+ 
+             MPI_Gather (offset, 1, MPI_LONG_LONG
++#ifdef MPI_IN_PLACE
+                        ,0, 0, 0
++#else
++     		       ,offset, 1, MPI_LONG_LONG
++#endif
+                        ,0, md->group_comm
+                        );
+-
++#ifdef MPI_IN_PLACE
+             MPI_Scatter (0, 0, 0
++#else
++            MPI_Scatter (offset, 1, MPI_LONG_LONG
++#endif
+                         ,offset, 1, MPI_LONG_LONG
+                         ,0, md->group_comm
+                         );
+@@ -758,7 +769,11 @@
+                                   ,fd->group->name, md->old_pg_root
+                                   );
+                     MPI_Scatter (offsets, 3, MPI_LONG_LONG
++#ifdef MPI_IN_PLACE
+                                 ,MPI_IN_PLACE, 3, MPI_LONG_LONG
++#else
++				,offsets, 3, MPI_LONG_LONG
++#endif
+                                 ,0, md->group_comm
+                                 );
+                     md->b.read_pg_offset = offsets [0];
+@@ -770,7 +785,11 @@
+                     MPI_Offset offset [3];
+                     offset [0] = offset [1] = offset [2] = 0;
+ 
++#ifdef MPI_IN_PLACE
+                     MPI_Scatter (0, 0, 0
++#else
++                    MPI_Scatter (offset, 3, MPI_LONG_LONG
++#endif
+                                 ,offset, 3, MPI_LONG_LONG
+                                 ,0, md->group_comm
+                                 );
+Index: adios-1.3/src/adios_mpi_amr.c
+===================================================================
+--- adios-1.3.orig/src/adios_mpi_amr.c	2011-08-15 13:28:03.000000000 +0100
++++ adios-1.3/src/adios_mpi_amr.c	2011-08-15 13:29:01.000000000 +0100
+@@ -1345,7 +1345,11 @@
+                     else
+                         offsets [0] = fd->write_size_bytes;
+ 
++#ifdef MPI_IN_PLACE
+                     MPI_Gather (MPI_IN_PLACE, 1, MPI_LONG_LONG
++#else
++                    MPI_Gather (offsets, 1, MPI_LONG_LONG
++#endif
+                                ,offsets, 1, MPI_LONG_LONG
+                                ,0, md->group_comm
+                                );
+@@ -1361,7 +1365,11 @@
+                     md->b.pg_index_offset =   offsets [md->size - 1]
+                                             + last_offset;
+                     MPI_Scatter (offsets, 1, MPI_LONG_LONG
++#ifdef MPI_IN_PLACE
+                                 ,MPI_IN_PLACE, 1, MPI_LONG_LONG
++#else
++				,offsets, 1, MPI_LONG_LONG
++#endif
+                                 ,0, md->group_comm
+                                 );
+                     fd->base_offset = offsets [0];
diff --git a/debian/patches/series b/debian/patches/series
index 10fb305..300be30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 sh4.patch
+mpi_in_place.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git