[adios] 29/207: Add adios_mpi_lustre to 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 d46780d0ed1f7fe5eaad44479bd4c65750131e27
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Aug 16 09:57:51 2011 +0100

    Add adios_mpi_lustre to MPI_IN_PLACE patch
---
 debian/changelog                  |  7 ++++
 debian/patches/mpi_in_place.patch | 74 ++++++++++++++++++++++++++++++++++++---
 2 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63c127c..3dc1876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+adios (1.3-5) unstable; urgency=low
+
+  * MPI_IN_PLACE patch is needed for adiso_mpi_lustre.c too, even though
+   Lustre is not used in LAM environment. Sigh.  
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 16 Aug 2011 09:57:26 +0100
+
 adios (1.3-4) unstable; urgency=low
 
   * Patch to stop compilation with dummy MPI if real parallel HDF5 is used.
diff --git a/debian/patches/mpi_in_place.patch b/debian/patches/mpi_in_place.patch
index c7760bf..e7e302c 100644
--- a/debian/patches/mpi_in_place.patch
+++ b/debian/patches/mpi_in_place.patch
@@ -1,12 +1,12 @@
 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
+Last-Updated: 2011-08-16
 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
+--- adios-1.3.orig/src/adios_mpi.c	2011-08-15 17:58:18.000000000 +0100
++++ adios-1.3/src/adios_mpi.c	2011-08-15 17:58:23.000000000 +0100
 @@ -527,7 +527,11 @@
                                      + last_offset;
  #endif
@@ -65,8 +65,8 @@ Index: adios-1.3/src/adios_mpi.c
                                  );
 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
+--- adios-1.3.orig/src/adios_mpi_amr.c	2011-08-15 17:58:18.000000000 +0100
++++ adios-1.3/src/adios_mpi_amr.c	2011-08-15 17:58:23.000000000 +0100
 @@ -1345,7 +1345,11 @@
                      else
                          offsets [0] = fd->write_size_bytes;
@@ -91,3 +91,67 @@ Index: adios-1.3/src/adios_mpi_amr.c
                                  ,0, md->group_comm
                                  );
                      fd->base_offset = offsets [0];
+Index: adios-1.3/src/adios_mpi_lustre.c
+===================================================================
+--- adios-1.3.orig/src/adios_mpi_lustre.c	2011-08-16 06:16:33.000000000 +0100
++++ adios-1.3/src/adios_mpi_lustre.c	2011-08-16 06:19:11.000000000 +0100
+@@ -805,7 +805,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];
+@@ -899,7 +903,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
+                                );
+@@ -922,7 +930,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];
+@@ -1201,7 +1213,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
+                                );
+@@ -1217,7 +1233,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];

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