diff options
author | Raymond Lu <songyulu@hdfgroup.org> | 2007-06-02 18:19:36 (GMT) |
---|---|---|
committer | Raymond Lu <songyulu@hdfgroup.org> | 2007-06-02 18:19:36 (GMT) |
commit | 1280f90f8128a72f1b2cfe45d3a5a24334c222e0 (patch) | |
tree | a7969815417facfd248292e2830679fd4fbea9df /hl | |
parent | 2aa1084117a0040dbb6c54246837cd3133f51bdf (diff) | |
download | hdf5-1280f90f8128a72f1b2cfe45d3a5a24334c222e0.zip hdf5-1280f90f8128a72f1b2cfe45d3a5a24334c222e0.tar.gz hdf5-1280f90f8128a72f1b2cfe45d3a5a24334c222e0.tar.bz2 |
[svn-r13829] Some systems (only SGI Altix ProPack 4 discovered so far) doesn't return correct
file size from MPI_File_get_size. Bypass this problem by replacing it with
stat. Add an option --disable-mpi-size in configure to indicate this function
doesn't work properly. Add a test in testpar/t_mpi.c, too. If it returns wrong
file size, print out a warning.
Tested on kagiso (parallel) because already tested the same change to v1.6 on
several platforms (kagiso, cobalt, copper, and sol).
Diffstat (limited to 'hl')
-rwxr-xr-x | hl/Makefile.in | 1 | ||||
-rw-r--r-- | hl/c++/Makefile.in | 1 | ||||
-rw-r--r-- | hl/c++/examples/Makefile.in | 1 | ||||
-rw-r--r-- | hl/c++/src/Makefile.in | 1 | ||||
-rw-r--r-- | hl/c++/test/Makefile.in | 1 | ||||
-rw-r--r-- | hl/examples/Makefile.in | 1 | ||||
-rw-r--r-- | hl/fortran/Makefile.in | 1 | ||||
-rw-r--r-- | hl/fortran/examples/Makefile.in | 1 | ||||
-rw-r--r-- | hl/fortran/src/Makefile.in | 1 | ||||
-rw-r--r-- | hl/fortran/test/Makefile.in | 1 | ||||
-rw-r--r-- | hl/src/H5TB.c | 6 | ||||
-rw-r--r-- | hl/src/Makefile.in | 1 | ||||
-rw-r--r-- | hl/test/Makefile.in | 1 | ||||
-rw-r--r-- | hl/test/test_table.c | 3 | ||||
-rw-r--r-- | hl/tools/Makefile.in | 1 | ||||
-rw-r--r-- | hl/tools/gif2h5/Makefile.in | 1 |
16 files changed, 17 insertions, 6 deletions
diff --git a/hl/Makefile.in b/hl/Makefile.in index af961c1..32c02b3 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -164,6 +164,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 4695fb8..81cb283 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -160,6 +160,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 74a128f..fe344d9 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -154,6 +154,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index cf455de..35f1148 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -179,6 +179,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 44cab07..d619d7b 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -170,6 +170,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 0f191b3..64fda22 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -154,6 +154,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 5b0bd72..db9c4c6 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -164,6 +164,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 86cd941..693357f 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -154,6 +154,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 8dbe8d4..bf9ac00 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -184,6 +184,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 74d93fb..3233ade 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -174,6 +174,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c index 7e1de59..666c6f4 100644 --- a/hl/src/H5TB.c +++ b/hl/src/H5TB.c @@ -113,7 +113,7 @@ herr_t H5TBmake_table( const char *table_title, } /* Create a simple data space with unlimited size */ - if ( (sid = H5Screate_simple( 1, dims, maxdims )) < 0 ) + if ( (sid = H5Screate_simple( 1, dims, maxdims )) < 0 ) return -1; /* Modify dataset creation properties, i.e. enable chunking */ @@ -249,7 +249,6 @@ herr_t H5TBmake_table( const char *table_title, if ( H5Tclose( mem_type_id ) < 0 ) return -1; - return 0; /* error zone, gracefully close */ @@ -3281,7 +3280,8 @@ herr_t H5TBget_table_info ( hid_t loc_id, if ( H5LTget_attribute(loc_id,dset_name,"NROWS",H5T_NATIVE_LLONG,n)<0) return -1; - *nrecords = *n; + /**nrecords = *n;*/ + *nrecords = n[0]; } else { diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 2c3e05e..670932f 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -180,6 +180,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 1e580c6..08276d4 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -190,6 +190,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/test/test_table.c b/hl/test/test_table.c index f5b73f9..16172c4 100644 --- a/hl/test/test_table.c +++ b/hl/test/test_table.c @@ -354,7 +354,6 @@ int test_table(hid_t fid, int write) PASSED(); } - TESTING2("reading table"); /*------------------------------------------------------------------------- @@ -1355,7 +1354,6 @@ int test_table(hid_t fid, int write) PASSED(); } - /*------------------------------------------------------------------------- * * Functions tested: @@ -1374,7 +1372,6 @@ int test_table(hid_t fid, int write) chunk_size,fill,compress,wbuf)<0) goto out; - /* delete the field */ if ( H5TBdelete_field(fid, "table14", "Pressure" ) < 0 ) goto out; diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 243f496..aa08313 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -161,6 +161,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 46ccc98..f8befa4 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -182,6 +182,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ +MPI_GET_SIZE = @MPI_GET_SIZE@ OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ |