[adios] 50/207: WIP: Update patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository adios.
commit 25216292b4e88375c1e1924e335a967c67b5c69f
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Apr 10 11:38:16 2013 +0100
WIP: Update patches
---
debian/patches/mpi_in_place.patch | 114 +++++---------------------------------
debian/patches/series | 4 +-
debian/patches/sh4.patch | 16 +++---
3 files changed, 23 insertions(+), 111 deletions(-)
diff --git a/debian/patches/mpi_in_place.patch b/debian/patches/mpi_in_place.patch
index e7e302c..7426369 100644
--- a/debian/patches/mpi_in_place.patch
+++ b/debian/patches/mpi_in_place.patch
@@ -1,101 +1,13 @@
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-16
+Last-Updated: 2013-04-10
Forwarded: no
-Index: adios-1.3/src/adios_mpi.c
+Index: adios-1.4.1/src/write/adios_mpi_lustre.c
===================================================================
---- 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
- 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 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;
-
-+#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];
-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 @@
+--- adios-1.4.1.orig/src/write/adios_mpi_lustre.c 2013-04-08 19:30:12.000000000 +0100
++++ adios-1.4.1/src/write/adios_mpi_lustre.c 2013-04-10 11:24:30.000000000 +0100
+@@ -842,7 +842,11 @@
,fd->group->name, md->old_pg_root
);
MPI_Scatter (offsets, 3, MPI_LONG_LONG
@@ -107,31 +19,31 @@ Index: adios-1.3/src/adios_mpi_lustre.c
,0, md->group_comm
);
md->b.read_pg_offset = offsets [0];
-@@ -899,7 +903,11 @@
+@@ -936,7 +940,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
++ MPI_Gather (offsets, 1, MPI_LONG_LONG
+#endif
,offsets, 1, MPI_LONG_LONG
,0, md->group_comm
);
-@@ -922,7 +930,11 @@
+@@ -959,7 +967,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
++ ,offsets, 1, MPI_LONG_LONG
+#endif
,0, md->group_comm
);
fd->base_offset = offsets [0];
-@@ -1201,7 +1213,11 @@
+@@ -1238,7 +1250,11 @@
else
offsets [0] = fd->write_size_bytes;
@@ -143,14 +55,14 @@ Index: adios-1.3/src/adios_mpi_lustre.c
,offsets, 1, MPI_LONG_LONG
,0, md->group_comm
);
-@@ -1217,7 +1233,11 @@
+@@ -1254,7 +1270,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
++ ,offsets, 1, MPI_LONG_LONG
+#endif
,0, md->group_comm
);
diff --git a/debian/patches/series b/debian/patches/series
index cf6cb92..a92f6e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
sh4.patch
mpi_in_place.patch
-nompi_flag.patch
+# nompi_flag.patch
security.patch
-errno.patch
+# errno.patch
netcdf-fix.patch
diff --git a/debian/patches/sh4.patch b/debian/patches/sh4.patch
index 23bfbdd..e966ba2 100644
--- a/debian/patches/sh4.patch
+++ b/debian/patches/sh4.patch
@@ -5,16 +5,16 @@ Forwarded: not-needed
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Last-Updated: 2011-08-09
-diff --git a/configure b/configure
-index 62d29ed..e9b19b2 100755
---- a/configure
-+++ b/configure
-@@ -6096,7 +6096,7 @@ fi
-
+Index: adios-1.4.1/configure
+===================================================================
+--- adios-1.4.1.orig/configure 2013-04-08 19:30:42.000000000 +0100
++++ adios-1.4.1/configure 2013-04-08 19:31:18.000000000 +0100
+@@ -7111,7 +7111,7 @@
+
;;
# Ignore these flags.
-- -lang* | -lcrt[01].o | -lcrtbegin.o | -lc | -lgcc | -libmil | -LANG:=*)
-+ -lang* | -lcrt[01].o | -lcrtbegin.o | -lc | -lgcc | -libmil | -little | -LANG:=*)
+- -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
++ -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -little | -LNO:*)
;;
-lkernel32)
test x"$CYGWIN" != xyes && ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git
More information about the debian-science-commits
mailing list