From 108173b63566dfc08a8383580d0960bd0da26c15 Mon Sep 17 00:00:00 2001 From: HDF Tester Date: Sun, 7 Sep 2008 15:25:12 -0500 Subject: [svn-r15596] Snapshot version 1.6 release 7 (snap17) --- README.txt | 2 +- c++/configure | 20 ++++++++++---------- c++/configure.in | 2 +- configure | 20 ++++++++++---------- configure.in | 2 +- doc/html/ADGuide/RELEASE.txt | 32 +++++++++++++++++++++++++++++--- fortran/configure | 20 ++++++++++---------- fortran/configure.in | 2 +- release_docs/RELEASE.txt | 2 +- src/H5Smpio.c | 5 +++++ src/H5public.h | 4 ++-- 11 files changed, 71 insertions(+), 40 deletions(-) diff --git a/README.txt b/README.txt index 7bcaff5..1859421 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -HDF5 version 1.6.7-snap17 currently under development +HDF5 version 1.6.7-snap18 currently under development Please refer to the release_docs/INSTALL file for installation instructions. ------------------------------------------------------------------------------ January 28, 2007 diff --git a/c++/configure b/c++/configure index bc10ebb..9468704 100755 --- a/c++/configure +++ b/c++/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From c++/configure.in Id: configure.in 15479 2008-08-17 19:56:07Z hdftest . +# From c++/configure.in Id: configure.in 15566 2008-08-31 20:53:29Z hdftest . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for HDF5 C++ 1.6.7-snap17. +# Generated by GNU Autoconf 2.61 for HDF5 C++ 1.6.7-snap18. # # Report bugs to . # @@ -734,8 +734,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='HDF5 C++' PACKAGE_TARNAME='hdf5-c--' -PACKAGE_VERSION='1.6.7-snap17' -PACKAGE_STRING='HDF5 C++ 1.6.7-snap17' +PACKAGE_VERSION='1.6.7-snap18' +PACKAGE_STRING='HDF5 C++ 1.6.7-snap18' PACKAGE_BUGREPORT='help@hdfgroup.org' ac_unique_file="src/H5Library.cpp" @@ -1375,7 +1375,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HDF5 C++ 1.6.7-snap17 to adapt to many kinds of systems. +\`configure' configures HDF5 C++ 1.6.7-snap18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1440,7 +1440,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 C++ 1.6.7-snap17:";; + short | recursive ) echo "Configuration of HDF5 C++ 1.6.7-snap18:";; esac cat <<\_ACEOF @@ -1545,7 +1545,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 C++ configure 1.6.7-snap17 +HDF5 C++ configure 1.6.7-snap18 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1559,7 +1559,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HDF5 C++ $as_me 1.6.7-snap17, which was +It was created by HDF5 C++ $as_me 1.6.7-snap18, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -11427,7 +11427,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HDF5 C++ $as_me 1.6.7-snap17, which was +This file was extended by HDF5 C++ $as_me 1.6.7-snap18, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11480,7 +11480,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -HDF5 C++ config.status 1.6.7-snap17 +HDF5 C++ config.status 1.6.7-snap18 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/c++/configure.in b/c++/configure.in index 0b21c26..a28e9f6 100644 --- a/c++/configure.in +++ b/c++/configure.in @@ -28,7 +28,7 @@ dnl dnl NOTE: Don't forget to change the version number here when we do a dnl release!!! dnl -AC_INIT([HDF5 C++], [1.6.7-snap17], [help@hdfgroup.org]) +AC_INIT([HDF5 C++], [1.6.7-snap18], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5Library.cpp]) AC_CONFIG_HEADER([src/H5cxx_config.h]) diff --git a/configure b/configure index 92a535b..56fc633 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Id: configure.in 15479 2008-08-17 19:56:07Z hdftest . +# From configure.in Id: configure.in 15566 2008-08-31 20:53:29Z hdftest . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for HDF5 1.6.7-snap17. +# Generated by GNU Autoconf 2.61 for HDF5 1.6.7-snap18. # # Report bugs to . # @@ -734,8 +734,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.6.7-snap17' -PACKAGE_STRING='HDF5 1.6.7-snap17' +PACKAGE_VERSION='1.6.7-snap18' +PACKAGE_STRING='HDF5 1.6.7-snap18' PACKAGE_BUGREPORT='help@hdfgroup.org' ac_unique_file="src/H5.c" @@ -1400,7 +1400,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HDF5 1.6.7-snap17 to adapt to many kinds of systems. +\`configure' configures HDF5 1.6.7-snap18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1465,7 +1465,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.6.7-snap17:";; + short | recursive ) echo "Configuration of HDF5 1.6.7-snap18:";; esac cat <<\_ACEOF @@ -1615,7 +1615,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.6.7-snap17 +HDF5 configure 1.6.7-snap18 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1629,7 +1629,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HDF5 $as_me 1.6.7-snap17, which was +It was created by HDF5 $as_me 1.6.7-snap18, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -36790,7 +36790,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HDF5 $as_me 1.6.7-snap17, which was +This file was extended by HDF5 $as_me 1.6.7-snap18, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -36843,7 +36843,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -HDF5 config.status 1.6.7-snap17 +HDF5 config.status 1.6.7-snap18 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 2e96444..09a42ca 100644 --- a/configure.in +++ b/configure.in @@ -25,7 +25,7 @@ dnl dnl NOTE: Don't forget to change the version number here when we do a dnl release!!! dnl -AC_INIT([HDF5], [1.6.7-snap17], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.6.7-snap18], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADER([src/H5config.h]) diff --git a/doc/html/ADGuide/RELEASE.txt b/doc/html/ADGuide/RELEASE.txt index 1d3e594..1a5594f 100644 --- a/doc/html/ADGuide/RELEASE.txt +++ b/doc/html/ADGuide/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.6.7-snap16 released on Sun Aug 31 15:52:47 CDT 2008 +HDF5 version 1.6.7-snap17 released on Sun Sep 7 15:24:17 CDT 2008 ================================================================================ INTRODUCTION @@ -80,7 +80,23 @@ New Features C++ API: -------- - None + - These member functions were added as wrapper for H5Rdereference to + replace the incorrect IdComponent::dereference(). + void H5Object::dereference(H5Object& obj, void* ref) + void H5Object::dereference(H5File& h5file, void* ref) + void H5Object::dereference(Attribute& obj, void* ref) + In addition, these constructors were added to create the associated + objects by way of dereference: + DataSet(H5Object& obj, void* ref); + DataSet(H5File& file, void* ref); + DataSet(Attribute& attr, void* ref); + DataType(H5Object& obj, void* ref); + DataType(H5File& file, void* ref); + DataType(Attribute& attr, void* ref); + Group(H5Object& obj, void* ref); + Group(H5File& obj, void* ref); + Group(Attribute& attr, void* ref); + (BMR - 2008/08/10) Support for New Platforms, Languages and Compilers @@ -136,7 +152,17 @@ Bug Fixes since HDF5-1.6.7 Release C++ API ------- - None + - Fixed a design bug which allowed an Attribute object to create/modify + attributes (bugzilla #1068). The API class hierarchy was revised + to address the problem. Classes AbstractDS and Attribute are moved + out of H5Object. Class Attribute now multiply inherits from + IdComponent and AbstractDs and class DataSet from H5Object and + AbstractDs. In addition, the data member IdComponent::id was + moved into subclasses: Attribute, DataSet, DataSpace, DataType, + H5File, Group, and PropList. (BMR - 2008/08/10) + - IdComponent::dereference was incorrect and replaced as described + in "New Features" section. + (BMR - 2008/08/10) Documentation diff --git a/fortran/configure b/fortran/configure index 3115ec8..1df3442 100755 --- a/fortran/configure +++ b/fortran/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From fortran/configure.in Id: configure.in 15479 2008-08-17 19:56:07Z hdftest . +# From fortran/configure.in Id: configure.in 15566 2008-08-31 20:53:29Z hdftest . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for HDF5 Fortran 1.6.7-snap17. +# Generated by GNU Autoconf 2.61 for HDF5 Fortran 1.6.7-snap18. # # Report bugs to . # @@ -734,8 +734,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='HDF5 Fortran' PACKAGE_TARNAME='hdf5-fortran' -PACKAGE_VERSION='1.6.7-snap17' -PACKAGE_STRING='HDF5 Fortran 1.6.7-snap17' +PACKAGE_VERSION='1.6.7-snap18' +PACKAGE_STRING='HDF5 Fortran 1.6.7-snap18' PACKAGE_BUGREPORT='help@hdfgroup.org' ac_unique_file="src/HDF5.f90" @@ -1395,7 +1395,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HDF5 Fortran 1.6.7-snap17 to adapt to many kinds of systems. +\`configure' configures HDF5 Fortran 1.6.7-snap18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1460,7 +1460,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 Fortran 1.6.7-snap17:";; + short | recursive ) echo "Configuration of HDF5 Fortran 1.6.7-snap18:";; esac cat <<\_ACEOF @@ -1568,7 +1568,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 Fortran configure 1.6.7-snap17 +HDF5 Fortran configure 1.6.7-snap18 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1582,7 +1582,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HDF5 Fortran $as_me 1.6.7-snap17, which was +It was created by HDF5 Fortran $as_me 1.6.7-snap18, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -12513,7 +12513,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HDF5 Fortran $as_me 1.6.7-snap17, which was +This file was extended by HDF5 Fortran $as_me 1.6.7-snap18, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12566,7 +12566,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -HDF5 Fortran config.status 1.6.7-snap17 +HDF5 Fortran config.status 1.6.7-snap18 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/fortran/configure.in b/fortran/configure.in index a84c17d..0c7f27c 100644 --- a/fortran/configure.in +++ b/fortran/configure.in @@ -25,7 +25,7 @@ dnl dnl NOTE: Don't forget to change the version number here when we do a dnl release!!! dnl -AC_INIT([HDF5 Fortran], [1.6.7-snap17], [help@hdfgroup.org]) +AC_INIT([HDF5 Fortran], [1.6.7-snap18], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/HDF5.f90]) AC_CONFIG_HEADER([src/H5config_fortran.h]) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 5812fc7..edb054d 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.6.7-snap17 currently under development +HDF5 version 1.6.7-snap18 currently under development ================================================================================ INTRODUCTION diff --git a/src/H5Smpio.c b/src/H5Smpio.c index c5faabf..8b3b380 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -615,6 +615,11 @@ static herr_t H5S_obtain_datatype(const hsize_t size[], span_type = NULL; return 0; } +{ + int mpi_rank; + MPI_Comm_rank (MPI_COMM_WORLD, &mpi_rank); + fprintf(stderr, "%s: mpi_rank = %d\n", FUNC, mpi_rank); +} /* MPI2 hasn't been widely acccepted, adding H5_HAVE_MPI2 for the future use */ #ifdef H5_HAVE_MPI2 diff --git a/src/H5public.h b/src/H5public.h index 5cf7c1d..4a50aac 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -76,9 +76,9 @@ extern "C" { #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 6 /* For minor interface/format changes */ #define H5_VERS_RELEASE 7 /* For tweaks, bug-fixes, or development */ -#define H5_VERS_SUBRELEASE "snap17" /* For pre-releases like snap0 */ +#define H5_VERS_SUBRELEASE "snap18" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.6.7-snap17" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.6.7-snap18" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) -- cgit v0.12