- commits - mailman3.cels.anl.gov

r10637 - in mpich2/trunk/src/mpi/romio: adio/include mpi-io
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:56 -0600 (Tue, 20 Nov 2012) New Revision: 10637 Modified: mpich2/trunk/src/mpi/romio/adio/include/adioi_error.h mpich2/trunk/src/mpi/romio/mpi-io/fsync.c mpich2/trunk/src/mpi/romio/mpi-io/open.c mpich2/trunk/src/mpi/romio/mpi-io/set_info.c mpich2/trunk/src/mpi/romio/mpi-io/set_size.c Log: add missing checks on parameters of IO routines Contributed by IBM. Based on patch 0009 from code discussions. Modified: mpich2/trunk/src/mpi/romio/adio/include/adioi_error.h =================================================================== --- mpich2/trunk/src/mpi/romio/adio/include/adioi_error.h 2012-11-20 22:20:55 UTC (rev 10636) +++ mpich2/trunk/src/mpi/romio/adio/include/adioi_error.h 2012-11-20 22:20:56 UTC (rev 10637) @@ -21,6 +21,21 @@ goto fn_exit; \ } +/* TODO could add more glue code to help check for handle validity, or perhaps + * do some sort of always-safe attribute/info call to check for handle validity */ +#define MPIO_CHECK_COMM(comm_, myname_, error_code_) \ + do { \ + if ((comm_) == MPI_COMM_NULL) { \ + error_code = MPIO_Err_create_code(MPI_SUCCESS, \ + MPIR_ERR_RECOVERABLE, \ + (myname_), __LINE__, \ + MPI_ERR_COMM, \ + "**commnull", 0); \ + error_code_ = MPIO_Err_return_file(MPI_FILE_NULL, (error_code_)); \ + goto fn_exit; \ + } \ + } while (0) + #define MPIO_CHECK_COUNT(fh, count, myname, error_code) \ if (count < 0) { \ error_code = MPIO_Err_create_code(MPI_SUCCESS, \ Modified: mpich2/trunk/src/mpi/romio/mpi-io/fsync.c =================================================================== --- mpich2/trunk/src/mpi/romio/mpi-io/fsync.c 2012-11-20 22:20:55 UTC (rev 10636) +++ mpich2/trunk/src/mpi/romio/mpi-io/fsync.c 2012-11-20 22:20:56 UTC (rev 10637) @@ -55,6 +55,7 @@ error_code = MPIO_Err_return_file(MPI_FILE_NULL, error_code); goto fn_exit; } + MPIO_CHECK_WRITABLE(fh, myname, error_code); /* --END ERROR HANDLING-- */ ADIOI_TEST_DEFERRED(adio_fh, "MPI_File_sync", &error_code); Modified: mpich2/trunk/src/mpi/romio/mpi-io/open.c =================================================================== --- mpich2/trunk/src/mpi/romio/mpi-io/open.c 2012-11-20 22:20:55 UTC (rev 10636) +++ mpich2/trunk/src/mpi/romio/mpi-io/open.c 2012-11-20 22:20:56 UTC (rev 10637) @@ -60,13 +60,7 @@ MPIU_THREAD_CS_ENTER(ALLFUNC,); /* --BEGIN ERROR HANDLING-- */ - if (comm == MPI_COMM_NULL) - { - error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - myname, __LINE__, MPI_ERR_COMM, - "**comm", 0); - goto fn_fail; - } + MPIO_CHECK_COMM(comm, myname, error_code); /* --END ERROR HANDLING-- */ MPI_Comm_test_inter(comm, &flag); Modified: mpich2/trunk/src/mpi/romio/mpi-io/set_info.c =================================================================== --- mpich2/trunk/src/mpi/romio/mpi-io/set_info.c 2012-11-20 22:20:55 UTC (rev 10636) +++ mpich2/trunk/src/mpi/romio/mpi-io/set_info.c 2012-11-20 22:20:56 UTC (rev 10637) @@ -48,14 +48,13 @@ /* set new info */ ADIO_SetInfo(adio_fh, info, &error_code); - /* TODO: what to do with error code? */ +fn_exit: /* --BEGIN ERROR HANDLING-- */ if (error_code != MPI_SUCCESS) error_code = MPIO_Err_return_file(adio_fh, error_code); /* --END ERROR HANDLING-- */ -fn_exit: MPIU_THREAD_CS_EXIT(ALLFUNC,); return error_code; Modified: mpich2/trunk/src/mpi/romio/mpi-io/set_size.c =================================================================== --- mpich2/trunk/src/mpi/romio/mpi-io/set_size.c 2012-11-20 22:20:55 UTC (rev 10636) +++ mpich2/trunk/src/mpi/romio/mpi-io/set_size.c 2012-11-20 22:20:56 UTC (rev 10637) @@ -61,6 +61,7 @@ error_code = MPIO_Err_return_file(adio_fh, error_code); goto fn_exit; } + MPIO_CHECK_WRITABLE(fh, myname, error_code); /* --END ERROR HANDLING-- */ tmp_sz = size;

1 0

r10636 - mpich2/trunk/src/mpi/romio/mpi-io
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:55 -0600 (Tue, 20 Nov 2012) New Revision: 10636 Modified: mpich2/trunk/src/mpi/romio/mpi-io/open.c Log: make ROMIO error class be consistent with PE MPI When opening file with inconsistent "amode"s. Contributed by IBM. Based on patch 0007 from code discussions. Modified: mpich2/trunk/src/mpi/romio/mpi-io/open.c =================================================================== --- mpich2/trunk/src/mpi/romio/mpi-io/open.c 2012-11-20 22:20:54 UTC (rev 10635) +++ mpich2/trunk/src/mpi/romio/mpi-io/open.c 2012-11-20 22:20:55 UTC (rev 10636) @@ -116,7 +116,7 @@ if (tmp_amode == ADIO_AMODE_NOMATCH) { error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - myname, __LINE__, MPI_ERR_AMODE, + myname, __LINE__, MPI_ERR_NOT_SAME, "**fileamodediff", 0); goto fn_fail; }

1 0

r10635 - in mpich2/trunk/src: include mpi/datatype mpi/spawn mpi/topo
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:54 -0600 (Tue, 20 Nov 2012) New Revision: 10635 Modified: mpich2/trunk/src/include/mpierrs.h mpich2/trunk/src/mpi/datatype/type_create_darray.c mpich2/trunk/src/mpi/datatype/type_create_subarray.c mpich2/trunk/src/mpi/spawn/comm_spawn_multiple.c mpich2/trunk/src/mpi/topo/graph_map.c Log: Added a parameter err_class to macro MPIR_ERRTEST_ARGNONPOS Subtle: also converts two error checks to use different classes at the same time. Contributed by IBM. Based on patch 0005 from code discussions. Modified: mpich2/trunk/src/include/mpierrs.h =================================================================== --- mpich2/trunk/src/include/mpierrs.h 2012-11-20 22:20:54 UTC (rev 10634) +++ mpich2/trunk/src/include/mpierrs.h 2012-11-20 22:20:54 UTC (rev 10635) @@ -143,12 +143,12 @@ goto fn_fail; \ } -#define MPIR_ERRTEST_ARGNONPOS(arg,arg_name,err) \ +#define MPIR_ERRTEST_ARGNONPOS(arg,arg_name,err,err_class) \ if ((arg) <= 0) { \ err = MPIR_Err_create_code(MPI_SUCCESS, \ MPIR_ERR_RECOVERABLE, \ FCNAME, __LINE__, \ - MPI_ERR_ARG, \ + err_class, \ "**argnonpos", \ "**argnonpos %s %d", \ arg_name, arg ); \ Modified: mpich2/trunk/src/mpi/datatype/type_create_darray.c =================================================================== --- mpich2/trunk/src/mpi/datatype/type_create_darray.c 2012-11-20 22:20:54 UTC (rev 10634) +++ mpich2/trunk/src/mpi/datatype/type_create_darray.c 2012-11-20 22:20:54 UTC (rev 10635) @@ -427,8 +427,8 @@ tmp_size = 1; for (i=0; mpi_errno == MPI_SUCCESS && i < ndims; i++) { - MPIR_ERRTEST_ARGNONPOS(array_of_gsizes[i], "gsize", mpi_errno); - MPIR_ERRTEST_ARGNONPOS(array_of_psizes[i], "psize", mpi_errno); + MPIR_ERRTEST_ARGNONPOS(array_of_gsizes[i], "gsize", mpi_errno, MPI_ERR_ARG); + MPIR_ERRTEST_ARGNONPOS(array_of_psizes[i], "psize", mpi_errno, MPI_ERR_ARG); if ((array_of_distribs[i] != MPI_DISTRIBUTE_NONE) && (array_of_distribs[i] != MPI_DISTRIBUTE_BLOCK) && Modified: mpich2/trunk/src/mpi/datatype/type_create_subarray.c =================================================================== --- mpich2/trunk/src/mpi/datatype/type_create_subarray.c 2012-11-20 22:20:54 UTC (rev 10634) +++ mpich2/trunk/src/mpi/datatype/type_create_subarray.c 2012-11-20 22:20:54 UTC (rev 10635) @@ -96,13 +96,13 @@ MPID_BEGIN_ERROR_CHECKS; { /* Check parameters */ - MPIR_ERRTEST_ARGNONPOS(ndims, "ndims", mpi_errno); + MPIR_ERRTEST_ARGNONPOS(ndims, "ndims", mpi_errno, MPI_ERR_DIMS); MPIR_ERRTEST_ARGNULL(array_of_sizes, "array_of_sizes", mpi_errno); MPIR_ERRTEST_ARGNULL(array_of_subsizes, "array_of_subsizes", mpi_errno); MPIR_ERRTEST_ARGNULL(array_of_starts, "array_of_starts", mpi_errno); for (i=0; mpi_errno == MPI_SUCCESS && i < ndims; i++) { - MPIR_ERRTEST_ARGNONPOS(array_of_sizes[i], "size", mpi_errno); - MPIR_ERRTEST_ARGNONPOS(array_of_subsizes[i], "subsize", mpi_errno); + MPIR_ERRTEST_ARGNONPOS(array_of_sizes[i], "size", mpi_errno, MPI_ERR_ARG); + MPIR_ERRTEST_ARGNONPOS(array_of_subsizes[i], "subsize", mpi_errno, MPI_ERR_ARG); MPIR_ERRTEST_ARGNEG(array_of_starts[i], "start", mpi_errno); if (array_of_subsizes[i] > array_of_sizes[i]) { mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, Modified: mpich2/trunk/src/mpi/spawn/comm_spawn_multiple.c =================================================================== --- mpich2/trunk/src/mpi/spawn/comm_spawn_multiple.c 2012-11-20 22:20:54 UTC (rev 10634) +++ mpich2/trunk/src/mpi/spawn/comm_spawn_multiple.c 2012-11-20 22:20:54 UTC (rev 10635) @@ -107,7 +107,7 @@ if (comm_ptr->rank == root) { MPIR_ERRTEST_ARGNULL(array_of_commands, "array_of_commands", mpi_errno); MPIR_ERRTEST_ARGNULL(array_of_maxprocs, "array_of_maxprocs", mpi_errno); - MPIR_ERRTEST_ARGNONPOS(count, "count", mpi_errno); + MPIR_ERRTEST_ARGNONPOS(count, "count", mpi_errno, MPI_ERR_COUNT); for (i = 0; i < count; i++) { MPIR_ERRTEST_INFO_OR_NULL(array_of_info[i], mpi_errno); Modified: mpich2/trunk/src/mpi/topo/graph_map.c =================================================================== --- mpich2/trunk/src/mpi/topo/graph_map.c 2012-11-20 22:20:54 UTC (rev 10634) +++ mpich2/trunk/src/mpi/topo/graph_map.c 2012-11-20 22:20:54 UTC (rev 10635) @@ -136,7 +136,7 @@ MPIR_ERRTEST_ARGNULL(newrank,"newrank",mpi_errno); MPIR_ERRTEST_ARGNULL(indx,"indx",mpi_errno); MPIR_ERRTEST_ARGNULL(edges,"edges",mpi_errno); - MPIR_ERRTEST_ARGNONPOS(nnodes,"nnodes",mpi_errno); + MPIR_ERRTEST_ARGNONPOS(nnodes,"nnodes",mpi_errno, MPI_ERR_ARG); } MPID_END_ERROR_CHECKS; }

1 0

r10634 - mpich2/trunk/src/mpi/datatype
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:54 -0600 (Tue, 20 Nov 2012) New Revision: 10634 Modified: mpich2/trunk/src/mpi/datatype/type_create_darray.c Log: check rank and the product of array_of_psizes in MPI_Type_create_darray Contributed by IBM. Based on patch 0004 from code discussions. Modified: mpich2/trunk/src/mpi/datatype/type_create_darray.c =================================================================== --- mpich2/trunk/src/mpi/datatype/type_create_darray.c 2012-11-20 22:20:53 UTC (rev 10633) +++ mpich2/trunk/src/mpi/datatype/type_create_darray.c 2012-11-20 22:20:54 UTC (rev 10634) @@ -403,9 +403,11 @@ MPID_BEGIN_ERROR_CHECKS; { /* Check parameters */ - MPIR_ERRTEST_ARGNEG(rank, "rank", mpi_errno); - MPIR_ERRTEST_ARGNONPOS(size, "size", mpi_errno); - MPIR_ERRTEST_ARGNONPOS(ndims, "ndims", mpi_errno); + MPIR_ERRTEST_ARGNONPOS(size, "size", mpi_errno, MPI_ERR_ARG); + /* use MPI_ERR_RANK class for PE-MPI compatibility */ + MPIU_ERR_CHKANDJUMP3((rank < 0 || rank >= size), mpi_errno, MPI_ERR_RANK, + "**argrange", "**argrange %s %d %d", "rank", rank, (size-1)); + MPIR_ERRTEST_ARGNONPOS(ndims, "ndims", mpi_errno, MPI_ERR_DIMS); MPIR_ERRTEST_ARGNULL(array_of_gsizes, "array_of_gsizes", mpi_errno); MPIR_ERRTEST_ARGNULL(array_of_distribs, "array_of_distribs", mpi_errno); @@ -423,6 +425,7 @@ goto fn_fail; } + tmp_size = 1; for (i=0; mpi_errno == MPI_SUCCESS && i < ndims; i++) { MPIR_ERRTEST_ARGNONPOS(array_of_gsizes[i], "gsize", mpi_errno); MPIR_ERRTEST_ARGNONPOS(array_of_psizes[i], "psize", mpi_errno); @@ -468,8 +471,13 @@ i, array_of_psizes[i]); goto fn_fail; } + + tmp_size *= array_of_psizes[i]; } + MPIU_ERR_CHKANDJUMP1((tmp_size != size), mpi_errno, MPI_ERR_ARG, + "**arg", "**arg %s", "array_of_psizes"); + /* TODO: GET THIS CHECK IN ALSO */ /* check if MPI_Aint is large enough for size of global array.

1 0

r10633 - in mpich2/trunk/src/mpi/romio/adio: ad_bg ad_bgl ad_lustre ad_nfs ad_piofs ad_pvfs ad_pvfs2 ad_zoidfs common
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:53 -0600 (Tue, 20 Nov 2012) New Revision: 10633 Modified: mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_read.c mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_write.c mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_write.c mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_read.c mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_write.c mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_write_list_classic.c mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_read_list.c mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_write_list.c mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c mpich2/trunk/src/mpi/romio/adio/common/ad_read_str_naive.c mpich2/trunk/src/mpi/romio/adio/common/ad_write_nolock.c mpich2/trunk/src/mpi/romio/adio/common/ad_write_str.c mpich2/trunk/src/mpi/romio/adio/common/ad_write_str_naive.c Log: update count in status for adio when filetype_size is zero Contributed by IBM. Patch 0001 from code discussions. Modified: mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_read.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_read.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_read.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -212,6 +212,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_write.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_write.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_write.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -253,6 +253,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -203,6 +203,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -253,6 +253,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -188,6 +188,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if (!filetype_size) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -187,6 +187,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -290,6 +290,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_write.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_write.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_write.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -93,6 +93,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_read.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_read.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_read.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -150,6 +150,9 @@ ADIOI_Datatype_iscontig(fd->filetype, &filetype_is_contig); MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_write.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_write.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_write.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -130,6 +130,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } @@ -514,6 +517,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -70,6 +70,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_write_list_classic.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_write_list_classic.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_write_list_classic.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -86,6 +86,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_read_list.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_read_list.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_read_list.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -72,6 +72,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_write_list.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_write_list.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_write_list.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -86,6 +86,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -87,6 +87,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_read_str_naive.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_read_str_naive.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_read_str_naive.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -36,6 +36,9 @@ MPI_Type_size(fd->filetype, (int*)&filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, buftype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_write_nolock.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_write_nolock.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_write_nolock.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -58,6 +58,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_write_str.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_write_str.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_write_str.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -157,6 +157,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, datatype, 0); +#endif *error_code = MPI_SUCCESS; return; } Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_write_str_naive.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/ad_write_str_naive.c 2012-11-20 22:20:51 UTC (rev 10632) +++ mpich2/trunk/src/mpi/romio/adio/common/ad_write_str_naive.c 2012-11-20 22:20:53 UTC (rev 10633) @@ -37,6 +37,9 @@ MPI_Type_size(fd->filetype, &filetype_size); if ( ! filetype_size ) { +#ifdef HAVE_STATUS_SET_BYTES + MPIR_Status_set_bytes(status, buftype, 0); +#endif *error_code = MPI_SUCCESS; return; }

1 0

r10632 - mpich2/trunk/src/mpi/romio/adio/common
by goodell＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: goodell Date: 2012-11-20 16:20:51 -0600 (Tue, 20 Nov 2012) New Revision: 10632 Modified: mpich2/trunk/src/mpi/romio/adio/common/status_setb.c Log: ROMIO: fix overzealous MPICH2->MPICH change Partially reviewed by robl@ & balaji@. Modified: mpich2/trunk/src/mpi/romio/adio/common/status_setb.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/status_setb.c 2012-11-20 22:14:18 UTC (rev 10631) +++ mpich2/trunk/src/mpi/romio/adio/common/status_setb.c 2012-11-20 22:20:51 UTC (rev 10632) @@ -8,7 +8,7 @@ #include "adio.h" #include "mpi.h" -#if defined(MPICH) +#if defined(MPICH2) || (defined(MPICH) && (MPICH_NAME >= 3)) /* Not quite correct, but much closer for MPI2 */ /* TODO: still needs to handle partial datatypes and situations where the mpi * implementation fills status with something other than bytes (globus2 might @@ -23,20 +23,6 @@ MPI_Status_set_elements(status, MPI_BYTE, nbytes); return MPI_SUCCESS; } -#elif defined(MPICH) - -void MPID_Status_set_bytes(MPI_Status *status, int nbytes); -int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, - int nbytes); - -int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, - int nbytes) -{ - if (status != MPI_STATUS_IGNORE) - MPID_Status_set_bytes(status, nbytes); - return MPI_SUCCESS; -} - #elif defined(MPILAM) || defined(MPISGI) int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, int nbytes)

1 0

r10627 - mpich2/branches/release
by balaji＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: balaji Date: 2012-11-20 11:04:57 -0600 (Tue, 20 Nov 2012) New Revision: 10627 Removed: mpich2/branches/release/mpich-3.0rc1/ Log: Oops, created a tag in the branches directory.

1 0

r10626 - in mpich2/tags/release: . mpich-3.0rc1
by balaji＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: balaji Date: 2012-11-20 11:04:41 -0600 (Tue, 20 Nov 2012) New Revision: 10626 Added: mpich2/tags/release/mpich-3.0rc1/ Log: Created a tag for the mpich-3.0rc1 release from r10608 (I forgot to do that when the release was cut). No reviewer. Property changes on: mpich2/tags/release/mpich-3.0rc1 ___________________________________________________________________ Added: svn:ignore + subsys_include.m4 configure configure.lineno config.log config.status config.cache cache.base *conf.cache config.system config.h.in .mpich2 autom4te.cache libtool Makefile.in Makefile mpich2-doxygen lib *ebug* *elease* *.log mpich2.ncb mpich2.opt mpich2.plg mpich2.suo coverage* mpich*pgrs.html bin .err .deps unusederr.txt www cscope.out cscope.files *.user winbuild man TAGS TAGS.bak README README.envvar include share aclocal.m4 config.lt conf.mod install Added: svn:mergeinfo + /mpich2/branches/dev/ckpt:5050 /mpich2/branches/dev/ckpt2:5057-6537 /mpich2/branches/dev/coll-err-ret:7771-7802 /mpich2/branches/dev/error-return:7662-7670 /mpich2/branches/dev/ftb:5661-5730 /mpich2/branches/dev/groupfailed:9231 /mpich2/branches/dev/lapi:5817 /mpich2/branches/dev/nem-squash:9995-9998 /mpich2/branches/dev/reenableas:9355 /mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619 /mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141 /mpich2/branches/release/mpich2-1.2:5406

1 0

r10625 - in mpich2/branches/release: . mpich-3.0rc1
by balaji＠mcs.anl.gov 20 Nov '12

20 Nov '12

Author: balaji Date: 2012-11-20 11:03:42 -0600 (Tue, 20 Nov 2012) New Revision: 10625 Added: mpich2/branches/release/mpich-3.0rc1/ Log: Created a tag for the mpich-3.0rc1 release from r10608 (I forgot to do that when the release was cut). No reviewer. Property changes on: mpich2/branches/release/mpich-3.0rc1 ___________________________________________________________________ Added: svn:ignore + subsys_include.m4 configure configure.lineno config.log config.status config.cache cache.base *conf.cache config.system config.h.in .mpich2 autom4te.cache libtool Makefile.in Makefile mpich2-doxygen lib *ebug* *elease* *.log mpich2.ncb mpich2.opt mpich2.plg mpich2.suo coverage* mpich*pgrs.html bin .err .deps unusederr.txt www cscope.out cscope.files *.user winbuild man TAGS TAGS.bak README README.envvar include share aclocal.m4 config.lt conf.mod install Added: svn:mergeinfo + /mpich2/branches/dev/ckpt:5050 /mpich2/branches/dev/ckpt2:5057-6537 /mpich2/branches/dev/coll-err-ret:7771-7802 /mpich2/branches/dev/error-return:7662-7670 /mpich2/branches/dev/ftb:5661-5730 /mpich2/branches/dev/groupfailed:9231 /mpich2/branches/dev/lapi:5817 /mpich2/branches/dev/nem-squash:9995-9998 /mpich2/branches/dev/reenableas:9355 /mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619 /mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141 /mpich2/branches/release/mpich2-1.2:5406

1 0

r10624 - mpich2/trunk/src/mpi/debugger
by gropp＠mcs.anl.gov 19 Nov '12

19 Nov '12

Author: gropp Date: 2012-11-19 16:01:02 -0600 (Mon, 19 Nov 2012) New Revision: 10624 Added: mpich2/trunk/src/mpi/debugger/allcommdbg.c Modified: mpich2/trunk/src/mpi/debugger/Makefile.mk Log: Added another test program for debugger interface, in the debugger directory where the other tests live Modified: mpich2/trunk/src/mpi/debugger/Makefile.mk =================================================================== --- mpich2/trunk/src/mpi/debugger/Makefile.mk 2012-11-19 20:02:49 UTC (rev 10623) +++ mpich2/trunk/src/mpi/debugger/Makefile.mk 2012-11-19 22:01:02 UTC (rev 10624) @@ -44,5 +44,8 @@ src/mpi/debugger/qdemo: src/mpi/debugger/qdemo.c $(bindir)/mpicc -o $@ $? +src/mpi/debugger/allcommdbg: src/mpi/debugger/allcommdbg.c + $(bindir)/mpicc -o $@ $? + endif BUILD_DEBUGGER_DLL Added: mpich2/trunk/src/mpi/debugger/allcommdbg.c =================================================================== --- mpich2/trunk/src/mpi/debugger/allcommdbg.c (rev 0) +++ mpich2/trunk/src/mpi/debugger/allcommdbg.c 2012-11-19 22:01:02 UTC (rev 10624) @@ -0,0 +1,39 @@ +#include "mpi.h" +#include <stdio.h> + +/* This definition is almost the same as the MPIR_Comm_list in dbginit, + except a void * is used instead of MPID_Comm * for head; for the use + here, void * is all that is needed */ +typedef struct MPIR_Comm_list { + int sequence_number; /* Used to detect changes in the list */ + void *head; /* Head of the list */ +} MPIR_Comm_list; + +extern MPIR_Comm_list MPIR_All_communicators; + +int main( int argc, char **argv ) +{ + int errs = 0; + MPI_Init( &argc, &argv ); + + printf( "sequence number for communicators is %d\n", MPIR_All_communicators.sequence_number ); + printf( "head pointer is %p\n", MPIR_All_communicators.head ); + + if (MPIR_All_communicators.head == (void *)0) { + printf( "ERROR: The communicator list field has a null head pointer\n" ); + printf( "Either the debugger support is not enabled (--enable-debuginfo)\n\ +or the necessary symbols, including the extern variable\n\ +MPIR_All_communicators, are not properly exported to the main program\n" ); + errs++; + } + + MPI_Finalize( ); + if (errs) { + printf( " Found %d errors\n", errs ); + } + else { + printf( " No Errors\n" ); + } + + return 0; +}

1 0