[svn-r25397] - remove configure checks for MPI_File_get_size and Big

MPI_File_set_size as they are supported by most MPI implementations.
- fix bug in t_mpi.c (HDFFV-8856)

3 files changed, 1 insertions, 34 deletions

diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index 5a866fc..6814acb 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -525,7 +525,6 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MPE = @MPE@
-MPI_GET_SIZE = @MPI_GET_SIZE@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
diff --git a/testpar/t_chunk_alloc.c b/testpar/t_chunk_alloc.c
index e8a6ca4..b2ddc23 100644
--- a/testpar/t_chunk_alloc.c
+++ b/testpar/t_chunk_alloc.c
@@ -36,11 +36,7 @@ get_filesize(const char *filename)
     int		mpierr;
     MPI_File	fd;
     MPI_Offset	filesize;
-#ifndef H5_HAVE_MPI_GET_SIZE
-    h5_stat_t stat_buf;
-#endif
 
-#ifdef H5_HAVE_MPI_GET_SIZE
     mpierr = MPI_File_open(MPI_COMM_SELF, (char*)filename, MPI_MODE_RDONLY,
 	MPI_INFO_NULL, &fd);
     VRFY((mpierr == MPI_SUCCESS), "");
@@ -50,16 +46,6 @@ get_filesize(const char *filename)
 
     mpierr = MPI_File_close(&fd);
     VRFY((mpierr == MPI_SUCCESS), "");
-#else
-    /* Some systems (only SGI Altix Propack 4 so far) doesn't return correct
-     * file size for MPI_File_get_size.  Use stat instead.
-     */
-    if((mpierr=HDstat(filename, &stat_buf))<0)
-    VRFY((mpierr == MPI_SUCCESS), "");
-
-    /* Hopefully this casting is safe */
-    filesize = (MPI_Offset)(stat_buf.st_size);
-#endif
 
     return(filesize);
 }
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index a74aa22..27dc956 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -206,7 +206,6 @@ test_mpio_gb_file(char *filename)
     MPI_Offset  mpi_off;
     MPI_Offset  mpi_off_old;
     MPI_Status  mpi_stat;
-    h5_stat_t stat_buf;
     int is_signed, sizeof_mpi_offset;
 
     nerrs = 0;
@@ -380,13 +379,7 @@ test_mpio_gb_file(char *filename)
 	mrc = MPI_Barrier(MPI_COMM_WORLD);
 	VRFY((mrc==MPI_SUCCESS), "Sync before leaving test");
 
-        /*
-         * Check if MPI_File_get_size works correctly.  Some systems (only SGI Altix
-         * Propack 4 so far) return wrong file size.  It can be avoided by reconfiguring
-         * with "--disable-mpi-size".
-         */
-#ifdef H5_HAVE_MPI_GET_SIZE
-	printf("Test if MPI_File_get_size works correctly with %s\n", filename);
+	printf("Test if MPI_File_get_size works with %s\n", filename);
 
 	mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY, info, &fh);
         VRFY((mrc==MPI_SUCCESS), "");
@@ -394,14 +387,6 @@ test_mpio_gb_file(char *filename)
         if (MAINPROCESS){			/* only process 0 needs to check it*/
             mrc = MPI_File_get_size(fh, &size);
 	    VRFY((mrc==MPI_SUCCESS), "");
-
-            mrc=HDstat(filename, &stat_buf);
-	    VRFY((mrc==0), "");
-
-            /* Hopefully this casting is safe */
-            if(size != (MPI_Offset)(stat_buf.st_size)) {
-                printf("Warning: MPI_File_get_size doesn't return correct file size.  To avoid using it in the library, reconfigure and rebuild the library with --disable-mpi-size.\n");
-            }
         }
 
 	/* close file and free the communicator */
@@ -414,9 +399,6 @@ test_mpio_gb_file(char *filename)
 	 */
 	mrc = MPI_Barrier(MPI_COMM_WORLD);
 	VRFY((mrc==MPI_SUCCESS), "Sync before leaving test");
-#else
-        printf("Skipped testing MPI_File_get_size because it's disabled\n");
-#endif
     }
 
 finish: