diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-18 21:42:55 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-18 21:42:55 (GMT) |
commit | d0c4c5741e4c29e4dc9e67062e2692d6316e2056 (patch) | |
tree | 995077b986358bc895213f7104e85af2f9aa6647 /config | |
parent | 356b2bd5c49631ff25a7f1f990e19897be41a487 (diff) | |
download | hdf5-d0c4c5741e4c29e4dc9e67062e2692d6316e2056.zip hdf5-d0c4c5741e4c29e4dc9e67062e2692d6316e2056.tar.gz hdf5-d0c4c5741e4c29e4dc9e67062e2692d6316e2056.tar.bz2 |
[svn-r18426] Description:
Rename "old" cache code and routines from H5AC to H5AC1.
Tested on:
Mac OS X/32 10.6.2 (amazon) w/debug, prod & parallel
(h5committest not required on this branch)
Diffstat (limited to 'config')
-rw-r--r-- | config/dec-osf4.x | 2 | ||||
-rw-r--r-- | config/dec-osf5.x | 4 | ||||
-rw-r--r-- | config/gnu-flags | 1 | ||||
-rw-r--r-- | config/ia64-linux-gnu | 4 | ||||
-rw-r--r-- | config/irix6.x | 10 | ||||
-rw-r--r-- | config/linux-gnulibc1 | 6 | ||||
-rw-r--r-- | config/mpich | 18 | ||||
-rw-r--r-- | config/nec-superux14.1 | 2 | ||||
-rw-r--r-- | config/powerpc-ibm-aix4.x | 2 | ||||
-rw-r--r-- | config/powerpc-ibm-aix5.x | 2 | ||||
-rw-r--r-- | config/rs6000-ibm-aix4.x | 2 | ||||
-rw-r--r-- | config/x86_64-redstorm-linux-gnu | 2 |
12 files changed, 28 insertions, 27 deletions
diff --git a/config/dec-osf4.x b/config/dec-osf4.x index 3b93ed9..9b62731 100644 --- a/config/dec-osf4.x +++ b/config/dec-osf4.x @@ -34,4 +34,4 @@ ARCH=${ARCH:='-arch host -tune host'} . $srcdir/config/dec-flags # DEC MPI-IO implementation has a bug, #it cannot generate correct MPI derived datatype. -hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'} +hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'} diff --git a/config/dec-osf5.x b/config/dec-osf5.x index 2d875ff..288c21f 100644 --- a/config/dec-osf5.x +++ b/config/dec-osf5.x @@ -35,6 +35,6 @@ ARCH=${ARCH:='-arch host -tune host'} # DEC MPI-IO implementation has a bug, it cannot generate correct MPI # derived datatype. -hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'} +hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'} # It does not do all collective IO correctly. -hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'} +hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'} diff --git a/config/gnu-flags b/config/gnu-flags index 170bdf8..0eded2b 100644 --- a/config/gnu-flags +++ b/config/gnu-flags @@ -141,6 +141,7 @@ case "$cc_vendor-$cc_version" in # General H5_CFLAGS="$H5_CFLAGS $arch -D_POSIX_C_SOURCE=199309L -ansi -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline" + #H5_CFLAGS="$H5_CFLAGS $arch -ansi -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline" # Production case "$cc_vendor-$cc_version" in diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu index 9bebd37..351fc82 100644 --- a/config/ia64-linux-gnu +++ b/config/ia64-linux-gnu @@ -146,8 +146,8 @@ esac # Check MPICH settings . $srcdir/config/mpich #Uncomment the next line if your system doesn't support MPI complex derived datatype. -#hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'} +#hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'} #Comment out the following line if your system supports collective IO when some processes #don't have any contributions to IOs. -hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'} +hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'} diff --git a/config/irix6.x b/config/irix6.x index 05b308c..250b681 100644 --- a/config/irix6.x +++ b/config/irix6.x @@ -176,18 +176,18 @@ hdf5_cv_integer_to_ldouble_accurate=${hdf5_cv_integer_to_ldouble_accurate='no'} # Versions 7.4.2m or newer work. # Up to version 7.4.4m, it cannot handle collective IO with non-contribution # of some processes. -# Fix $hdf5_mpi_complex_derived_datatype_works if it is not set and is using cc. -if [ -z "$hdf5_mpi_complex_derived_datatype_works" -a $CC_BASENAME = cc ]; then +# Fix $hdf5_cv_mpi_complex_derived_datatype_works if it is not set and is using cc. +if [ -z "$hdf5_cv_mpi_complex_derived_datatype_works" -a $CC_BASENAME = cc ]; then ccversion=`$CC -version 2>&1 | sed -e 's/.*Version //p'` ccversion1=`echo $ccversion | cut -f1 -d.` ccversion2=`echo $ccversion | cut -f2 -d.` # Assume all versions 7.4.* or newer are okay # and assume ccversion2 is never larger than 99. ccversionval=`expr $ccversion1 \* 100 + $ccversion2` - hdf5_mpi_special_collective_io_works='no' + hdf5_cv_mpi_special_collective_io_works='no' if [ $ccversionval -lt 704 ]; then - hdf5_mpi_complex_derived_datatype_works='no' -# hdf5_mpi_special_collective_io_works='no' + hdf5_cv_mpi_complex_derived_datatype_works='no' +# hdf5_cv_mpi_special_collective_io_works='no' fi fi diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1 index 776e39b..c0c933f 100644 --- a/config/linux-gnulibc1 +++ b/config/linux-gnulibc1 @@ -122,8 +122,8 @@ fi # 1. collective I/O when some processes don't have any contributions; # 2. complex derived MPI data type. if test $CC_BASENAME = cmpicc; then - hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'} - hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'} + hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'} + hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'} fi # Link in real time library to support use of AIO. @@ -136,4 +136,4 @@ LIBS="$LIBS -lrt" #Comment out the following line if your system supports collective IO when some processes #don't have any contributions to IOs. -#hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'} +#hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'} diff --git a/config/mpich b/config/mpich index 1ba62ff..575859e 100644 --- a/config/mpich +++ b/config/mpich @@ -21,14 +21,14 @@ # We know that mpich 1.2.4 and 1.2.5 do not support it correctly. We assume # older versions do not work either. We don't know of a way of testing its # correctness without the risk of hanging the configure process. So, we -# set the configure variable hdf5_mpi_complex_derived_datatype_works to no. +# set the configure variable hdf5_cv_mpi_complex_derived_datatype_works to no. # Notice that this code works only if the mpicc compiler shows its $MPIVERSION # properly. It is confirmed mpicc does that as far back as v1.2.3. # mpich2 do not support it correctly. But mpich2 reports small version number # indistiguishable from mpich. Some mpich2 reports blank, some reports 1.0.2. -if [ -z "$hdf5_mpi_complex_derived_datatype_works" ]; then +if [ -z "$hdf5_cv_mpi_complex_derived_datatype_works" ]; then ccversion=`$CC -v 2>/dev/null` # mpich compiler will give "mpicc for 1.2.x ..." if echo "$ccversion" | grep '^mpicc for' > /dev/null ; then @@ -36,16 +36,16 @@ if [ -z "$hdf5_mpi_complex_derived_datatype_works" ]; then ccversion=`echo $ccversion | cut -f3 -d' '` case "$ccversion" in 1.2.[0-5]*) - hdf5_mpi_complex_derived_datatype_works='no' + hdf5_cv_mpi_complex_derived_datatype_works='no' ;; 1.0.2) # mpich2 is recycling the version number, some report # 1.0.2, some report blank. - hdf5_mpi_complex_derived_datatype_works='no' + hdf5_cv_mpi_complex_derived_datatype_works='no' ;; "") # got blank ccversion. Assume it is bad a mpich2. - hdf5_mpi_complex_derived_datatype_works='no' + hdf5_cv_mpi_complex_derived_datatype_works='no' ;; *) # assume okay @@ -54,7 +54,7 @@ if [ -z "$hdf5_mpi_complex_derived_datatype_works" ]; then fi fi -if [ -z "$hdf5_mpi_special_collective_io_works" ]; then +if [ -z "$hdf5_cv_mpi_special_collective_io_works" ]; then ccversion=`$CC -v 2>/dev/null` # mpich compiler will give "mpicc for 1.2.x ..." if echo "$ccversion" | grep '^mpicc for' > /dev/null ; then @@ -62,16 +62,16 @@ if [ -z "$hdf5_mpi_special_collective_io_works" ]; then ccversion=`echo $ccversion | cut -f3 -d' '` case "$ccversion" in 1.2.[0-6]*) - hdf5_mpi_special_collective_io_works='no' + hdf5_cv_mpi_special_collective_io_works='no' ;; 1.0.2) # mpich2 is recycling the version number, some report # 1.0.2, some report blank. - hdf5_mpi_special_collective_io_works='no' + hdf5_cv_mpi_special_collective_io_works='no' ;; "") # got blank ccversion. Assume it is bad a mpich2. - hdf5_mpi_special_collective_io_works='no' + hdf5_cv_mpi_special_collective_io_works='no' ;; *) # assume okay diff --git a/config/nec-superux14.1 b/config/nec-superux14.1 index 7e2c09f..a602e09 100644 --- a/config/nec-superux14.1 +++ b/config/nec-superux14.1 @@ -174,7 +174,7 @@ hdf5_cv_ldouble_to_uint_work=no hdf5_cv_ullong_to_fp_cast_works=yes hdf5_cv_ullong_to_ldouble_precision_works=no hdf5_cv_fp_to_integer_overflow_works=yes -hdf5_fp_to_ullong_accurate=no +hdf5_cv_fp_to_ullong_accurate=no hdf5_fp_to_ullong_right_maximum=no CONFIGURE_LIBS=/usr/lib/libi90sxe.a diff --git a/config/powerpc-ibm-aix4.x b/config/powerpc-ibm-aix4.x index b94f3b5..63f6ed5 100644 --- a/config/powerpc-ibm-aix4.x +++ b/config/powerpc-ibm-aix4.x @@ -117,4 +117,4 @@ fi # Use AIX supplied C++ compiler by default. CXX=${CXX=xlC} -hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'} +hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'} diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x index 80925f0..bffd182 100644 --- a/config/powerpc-ibm-aix5.x +++ b/config/powerpc-ibm-aix5.x @@ -147,7 +147,7 @@ fi # With poe version 3.2.0.19 or lower(using lpp -l all | grep ppe.poe to check the version number, # IBM MPI-IO implementation has a bug, #it cannot generate correct MPI derived datatype. Please uncomment the following line: -#hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'} +#hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'} # The default C++ compiler diff --git a/config/rs6000-ibm-aix4.x b/config/rs6000-ibm-aix4.x index 14885d1..9e54bfe 100644 --- a/config/rs6000-ibm-aix4.x +++ b/config/rs6000-ibm-aix4.x @@ -40,4 +40,4 @@ if test "X-" = "X-$f9x_flags_set"; then f9x_flags_set=yes fi # IBM MPI-IO doesn't handle complicated derived data type correctly. -hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'} +hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'} diff --git a/config/x86_64-redstorm-linux-gnu b/config/x86_64-redstorm-linux-gnu index eb8f520..7bd1c52 100644 --- a/config/x86_64-redstorm-linux-gnu +++ b/config/x86_64-redstorm-linux-gnu @@ -163,4 +163,4 @@ hdf5_cv_ullong_to_ldouble_precision_works=${hdf5_cv_ullong_to_ldouble_precision_ hdf5_cv_vsnprintf_works=${hdf5_cv_vsnprintf_works='yes'} hdf5_cv_fp_to_integer_overflow_works=${hdf5_cv_fp_to_integer_overflow_works='yes'} # mpich2 used has derived datatype errors. -hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'} +hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'} |