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 a4163344aacdab2be0ed01a3c3121da58033dabd (commit) via c2e326b7fc1188f285a2896f7fd52a70b84c1441 (commit) from 778679c0fbea3ffc017d7f1178f35d5b64d74665 (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/a4163344aacdab2be0ed01a3c3121da580... commit a4163344aacdab2be0ed01a3c3121da58033dabd Author: Rob Latham <[email protected]> Date: Mon Feb 22 11:30:48 2016 -0600 comm_split_filetype: enable-strict cleanups compiling with --enable-strict turned up a few spots we should clean up No reviewer diff --git a/src/mpi/romio/adio/include/adioi.h b/src/mpi/romio/adio/include/adioi.h index 7cf62fa..d6cfd66 100644 --- a/src/mpi/romio/adio/include/adioi.h +++ b/src/mpi/romio/adio/include/adioi.h @@ -945,6 +945,9 @@ char *ADIOI_Strdup( const char * ); #define ADIOI_Info_delete(info_,key_str_) \ MPI_Info_delete((info_),((char*)key_str_)) +/* the I/O related support for MPI_Comm_split_type */ +int MPIR_Comm_split_filesystem(MPI_Comm comm, int key, + const char *dirname, MPI_Comm * newcomm); /* Define attribute as empty if it has no definition */ #ifndef ATTRIBUTE diff --git a/src/mpi/romio/mpi-io/mpir_cst_filesys.c b/src/mpi/romio/mpi-io/mpir_cst_filesys.c index 74df86a..c6c5ca6 100644 --- a/src/mpi/romio/mpi-io/mpir_cst_filesys.c +++ b/src/mpi/romio/mpi-io/mpir_cst_filesys.c @@ -105,15 +105,15 @@ int MPIR_Comm_split_filesystem(MPI_Comm comm, int key, const char *dirname, MPI_ filename = MPL_calloc(PATH_MAX, sizeof(char)); if (rank == 0) { - int i, pid; + int r, pid; /* same algorithim as shared file pointer name */ srand(time(NULL)); - i = rand(); + r = rand(); pid = (int) getpid(); MPL_snprintf(filename, PATH_MAX, "%s/.commonfstest.%d.%d.%d", - dirname == NULL ? "." : dirname, rank, i, pid); + dirname == NULL ? "." : dirname, rank, r, pid); } MPI_Bcast(filename, PATH_MAX, MPI_BYTE, 0, comm); http://git.mpich.org/mpich.git/commitdiff/c2e326b7fc1188f285a2896f7fd52a70b8... commit c2e326b7fc1188f285a2896f7fd52a70b84c1441 Author: Rob Latham <[email protected]> Date: Mon Feb 22 09:54:53 2016 -0600 handle the "romio not enabled" case Since ROMIO implements the "check for shared file system" case, we cannot support that hint if ROMIO is not enabled. No reviewer. diff --git a/src/mpi/comm/comm_split_type.c b/src/mpi/comm/comm_split_type.c index 838c561..bde494d 100644 --- a/src/mpi/comm/comm_split_type.c +++ b/src/mpi/comm/comm_split_type.c @@ -56,12 +56,16 @@ int MPIR_Comm_split_type_impl(MPID_Comm * comm_ptr, int split_type, int key, MPI_Comm dummycomm; MPID_Comm * dummycomm_ptr; +#ifdef HAVE_ROMIO mpi_errno = MPIR_Comm_split_filesystem(comm_ptr->handle, key, hintval, &dummycomm); MPID_Comm_get_ptr(dummycomm, dummycomm_ptr); *newcomm_ptr = dummycomm_ptr; goto fn_exit; +#endif + /* fall through to the "not supported" case if ROMIO was not + * enabled for some reason */ } /* we don't work with other hints yet, but if we did (e.g. * nbhd_network, nbhd_partition), we'd do so here */ ----------------------------------------------------------------------- Summary of changes: src/mpi/comm/comm_split_type.c | 4 ++++ src/mpi/romio/adio/include/adioi.h | 3 +++ src/mpi/romio/mpi-io/mpir_cst_filesys.c | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository