[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-225-g27f99ee
Service Account
noreply at mpich.org
Mon May 5 13:13:13 CDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via 27f99ee3363c938a56b7be935545c5355a051820 (commit)
via a628b40cbb45fa988084ed5fe0eee9c95485eba6 (commit)
via 9a8b370e83c4197cbb74f87b91f8bff3b4016fc3 (commit)
via 996cea52e28519bfa5e0a488729d90b8e99871b6 (commit)
via f824ab2249bae1995090c21a0fc07f69ed48288c (commit)
via 89e3557f91ceea8451b5161d9bc3532dc58e61aa (commit)
from ace448ad1eedaf98884eb2ea140b39b53919195b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/27f99ee3363c938a56b7be935545c5355a051820
commit 27f99ee3363c938a56b7be935545c5355a051820
Author: Rob Latham <robl at mcs.anl.gov>
Date: Fri May 2 10:08:05 2014 -0500
Make concurrent write the default for Panasas
MPI-IO presumes concurrent parallel access, so make that the default.
Applications in strange situations where an MPI-IO program is
manipulating a file while another program manipulates the file can
disable with a hint, but let's make the common, likely case fast.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c b/src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c
index 5690639..94178ab 100644
--- a/src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c
+++ b/src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c
@@ -25,6 +25,9 @@ void ADIOI_PANFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
*/
MPI_Info_create(&(fd->info));
+ /* anticipate concurrent writes in an MPI-IO application */
+ ADIOI_Info_set (fd->info, "panfs_concurrent_write", "1");
+
/* has user specified striping parameters
and do they have the same value on all processes? */
if (users_info != MPI_INFO_NULL) {
http://git.mpich.org/mpich.git/commitdiff/a628b40cbb45fa988084ed5fe0eee9c95485eba6
commit a628b40cbb45fa988084ed5fe0eee9c95485eba6
Author: Rob Latham <robl at mcs.anl.gov>
Date: Mon Apr 21 16:15:38 2014 -0500
slightly better checks for Panasas SDK
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/mpi/romio/adio/ad_panfs/Makefile.mk b/src/mpi/romio/adio/ad_panfs/Makefile.mk
index b7a1c78..68e92d5 100644
--- a/src/mpi/romio/adio/ad_panfs/Makefile.mk
+++ b/src/mpi/romio/adio/ad_panfs/Makefile.mk
@@ -7,10 +7,6 @@
if BUILD_AD_PANFS
-# I don't like this hard-coded path to the PANFS headers but I guess that's
-# where they always are?
-AM_CPPFLAGS += -I/opt/panfs/include
-
noinst_HEADERS += adio/ad_panfs/ad_panfs.h
romio_other_sources += \
diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac
index 0ecd41b..484556d 100644
--- a/src/mpi/romio/configure.ac
+++ b/src/mpi/romio/configure.ac
@@ -788,8 +788,14 @@ users manual for instructions on testing and if necessary fixing this])
fi
if test -n "$file_system_panfs"; then
- AC_DEFINE(ROMIO_PANFS,1,[Define for ROMIO with PANFS])
+ # TODO: are there ever any installations with the panfs SDK somewhere else?
+ CPPFLAGS="${CPPFLAGS} -I/opt/panfs/include"
+ AC_CHECK_HEADER(pan_fs_client_cw_mode.h,
+ AC_DEFINE(ROMIO_PANFS,1,[Define for ROMIO with PANFS]),
+ AC_MSG_ERROR([PANFS support requested but cannot find pan_fs_client_cw_mode.h header file])
+ )
fi
+
if test -n "$file_system_ufs"; then
AC_DEFINE(ROMIO_UFS,1,[Define for ROMIO with UFS])
fi
http://git.mpich.org/mpich.git/commitdiff/9a8b370e83c4197cbb74f87b91f8bff3b4016fc3
commit 9a8b370e83c4197cbb74f87b91f8bff3b4016fc3
Author: Rob Latham <robl at mcs.anl.gov>
Date: Mon Apr 21 16:12:54 2014 -0500
usleep available but not prototyped in strict mode
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/mpi/romio/adio/ad_panfs/ad_panfs.h b/src/mpi/romio/adio/ad_panfs/ad_panfs.h
index 00ffbef..5f13f64 100644
--- a/src/mpi/romio/adio/ad_panfs/ad_panfs.h
+++ b/src/mpi/romio/adio/ad_panfs/ad_panfs.h
@@ -37,6 +37,12 @@ void ADIOI_PANFS_WriteContig(ADIO_File fd, const void *buf, int count,
ADIO_Offset offset, ADIO_Status *status,
int *error_code);
+/* TODO: move this to common code and have all routines retry. */
+/* TODO: also check for EWOULDBLOCK */
+#if defined(NEEDS_USLEEP_DECL)
+int usleep(useconds_t usec);
+#endif
+
/* Delay 1 ms */
#define AD_PANFS_RETRY_DELAY 1000
diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac
index 874d382..0ecd41b 100644
--- a/src/mpi/romio/configure.ac
+++ b/src/mpi/romio/configure.ac
@@ -1657,6 +1657,12 @@ AC_CHECK_FUNCS(lseek64)
if test "$ac_cv_func_lseek64" = "yes" ; then
PAC_FUNC_NEEDS_DECL([#include <unistd.h>],lseek64)
fi
+
+AC_CHECK_FUNCS(usleep)
+if test "$ac_cv_func_usleep" = "yes" ; then
+ PAC_FUNC_NEEDS_DECL([#include <unistd.h>],usleep)
+fi
+
#
# Create the directory lists for the Makefile
FILE_SYS_DIRS=""
http://git.mpich.org/mpich.git/commitdiff/996cea52e28519bfa5e0a488729d90b8e99871b6
commit 996cea52e28519bfa5e0a488729d90b8e99871b6
Author: Rob Latham <robl at mcs.anl.gov>
Date: Mon Apr 21 15:56:10 2014 -0500
update panasas routines for const-ification
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/mpi/romio/adio/ad_panfs/ad_panfs.h b/src/mpi/romio/adio/ad_panfs/ad_panfs.h
index 6164e8e..00ffbef 100644
--- a/src/mpi/romio/adio/ad_panfs/ad_panfs.h
+++ b/src/mpi/romio/adio/ad_panfs/ad_panfs.h
@@ -32,7 +32,7 @@ void ADIOI_PANFS_ReadContig(ADIO_File fd, void *buf, int count,
ADIO_Offset offset, ADIO_Status *status,
int *error_code);
void ADIOI_PANFS_Resize(ADIO_File fd, ADIO_Offset size, int *error_code);
-void ADIOI_PANFS_WriteContig(ADIO_File fd, void *buf, int count,
+void ADIOI_PANFS_WriteContig(ADIO_File fd, const void *buf, int count,
MPI_Datatype datatype, int file_ptr_type,
ADIO_Offset offset, ADIO_Status *status,
int *error_code);
diff --git a/src/mpi/romio/adio/ad_panfs/ad_panfs_write.c b/src/mpi/romio/adio/ad_panfs/ad_panfs_write.c
index cdab2e4..920d2f4 100644
--- a/src/mpi/romio/adio/ad_panfs/ad_panfs_write.c
+++ b/src/mpi/romio/adio/ad_panfs/ad_panfs_write.c
@@ -11,7 +11,7 @@
#include <unistd.h>
#endif
-void ADIOI_PANFS_WriteContig(ADIO_File fd, void *buf, int count,
+void ADIOI_PANFS_WriteContig(ADIO_File fd, const void *buf, int count,
MPI_Datatype datatype, int file_ptr_type,
ADIO_Offset offset, ADIO_Status *status,
int *error_code)
http://git.mpich.org/mpich.git/commitdiff/f824ab2249bae1995090c21a0fc07f69ed48288c
commit f824ab2249bae1995090c21a0fc07f69ed48288c
Author: Rob Latham <robl at mcs.anl.gov>
Date: Mon Apr 21 15:55:14 2014 -0500
tiny warning fix for panasas debugging routine
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/mpi/romio/adio/ad_panfs/ad_panfs_resize.c b/src/mpi/romio/adio/ad_panfs/ad_panfs_resize.c
index 52708f5..5c41126 100644
--- a/src/mpi/romio/adio/ad_panfs/ad_panfs_resize.c
+++ b/src/mpi/romio/adio/ad_panfs/ad_panfs_resize.c
@@ -31,7 +31,7 @@ void ADIOI_PANFS_Resize(ADIO_File fd, ADIO_Offset size, int *error_code)
if(((ADIO_Offset)stat_buf.st_size) != size)
{
/* This should never happen otherwise there is a coherency problem. */
- FPRINTF(stderr, "%s: Rank %d: Resize failed: requested=%llu actual=%llu.\n",myname,myrank,size,stat_buf.st_size);
+ FPRINTF(stderr, "%s: Rank %d: Resize failed: requested=%llu actual=%llu.\n",myname,myrank,size,(unsigned long long)stat_buf.st_size);
MPI_Abort(MPI_COMM_WORLD, 1);
}
}
http://git.mpich.org/mpich.git/commitdiff/89e3557f91ceea8451b5161d9bc3532dc58e61aa
commit 89e3557f91ceea8451b5161d9bc3532dc58e61aa
Author: Rob Latham <robl at mcs.anl.gov>
Date: Mon Apr 21 15:54:51 2014 -0500
clean up unused variables in panasas hints
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c b/src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c
index f6e6615..5690639 100644
--- a/src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c
+++ b/src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c
@@ -15,15 +15,6 @@ void ADIOI_PANFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
#if defined(MPICH) || !defined(PRINT_ERR_MSG)
static char myname[] = "ADIOI_PANFS_SETINFO";
#endif
- char* value;
- int flag, tmp_val = -1;
- unsigned long int concurrent_write = 0;
- pan_fs_client_layout_agg_type_t layout_type = PAN_FS_CLIENT_LAYOUT_TYPE__DEFAULT;
- unsigned long int layout_stripe_unit = 0;
- unsigned long int layout_parity_stripe_width = 0;
- unsigned long int layout_parity_stripe_depth = 0;
- unsigned long int layout_total_num_comps = 0;
- pan_fs_client_layout_visit_t layout_visit_policy = PAN_FS_CLIENT_LAYOUT_VISIT__ROUND_ROBIN;
int gen_error_code;
*error_code = MPI_SUCCESS;
-----------------------------------------------------------------------
Summary of changes:
src/mpi/romio/adio/ad_panfs/Makefile.mk | 4 ----
src/mpi/romio/adio/ad_panfs/ad_panfs.h | 8 +++++++-
src/mpi/romio/adio/ad_panfs/ad_panfs_hints.c | 12 +++---------
src/mpi/romio/adio/ad_panfs/ad_panfs_resize.c | 2 +-
src/mpi/romio/adio/ad_panfs/ad_panfs_write.c | 2 +-
src/mpi/romio/configure.ac | 14 +++++++++++++-
6 files changed, 25 insertions(+), 17 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list