mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-25 17:00:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r26605] Description:

Browse Source 
Bring r26503 & r26528 from autotools_rework branch back to the trunk:

    Remove old platform configure files: craynv, dec-flags, hpux11.23,
ia64-linux-gnu, nec-superux14.1, sv1-cray, x86_64-redstorm-linux-gnu

   Also remove CONVERT_DENORMAL_FLOAT, since this was only set in the
configure files being removed.

Tested on:
    Linux/32 2.6.18 (jam) w/serial & parallel
    (Daily tested on branch for 2+ days)
This commit is contained in:
Quincey Koziol 2015-03-26 13:34:11 -05:00
parent f3dd294ff2
commit 39373fbabb
16 changed files with 10 additions and 1267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MANIFEST
View File

@ -90,16 +90,12 @@
./config/apple
./config/commence.am
./config/conclude.am
./config/craynv
./config/dec-flags
./config/examples.am
./config/freebsd
./config/gnu-fflags
./config/gnu-flags
./config/hpux11.23
./config/i386-pc-cygwin32
./config/i686-pc-cygwin
./config/ia64-linux-gnu
./config/ibm-aix
./config/ibm-flags
./config/intel-fflags
@ -109,15 +105,12 @@
./config/linux-gnulibc1
./config/linux-gnulibc2
./config/lt_vers.am
./config/nec-superux14.1
./config/Makefile.am.blank
./config/pgi-fflags
./config/pgi-flags
./config/powerpc-ibm-aix5.x
./config/solaris2.x
./config/sv1-cray
./config/x86_64-pc-cygwin
./config/x86_64-redstorm-linux-gnu
./config/site-specific/BlankForm

4
config/cmake/H5pubconf.h.in
View File

@ -43,10 +43,6 @@
writing. */
#cmakedefine H5_CLEAR_MEMORY @H5_CLEAR_MEMORY@
/* Define if your system can handle converting denormalized floating-point
values. */
#cmakedefine H5_CONVERT_DENORMAL_FLOAT @H5_CONVERT_DENORMAL_FLOAT@
/* Define if C++ compiler recognizes offsetof */
#cmakedefine H5_CXX_HAVE_OFFSETOF @H5_CXX_HAVE_OFFSETOF@

198
config/craynv
View File

@ -1,198 +0,0 @@
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
# terms governing use, modification, and redistribution, is contained in
# the files COPYING and Copyright.html. COPYING can be found at the root
# of the source code distribution tree; Copyright.html can be found at the
# root level of an installed copy of the electronic HDF5 document set and
# is linked from the top-level documents page. It can also be found at
# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
# access to either file, you may request a copy from help@hdfgroup.org.
# This file is part of the HDF5 build script. It is processed shortly
# after configure starts and defines, among other things, flags for
# the various compile modes.
# Disabling Dependency Tracking
# ---------------------
#
# The Cray X1 machines that The HDF Group tests on seem to have trouble doing
# dependency tracking (probably because they use Cray's C++ compiler,
# which autoconf may not recognize). Until this is fixed by autoconf
# or a user complains, disable dependency tracking on Crays.
enable_dependency_tracking="no"
# Choosing a C Compiler
# ---------------------
#
# The user should be able to specify the compiler by setting the CC
# environment variable to the name of the compiler and any switches it
# requires for proper operation. If CC is unset then this script may
# set it. If CC is unset by time this script completes then configure
# will try `gcc' and `cc' in that order (perhaps some others too).
#
# Note: Code later in this file may depend on the value of $CC_BASENAME
# in order to distinguish between different compilers when
# deciding which compiler command-line switches to use. This
# variable is set based on the incoming value of $CC and is only
# used within this file.
if test "X-" = "X-$CC"; then
CC=cc
CC_BASENAME=cc
fi
# no need to use RANLIB
RANLIB=:
# C Compiler and Preprocessor Flags
# ---------------------------------
#
# Flags that end with `_CFLAGS' are always passed to the compiler.
# Flags that end with `_CPPFLAGS' are passed to the compiler when
# compiling but not when linking.
#
# DEBUG_CFLAGS Flags to pass to the compiler to create a
# DEBUG_CPPFLAGS library suitable for use with debugging
# tools. Usually this list will exclude
# optimization switches (like `-O') and include
# switches that turn on symbolic debugging
# support (like `-g').
#
# PROD_CFLAGS Flags to pass to the compiler to create a
# PROFILE_CPPFLAGS library suitable for performance testing (like
# `-pg'). This may or may not include debugging
# or production flags.
#
# H5_CFLAGS Flags can be added to this variable which
# might already be partially initialized. These
# flags will always be passed to the compiler
# and should include switches to turn on full
# warnings. HDF5 attempts to be ANSI and Posix
# compliant and employ good programming
# practices resulting in few if any
# warnings.
#
# Warning flags do not have to be added to H5_CFLAGS
# variable if the compiler is the GNU gcc
# compiler or a descendent of gcc such as EGCS or PGCC.
#
# AM_CFLAGS Flags added directly into this variable will
# be propogated to the compiler wrapper scripts (h5cc,
# h5c++, et cetera) in addition to being used to compile
# the library.
#
# These flags should be set according to the compiler being used.
# There are two ways to check the compiler. You can try using `-v' or
# `--version' to see if the compiler will print a version string. You
# can use the value of $CC_BASENAME which is the base name of the
# first word in $CC (note that the value of CC may have changed
# above).
case $CC_BASENAME in
gcc)
H5_CFLAGS="$H5_CFLAGS -Wsign-compare" #Only works for some versions
DEBUG_CFLAGS="-g -fverbose-asm"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O3 -fomit-frame-pointer"
PROD_CPPFLAGS=
PROFILE_CFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
cc)
H5_CFLAGS="$H5_CFLAGS"
DEBUG_CFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CFLAGS=""
PROD_CPPFLAGS=
PROFILE_CFLAGS=
PROFILE_CPPFLAGS=
;;
*)
H5_CFLAGS="$H5_CFLAGS -ansi"
DEBUG_CFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O"
PROD_CPPFLAGS=
PROFILE_CFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
esac
# Overriding Configure Tests
# --------------------------
#
# Values for overriding configuration tests when cross compiling.
# This includes compiling on some machines where the serial front end
# compiles for a parallel back end.
# Set this to `yes' or `no' depending on whether the target is big
# endian or little endian.
#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
# Set this to the width required by printf() to print type `long
# long'. For instance, if the format would be `%lld' then set it to
# `ll' or if the format would be `%qd' set it to `q'.
#hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
# Hard set the flag to indicate that converting denormalized floating-point
# values doesn't work.
hdf5_cv_convert_denormal_float=${hdf5_cv_convert_denormal_float='no'}
# The default Fortran 90 compiler
if test "X-" = "X-$F9X"; then
F9X=ftn
fi
if test "X-" = "X-$f9x_flags_set"; then
# -Wl passes flags to the linker and -M# will ignore warnings with
# number#. Warning 405 and 412 were stopping the executable from
# being built.
# The -em flag enables .mod files, which is what HDF5 builds.
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
H5_FCFLAGS="$H5_FCFLAGS -em"
DEBUG_FCFLAGS="-g"
PROD_FCFLAGS=""
PROFILE_FCFLAGS=""
f9x_flags_set=yes
fi
# The default C++ compiler
if test -z "$CXX"; then
CXX="CC"
CXX_BASENAME=CC
fi
case $CXX_BASENAME in
g++)
H5_CXXFLAGS="$H5_CXXFLAGS -Wsign-compare" #Only works for some versions
DEBUG_CXXFLAGS="-g -fverbose-asm"
DEBUG_CPPFLAGS=
PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
PROD_CPPFLAGS=
PROFILE_CXXFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
*)
H5_CXXFLAGS="$H5_CXXFLAGS"
DEBUG_CXXFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CXXFLAGS=""
PROD_CPPFLAGS=
PROFILE_CXXFLAGS=
PROFILE_CPPFLAGS=
;;
esac

150
config/dec-flags
View File

@ -1,150 +0,0 @@
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
# terms governing use, modification, and redistribution, is contained in
# the files COPYING and Copyright.html. COPYING can be found at the root
# of the source code distribution tree; Copyright.html can be found at the
# root level of an installed copy of the electronic HDF5 document set and
# is linked from the top-level documents page. It can also be found at
# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
# access to either file, you may request a copy from help@hdfgroup.org.
# This file should be sourced into configure if the compiler is a DEC
# compiler. It is careful not to do anything if the compiler is not
# DEC; otherwise `cc_flags_set' is set to `yes'
#
# Get the compiler version unless it's already known.
#
# cc_vendor: The compiler vendor: DEC
# cc_version: Version number, like: V5.2-038
#
if test X = "X$cc_flags_set"; then
cc_vendor=DEC
cc_version="`$CC $CFLAGS $H5_CFLAGS -V 2>&1 |head -1`"
case "$cc_version" in
DEC*)
cc_version="`echo $cc_version |\
sed 's/.*DEC C \(V[0-9][-\.0-9]*\).*/\1/'`"
;;
Compaq*)
cc_version="`echo $cc_version |\
sed 's/.*Compaq C \(V[0-9][-\.0-9]*\).*/\1/'`"
;;
esac
if test X != "$gcc_version"; then
echo "compiler '$CC' is $cc_vendor-$cc_version"
else
cc_vendor=
fi
fi
# Warn about old compilers that don't work right.
case "$cc_vendor-$cc_version" in
DEC-V5.2-038)
cat <<EOF
**
** This compiler may generate incorrect code when optimizations are
** enabled. Please upgrade to a newer version (we're not sure which
** version actually works) before reporting bugs to the HDF5 team.
**
EOF
sleep 5
;;
esac
# Compiler flags
case "$cc_vendor-$cc_version" in
DEC-V5.*)
# Production
PROD_CFLAGS="-std -verbose -warnprotos -ieee -misalign -O4 -ansi_args -fp_reorder -readonly_strings -inline speed"
PROD_CPPFLAGS="-D_INTRINSICS -D_INLINE_INTRINSICS"
# Debug
DEBUG_CFLAGS="-g -std -verbose -warnprotos -ieee -misalign"
DEBUG_CPPFLAGS=
# Profile
PROFILE_CFLAGS="-pg -std -verbose -warnprotos -ieee -misalign"
PROFILE_CPPFLAGS=
# Flags are set
cc_flags_set=yes
;;
DEC-V6.*)
# Production
PROD_CFLAGS="-c99 -verbose -warnprotos -ieee -misalign -O4 -fp_reorder -readonly_strings -inline speed"
PROD_CPPFLAGS="-D_INTRINSICS -D_INLINE_INTRINSICS"
# Debug
DEBUG_CFLAGS="-g -c99 -verbose -warnprotos -ieee -misalign"
DEBUG_CPPFLAGS=
# Profile
PROFILE_CFLAGS="-pg -c99 -verbose -warnprotos -ieee -misalign"
PROFILE_CPPFLAGS=
# Flags are set
cc_flags_set=yes
;;
esac
# If no flags were set then clear the compiler vendor and version info.
if test X = "X$cc_flags_set"; then
cc_vendor=
cc_version=
fi
# The default Fortran 90 compiler
if test "X-" = "X-$FC"; then
FC=f90
fi
if test "X-" = "X-$f9x_flags_set"; then
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
H5_FCFLAGS="$H5_FCFLAGS -Olimit 2048 -std1"
DEBUG_FCFLAGS="-Olimit 2048 -std1"
PROD_FCFLAGS="-Olimit 2048 -std1"
PROFILE_FCFLAGS="-Olimit 2048 -std1"
f9x_flags_set=yes
fi
# The default C++ compiler
if test -z "$CXX"; then
CXX=cxx
CXX_BASENAME=cxx
fi
case $CXX_BASENAME in
g++)
H5_CXXFLAGS="$H5_CXXFLAGS -Wsign-compare" #Only works for some versions
DEBUG_CXXFLAGS="-g -fverbose-asm"
DEBUG_CPPFLAGS=
PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
PROD_CPPFLAGS=
PROFILE_CXXFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
*)
H5_CXXFLAGS="$H5_CXXFLAGS -tlocal -D__USE_STD_IOSTREAM"
DEBUG_CXXFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CXXFLAGS="-O"
PROD_CPPFLAGS=
PROFILE_CXXFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
esac

96
config/hpux11.23
View File

@ -1,96 +0,0 @@
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
# terms governing use, modification, and redistribution, is contained in
# the files COPYING and Copyright.html. COPYING can be found at the root
# of the source code distribution tree; Copyright.html can be found at the
# root level of an installed copy of the electronic HDF5 document set and
# is linked from the top-level documents page. It can also be found at
# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
# access to either file, you may request a copy from help@hdfgroup.org.
# This file is part of the HDF5 build script. It is processed shortly
# after configure starts and defines, among other things, flags for
# the various compile modes.
#
# See BlankForm in this directory for details.
# Default compiler is `cc'
if test "X-" = "X-$CC"; then
CC=cc
CC_BASENAME=cc
fi
# Flags
case "X-$CC" in
X-gcc)
H5_CFLAGS="$H5_CFLAGS -Wsign-compare" #Only works for some versions
DEBUG_CFLAGS="-g -fverbose-asm"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O3"
PROD_CPPFLAGS=
PROFILE_CFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
*)
H5_CFLAGS="$H5_CFLAGS -Ae -Wp,-H65536" #increase the size of macro definition table. For test/dtypes.c
DEBUG_CFLAGS=-g
DEBUG_CPPFLAGS="-Ae"
PROD_CFLAGS=-O
PROD_CPPFLAGS="-Ae"
PROFILE_CFLAGS=
PROFILE_CPPFLAGS="-Ae"
;;
esac
# The default Fortran 90 compiler
if test "X$FC" = "X"; then
FC=f90
fi
if test "X$f9x_flags_set" = "X"; then
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
H5_FCFLAGS="$H5_FCFLAGS -O"
DEBUG_FCFLAGS="-O"
PROD_FCFLAGS="-O"
PROFILE_FCFLAGS="-O"
f9x_flags_set=yes
fi
# The default C++ compiler
if test -z "$CXX"; then
CXX=aCC
CXX_BASENAME=aCC
fi
case "X-$CXX" in
X-aCC)
# +Z for PIC
H5_CXXFLAGS="$H5_CXXFLAGS +Z -D_INCLUDE_LONGLONG"
H5_CFLAGS="$H5_CFLAGS -g +O2"
DEBUG_CXXFLAGS=-g
DEBUG_CPPFLAGS=
PROD_CXXFLAGS="-O -s"
PROD_CPPFLAGS=
PROFILE_CPPFLAGS=
;;
*)
H5_CXXFLAGS="$H5_CXXFLAGS -D_INCLUDE_LONGLONG"
H5_CFLAGS="$H5_CFLAGS"
DEBUG_CXXFLAGS=
DEBUG_CPPFLAGS=
PROD_CXXFLAGS=
PROD_CPPFLAGS=
PROFILE_CPPFLAGS=
;;
esac

144
config/ia64-linux-gnu
View File

@ -1,144 +0,0 @@
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
# terms governing use, modification, and redistribution, is contained in
# the files COPYING and Copyright.html. COPYING can be found at the root
# of the source code distribution tree; Copyright.html can be found at the
# root level of an installed copy of the electronic HDF5 document set and
# is linked from the top-level documents page. It can also be found at
# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
# access to either file, you may request a copy from help@hdfgroup.org.
# This file is part of the HDF5 build script. It is processed shortly
# after configure starts and defines, among other things, flags for
# the various compile modes.
# Use Intel C compiler by default (if it's available).
# Use mpicc for parallel by default.
if test "X$CC" = "X"; then
if test "X-$enable_parallel" = "X-yes"; then
CC=mpicc
CC_BASENAME=mpicc
elif which icc > /dev/null; then
CC=icc
CC_BASENAME=icc
fi
fi
# Define RUNPARALLEL if parallel mode is enabled or a parallel compiler used.
if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpicc; then
RUNPARALLEL=${RUNPARALLEL="mpirun -np \$\${NPROCS:=6}"}
fi
#----------------------------------------------------------------------------
# Compiler flags. The CPPFLAGS values should not include package debug
# flags like `-DH5G_DEBUG' since these are added with the
# `--enable-debug' switch of configure.
case $CC_BASENAME in
ecc|icc)
. $srcdir/config/intel-flags
;;
gcc)
. $srcdir/config/gnu-flags
;;
*)
H5_CFLAGS="$H5_CFLAGS -ansi"
DEBUG_CFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O"
PROD_CPPFLAGS=
PROFILE_CFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
esac
# The default Fortran 90 compiler
# Use Intel Fortran compiler by default.
if test X-$enable_fortran = X-yes -a "X-$FC" = "X-"; then
if test "X-$enable_parallel" = "X-yes"; then
FC=mpif90
else
FC="ifort"
fi
fi
case $FC in
*efc|*ifort)
# this is for efc v7. Older efc do not work with these.
# -Vaxlib is for non-standard fortran calls like exit().
MORE_FCFLAGS='-fpp -DDEC$=DEC_ -DMS$=MS_ -Vaxlib'
H5_FCFLAGS="$H5_FCFLAGS $MORE_FCFLAGS"
f9x_flags_set=yes
;;
*)
f9x_flags_set=yes
;;
esac
# The following is not right and need work.
if test "X$f9x_flags_set" = "X"; then
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
H5_FCFLAGS="$H5_FCFLAGS"
DEBUG_FCFLAGS=""
PROD_FCFLAGS=""
PROFILE_FCFLAGS=""
f9x_flags_set=yes
fi
# The Default settings for C++
# Intel changed C++ compiler's name from "icc" to "icpc" in version 8.1
if test -z "$CXX"; then
CXX=icpc
CXX_BASENAME=icpc
fi
# A patch to make g++ getting the default settings.
# CXX_BASENAME should have been set in configure.
if test "X$CXX" = "Xg++"; then
CXX_BASENAME=g++
fi
case $CXX_BASENAME in
ecc|icc) # Intel compilers
# Default to C99 standard.
H5_CXXFLAGS="${H5_CXXFLAGS:--std=c99}"
DEBUG_CXXFLAGS="-g -w2 -Wall"
DEBUG_CPPFLAGS=
PROD_CXXFLAGS="" #Default optimization O2 is used
PROD_CPPFLAGS=
PROFILE_CXXFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
g++)
H5_CXXFLAGS="$H5_CXXFLAGS -Wsign-compare" #Only works for some versions
DEBUG_CXXFLAGS="-g -fverbose-asm"
DEBUG_CPPFLAGS=
PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
PROD_CPPFLAGS=
PROFILE_CXXFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
*)
# Default to C99 standard.
H5_CXXFLAGS="${H5_CXXFLAGS:--std=c99}"
DEBUG_CXXFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CXXFLAGS="-O"
PROD_CPPFLAGS=
PROFILE_CXXFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
esac

178
config/nec-superux14.1
View File

@ -1,178 +0,0 @@
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
# terms governing use, modification, and redistribution, is contained in
# the files COPYING and Copyright.html. COPYING can be found at the root
# of the source code distribution tree; Copyright.html can be found at the
# root level of an installed copy of the electronic HDF5 document set and
# is linked from the top-level documents page. It can also be found at
# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
# access to either file, you may request a copy from help@hdfgroup.org.
# This file is part of the HDF5 build script. It is processed shortly
# after configure starts and defines, among other things, flags for
# the various compile modes.
# [ak] created for a nec sx6 running superux with native compilers
# [ak] -xint is neccessary because of src/H5FDmulti.c[H5Pset_fapl_multi]
# [ak] integer division of unsigned longs for _memb_addr
#----------------------------------------------------------------------------
# Compiler flags. The CPPFLAGS values should not include package debug
# flags like `-DH5G_DEBUG' since these are added with the
# `--enable-debug' switch of configure.
#----------------------------------------------------------------------------
# Choosing a C Compiler
# ---------------------
#
# The user should be able to specify the compiler by setting the CC
# environment variable to the name of the compiler and any switches it
# requires for proper operation. If CC is unset then this script may
# set it. If CC is unset by time this script completes then configure
# will try `gcc' and `cc' in that order (perhaps some others too).
#
# Note: Code later in this file may depend on the value of $CC_BASENAME
# in order to distinguish between different compilers when
# deciding which compiler command-line switches to use. This
# variable is set based on the incoming value of $CC and is only
# used within this file.
if test "X-" = "X-$CC"; then
CC="sxc++ -Xa -size_t64 -xint -K c99"
CC_BASENAME=sxc++
fi
# The default archiver is `sxar'
AR=${AR:-sxar}
RANLIB=${RANLIB:=":"}
if test "X-" = "X-$CXX"; then
CXX="sxc++ -size_t64 -xint -Kexceptions"
CXX_BASENAME=sxc++
fi
if test "X-" = "X-$F9X"; then
FC="sxf90 -size_t64 -ew "
FC_BASENAME=sxf90
fi
# C Compiler and Preprocessor Flags
# ---------------------------------
#
# Flags that end with `_CFLAGS' are always passed to the compiler.
# Flags that end with `_CPPFLAGS' are passed to the compiler when
# compiling but not when linking.
#
# DEBUG_CFLAGS Flags to pass to the compiler to create a
# DEBUG_CPPFLAGS library suitable for use with debugging
# tools. Usually this list will exclude
# optimization switches (like `-O') and include
# switches that turn on symbolic debugging
# support (like `-g').
#
# PROD_CFLAGS Flags to pass to the compiler to create a
# PROD_CPPFLAGS production version of the library. These
# usualy exclude symbolic debugging switches
# (like `-g') and include optimization switches
# (like `-O').
#
# PROFILE_CFLAGS Flags to pass to the compiler to create a
# PROFILE_CPPFLAGS library suitable for performance testing (like
# `-pg'). This may or may not include debugging
# or production flags.
#
# H5_CFLAGS Flags can be added to this variable which
# might already be partially initialized. These
# flags will always be passed to the compiler
# and should include switches to turn on full
# warnings. HDF5 attempts to be ANSI and Posix
# compliant and employ good programming
# practices resulting in few if any
# warnings.
#
# Warning flags do not have to be added to H5_CFLAGS
# variable if the compiler is the GNU gcc
# compiler or a descendent of gcc such as EGCS or PGCC.
#
# AM_CFLAGS Flags added directly into this variable will
# be propogated to the compiler wrapper scripts (h5cc,
# h5c++, et cetera) in addition to being used to compile
# the library.
#
# These flags should be set according to the compiler being used.
# There are two ways to check the compiler. You can try using `-v' or
# `--version' to see if the compiler will print a version string. You
# can use the value of $CC_BASENAME which is the base name of the
# first word in $CC (note that the value of CC may have changed
# above).
case $CC_BASENAME in
cc)
H5_CFLAGS="$H5_CFLAGS"
DEBUG_CFLAGS="-Cdebug -g -wall"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-Cnoopt"
PROD_CPPFLAGS=
PROFILE_CFLAGS="-p"
PROFILE_CPPFLAGS=
;;
*)
H5_CFLAGS="$H5_CFLAGS"
DEBUG_CFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CFLAGS=""
PROD_CPPFLAGS=
PROFILE_CFLAGS="-p"
PROFILE_CPPFLAGS=
;;
esac
case $CXX_BASENAME in
c++)
H5_CXXFLAGS="$H5_CXXFLAGS -Tlocal"
;;
*)
H5_CXXFLAGS="$H5_CXXFLAGS"
;;
esac
case $FC_BASENAME in
f90)
H5_FCFLAGS="$F9XFLAGS"
;;
*)
H5_FCFLAGS="$F9XFLAGS"
;;
esac
# Overriding Configure Tests
# --------------------------
#
ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=0}
hdf5_cv_gettimeofday_tz=no
# I have to add the follwoing two lines when -K c99 was used
ac_cv_func_getrusage=no
ac_cv_func_gethostname=no
hdf5_cv_vsnprintf_works=no
hdf5_cv_printf_ll=l
hdf5_cv_system_scope_threads=no
hdf5_cv_sw_ldouble_to_integer_works=no
hdf5_cv_fp_to_ullong_right_maximum=no
hdf5_cv_fp_to_ullong_right_maximum=no
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_cv_fp_to_ullong_accurate=no
hdf5_cv_fp_to_ullong_right_maximum=no
CONFIGURE_LIBS=/usr/lib/libi90sxe.a

199
config/sv1-cray
View File

@ -1,199 +0,0 @@
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
# terms governing use, modification, and redistribution, is contained in
# the files COPYING and Copyright.html. COPYING can be found at the root
# of the source code distribution tree; Copyright.html can be found at the
# root level of an installed copy of the electronic HDF5 document set and
# is linked from the top-level documents page. It can also be found at
# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
# access to either file, you may request a copy from help@hdfgroup.org.
# This file is part of the HDF5 build script. It is processed shortly
# after configure starts and defines, among other things, flags for
# the various compile modes.
#----------------------------------------------------------------------------
# Compiler flags. The CPPFLAGS values should not include package debug
# flags like `-DH5G_DEBUG' since these are added with the
# `--enable-debug' switch of configure.
#----------------------------------------------------------------------------
# Choosing a C Compiler
# ---------------------
#
# The user should be able to specify the compiler by setting the CC
# environment variable to the name of the compiler and any switches it
# requires for proper operation. If CC is unset then this script may
# set it. If CC is unset by time this script completes then configure
# will try `gcc' and `cc' in that order (perhaps some others too).
#
# Note: Code later in this file may depend on the value of $CC_BASENAME
# in order to distinguish between different compilers when
# deciding which compiler command-line switches to use. This
# variable is set based on the incoming value of $CC and is only
# used within this file.
if test "X-" = "X-$CC"; then
CC=cc
CC_BASENAME=cc
fi
# no need to use RANLIB
RANLIB=:
# C Compiler and Preprocessor Flags
# ---------------------------------
#
# Flags that end with `_CFLAGS' are always passed to the compiler.
# Flags that end with `_CPPFLAGS' are passed to the compiler when
# compiling but not when linking.
#
# DEBUG_CFLAGS Flags to pass to the compiler to create a
# DEBUG_CPPFLAGS library suitable for use with debugging
# tools. Usually this list will exclude
# optimization switches (like `-O') and include
# switches that turn on symbolic debugging
# support (like `-g').
#
# PROD_CFLAGS Flags to pass to the compiler to create a
# PROD_CPPFLAGS production version of the library. These
# usualy exclude symbolic debugging switches
# (like `-g') and include optimization switches
# (like `-O').
#
# PROFILE_CFLAGS Flags to pass to the compiler to create a
# PROFILE_CPPFLAGS library suitable for performance testing (like
# `-pg'). This may or may not include debugging
# or production flags.
#
# H5_CFLAGS Flags can be added to this variable which
# might already be partially initialized. These
# flags will always be passed to the compiler
# and should include switches to turn on full
# warnings. HDF5 attempts to be ANSI and Posix
# compliant and employ good programming
# practices resulting in few if any
# warnings.
#
# Warning flags do not have to be added to H5_CFLAGS
# variable if the compiler is the GNU gcc
# compiler or a descendent of gcc such as EGCS or PGCC.
#
# AM_CFLAGS Flags added directly into this variable will
# be propogated to the compiler wrapper scripts (h5cc,
# h5c++, et cetera) in addition to being used to compile
# the library.
#
# These flags should be set according to the compiler being used.
# There are two ways to check the compiler. You can try using `-v' or
# `--version' to see if the compiler will print a version string. You
# can use the value of $CC_BASENAME which is the base name of the
# first word in $CC (note that the value of CC may have changed
# above).
case $CC_BASENAME in
gcc)
H5_CFLAGS="$H5_CFLAGS -Wsign-compare" #Only works for some versions
DEBUG_CFLAGS="-g -fverbose-asm"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O3 -fomit-frame-pointer"
PROD_CPPFLAGS=
PROFILE_CFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
cc)
H5_CFLAGS="$H5_CFLAGS"
DEBUG_CFLAGS="-g -h zero"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O2 -h scalar0 -h vector0 -h task1"
PROD_CPPFLAGS=
PROFILE_CFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
*)
H5_CFLAGS="$H5_CFLAGS -ansi"
DEBUG_CFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O"
PROD_CPPFLAGS=
PROFILE_CFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
esac
# Overriding Configure Tests
# --------------------------
#
# Values for overriding configuration tests when cross compiling.
# This includes compiling on some machines where the serial front end
# compiles for a parallel back end.
# Set this to `yes' or `no' depending on whether the target is big
# endian or little endian.
#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
# Set this to the width required by printf() to print type `long
# long'. For instance, if the format would be `%lld' then set it to
# `ll' or if the format would be `%qd' set it to `q'.
#hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
# Hard set the flag to indicate that converting denormalized floating-point
# values doesn't work.
hdf5_cv_convert_denormal_float=${hdf5_cv_convert_denormal_float='no'}
# The default Fortran 90 compiler
if test "X-" = "X-$FC"; then
FC=f90
fi
if test "X-" = "X-$f9x_flags_set"; then
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
H5_FCFLAGS="$H5_FCFLAGS -dp"
DEBUG_FCFLAGS="-dp"
PROD_FCFLAGS="-dp"
PROFILE_FCFLAGS="-dp"
f9x_flags_set=yes
fi
# The default C++ compiler
if test -z "$CXX"; then
CXX="CC"
CXX_BASENAME=CC
fi
case $CXX_BASENAME in
g++)
H5_CXXFLAGS="$H5_CXXFLAGS -Wsign-compare" #Only works for some versions
DEBUG_CXXFLAGS="-g -fverbose-asm"
DEBUG_CPPFLAGS=
PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
PROD_CPPFLAGS=
PROFILE_CXXFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
*)
H5_CXXFLAGS="$H5_CXXFLAGS -h instantiate=used"
DEBUG_CXXFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CXXFLAGS="-O"
PROD_CPPFLAGS=
PROFILE_CXXFLAGS="-pg"
PROFILE_CPPFLAGS=
;;
esac

162
config/x86_64-redstorm-linux-gnu
View File

@ -1,162 +0,0 @@
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
# terms governing use, modification, and redistribution, is contained in
# the files COPYING and Copyright.html. COPYING can be found at the root
# of the source code distribution tree; Copyright.html can be found at the
# root level of an installed copy of the electronic HDF5 document set and
# is linked from the top-level documents page. It can also be found at
# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
# access to either file, you may request a copy from help@hdfgroup.org.
# This file is part of the HDF5 build script. It is processed shortly
# after configure starts and defines, among other things, flags for
# the various compile modes.
#
# See BlankForm in this directory for details.
# This is for the ASCI RED STORM machine
# Define RUNPARALLEL and RUNSERIAL if parallel mode is enabled or a parallel
# compiler is used.
if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpicc; then
RUNSERIAL=${RUNSERIAL:-"yod -sz 1"}
RUNPARALLEL=${RUNPARALLEL:-"yod -sz 3"}
# Disable stream-vfd option. It does not work in parallel mode.
enable_stream_vfd="${enable_stream_vfd:-no}"
# Turn off shared lib option. It does not work in parallel mode.
enable_shared="${enable_shared:-no}"
fi
H5_CFLAGS="$H5_CFLAGS -DRED_STORM"
# What compiler flags should be used for code development?
DEBUG_CFLAGS=-g
DEBUG_CPPFLAGS=
# What compiler flags should be used for building a production
# library?
PROD_CFLAGS=-O
PROD_CPPFLAGS=
# What compiler flags enable code profiling?
PROFILE_CFLAGS=-pg
PROFILE_CPPFLAGS=
# Set this to the width required by printf() to print type `long
# long'. For instance, if the format would be `%lld' then set it to
# `ll' or if the format would be `%qd' set it to `q'.
hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
# Cache the sizeof of the following types to save configure time.
# These are verified in test/tconfig in case they change.
ac_cv_type_char=${ac_cv_type_char=yes}
ac_cv_sizeof_char=${ac_cv_sizeof_char='1'}
ac_cv_type_short=${ac_cv_type_short=yes}
ac_cv_sizeof_short=${ac_cv_sizeof_short='2'}
ac_cv_type_int=${ac_cv_type_int=yes}
ac_cv_sizeof_int=${ac_cv_sizeof_int='4'}
ac_cv_type_long=${ac_cv_type_long=yes}
ac_cv_sizeof_long=${ac_cv_sizeof_long='8'}
ac_cv_type_float=${ac_cv_type_float=yes}
ac_cv_sizeof_float=${ac_cv_sizeof_float='4'}
ac_cv_type_double=${ac_cv_type_double=yes}
ac_cv_sizeof_double=${ac_cv_sizeof_double='8'}
ac_cv_type_long_double=${ac_cv_type_long_double=yes}
# no cache for long double which varies in size in different compilers.
# gcc defines it as 12 bytes but pgcc defines it as 8 bytes.
#ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double='8'}
ac_cv_type_long_long=${ac_cv_type_long_long=yes}
ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long='8'}
ac_cv_type_size_t=${ac_cv_type_size_t=yes}
ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t='8'}
ac_cv_type_ssize_t=${ac_cv_type_ssize_t=yes}
ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t='8'}
ac_cv_type_off_t=${ac_cv_type_off_t=yes}
ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t='8'}
# Hard set sizeof of the following types to 0 because they are not supported.
#ac_cv_type___int64=${ac_cv_type___int64=no}
#ac_cv_sizeof___int64=${ac_cv_sizeof___int64='0'}
# Hard set malloc of zero bytes to no because it does not work.
hdf5_cv_malloc_works=${hdf5_cv_malloc_works='no'}
# Cache the sizeof of the following types to save configure time.
# These are verified in test/tconfig in case they change.
ac_cv_type_int8_t=${ac_cv_type_int8_t=yes}
ac_cv_type_int16_t=${ac_cv_type_int16_t=yes}
ac_cv_type_int32_t=${ac_cv_type_int32_t=yes}
ac_cv_type_int64_t=${ac_cv_type_int64_t=yes}
ac_cv_type_uint8_t=${ac_cv_type_uint8_t=yes}
ac_cv_type_uint16_t=${ac_cv_type_uint16_t=yes}
ac_cv_type_uint32_t=${ac_cv_type_uint32_t=yes}
ac_cv_type_uint64_t=${ac_cv_type_uint64_t=yes}
ac_cv_sizeof_int8_t=${ac_cv_sizeof_int8_t='1'}
ac_cv_sizeof_int16_t=${ac_cv_sizeof_int16_t='2'}
ac_cv_sizeof_int32_t=${ac_cv_sizeof_int32_t='4'}
ac_cv_sizeof_int64_t=${ac_cv_sizeof_int64_t='8'}
ac_cv_sizeof_uint8_t=${ac_cv_sizeof_uint8_t='1'}
ac_cv_sizeof_uint16_t=${ac_cv_sizeof_uint16_t='2'}
ac_cv_sizeof_uint32_t=${ac_cv_sizeof_uint32_t='4'}
ac_cv_sizeof_uint64_t=${ac_cv_sizeof_uint64_t='8'}
# Cache the sizeof of the following types to save configure time.
# These are verified in test/tconfig in case they change.
ac_cv_type_int_least8_t=${ac_cv_type_int_least8_t=yes}
ac_cv_type_int_least16_t=${ac_cv_type_int_least16_t=yes}
ac_cv_type_int_least32_t=${ac_cv_type_int_least32_t=yes}
ac_cv_type_int_least64_t=${ac_cv_type_int_least64_t=yes}
ac_cv_type_uint_least8_t=${ac_cv_type_uint_least8_t=yes}
ac_cv_type_uint_least16_t=${ac_cv_type_uint_least16_t=yes}
ac_cv_type_uint_least32_t=${ac_cv_type_uint_least32_t=yes}
ac_cv_type_uint_least64_t=${ac_cv_type_uint_least64_t=yes}
ac_cv_sizeof_int_least8_t=${ac_cv_sizeof_int_least8_t='1'}
ac_cv_sizeof_int_least16_t=${ac_cv_sizeof_int_least16_t='2'}
ac_cv_sizeof_int_least32_t=${ac_cv_sizeof_int_least32_t='4'}
ac_cv_sizeof_int_least64_t=${ac_cv_sizeof_int_least64_t='8'}
ac_cv_sizeof_uint_least8_t=${ac_cv_sizeof_uint_least8_t='1'}
ac_cv_sizeof_uint_least16_t=${ac_cv_sizeof_uint_least16_t='2'}
ac_cv_sizeof_uint_least32_t=${ac_cv_sizeof_uint_least32_t='4'}
ac_cv_sizeof_uint_least64_t=${ac_cv_sizeof_uint_least64_t='8'}
# Cache the sizeof of the following types to save configure time.
# These are verified in test/tconfig in case they change.
ac_cv_type_int_fast8_t=${ac_cv_type_int_fast8_t=yes}
ac_cv_type_int_fast16_t=${ac_cv_type_int_fast16_t=yes}
ac_cv_type_int_fast32_t=${ac_cv_type_int_fast32_t=yes}
ac_cv_type_int_fast64_t=${ac_cv_type_int_fast64_t=yes}
ac_cv_type_uint_fast8_t=${ac_cv_type_uint_fast8_t=yes}
ac_cv_type_uint_fast16_t=${ac_cv_type_uint_fast16_t=yes}
ac_cv_type_uint_fast32_t=${ac_cv_type_uint_fast32_t=yes}
ac_cv_type_uint_fast64_t=${ac_cv_type_uint_fast64_t=yes}
ac_cv_sizeof_int_fast8_t=${ac_cv_sizeof_int_fast8_t='1'}
ac_cv_sizeof_int_fast16_t=${ac_cv_sizeof_int_fast16_t='8'}
ac_cv_sizeof_int_fast32_t=${ac_cv_sizeof_int_fast32_t='8'}
ac_cv_sizeof_int_fast64_t=${ac_cv_sizeof_int_fast64_t='8'}
ac_cv_sizeof_uint_fast8_t=${ac_cv_sizeof_uint_fast8_t='1'}
ac_cv_sizeof_uint_fast16_t=${ac_cv_sizeof_uint_fast16_t='8'}
ac_cv_sizeof_uint_fast32_t=${ac_cv_sizeof_uint_fast32_t='8'}
ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t='8'}
hdf5_cv_system_scope_threads=${hdf5_cv_system_scope_threads="no"}
# Hard set MPI_File_set_size() working for files over 2GB to yes
hdf5_cv_mpi_file_set_size_big=${hdf5_cv_mpi_file_set_size_big='yes'}
# Hard set variables for v1.7 and higher.
# Set gettimeofday_tz to yes.
hdf5_cv_gettimeofday_tz=${hdf5_cv_gettimeofday_tz='yes'}
hdf5_cv_convert_denormal_float=${hdf5_cv_convert_denormal_float='no'}
hdf5_cv_fp_to_ullong_right_maximum=${hdf5_cv_fp_to_ullong_right_maximum='yes'}
hdf5_cv_ldouble_to_uint_works=${hdf5_cv_ldouble_to_uint_works='yes'}
hdf5_cv_sw_ldouble_to_integer_works=${hdf5_cv_sw_ldouble_to_integer_works='yes'}
hdf5_cv_ullong_to_fp_cast_works=${hdf5_cv_ullong_to_fp_cast_works='yes'}
hdf5_cv_ullong_to_ldouble_precision_works=${hdf5_cv_ullong_to_ldouble_precision_works='yes'}
hdf5_cv_vsnprintf_works=${hdf5_cv_vsnprintf_works='yes'}
hdf5_cv_fp_to_integer_overflow_works=${hdf5_cv_fp_to_integer_overflow_works='yes'}

26
configure vendored
View File

@ -28075,32 +28075,6 @@ else
$as_echo "no" >&6; }
fi
## ----------------------------------------------------------------------
## Set the flag to indicate that the machine can handle converting
## denormalized floating-point values.
## (This flag should be set for all machines, except for the Crays, where
## the cache value is set in it's config file)
##
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if converting denormalized floating-point values is possible" >&5
$as_echo_n "checking if converting denormalized floating-point values is possible... " >&6; }
if ${hdf5_cv_convert_denormal_float+:} false; then :
$as_echo_n "(cached) " >&6
else
hdf5_cv_convert_denormal_float=yes
fi
if test ${hdf5_cv_convert_denormal_float} = "yes"; then
$as_echo "#define CONVERT_DENORMAL_FLOAT 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
## ----------------------------------------------------------------------
## Set the flag to indicate that the machine can handle converting
## floating-point to long long values.

17
configure.ac
View File

@ -2521,23 +2521,6 @@ else
AC_MSG_RESULT([no])
fi
## ----------------------------------------------------------------------
## Set the flag to indicate that the machine can handle converting
## denormalized floating-point values.
## (This flag should be set for all machines, except for the Crays, where
## the cache value is set in it's config file)
##
AC_MSG_CHECKING([if converting denormalized floating-point values is possible])
AC_CACHE_VAL([hdf5_cv_convert_denormal_float], [hdf5_cv_convert_denormal_float=yes])
if test ${hdf5_cv_convert_denormal_float} = "yes"; then
AC_DEFINE([CONVERT_DENORMAL_FLOAT], [1],
[Define if your system can handle converting denormalized floating-point values.])
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
## ----------------------------------------------------------------------
## Set the flag to indicate that the machine can handle converting
## floating-point to long long values.

6
src/H5T.c
View File

@ -1073,16 +1073,14 @@ H5T_init_interface(void)
*/
/* floating point */
#if H5T_CONV_INTERNAL_FP_FP
status |= H5T_register(H5T_PERS_HARD, "flt_dbl", native_float, native_double, H5T__conv_float_double, H5AC_dxpl_id, FALSE);
status |= H5T_register(H5T_PERS_HARD, "dbl_flt", native_double, native_float, H5T__conv_double_float, H5AC_dxpl_id, FALSE);
#endif /*H5T_CONV_INTERNAL_FP_FP*/
#if H5T_CONV_INTERNAL_FP_LDOUBLE
#if H5_SIZEOF_LONG_DOUBLE != 0
status |= H5T_register(H5T_PERS_HARD, "flt_ldbl", native_float, native_ldouble, H5T__conv_float_ldouble, H5AC_dxpl_id, FALSE);
status |= H5T_register(H5T_PERS_HARD, "dbl_ldbl", native_double, native_ldouble, H5T__conv_double_ldouble, H5AC_dxpl_id, FALSE);
status |= H5T_register(H5T_PERS_HARD, "ldbl_flt", native_ldouble, native_float, H5T__conv_ldouble_float, H5AC_dxpl_id, FALSE);
status |= H5T_register(H5T_PERS_HARD, "ldbl_dbl", native_ldouble, native_double, H5T__conv_ldouble_double, H5AC_dxpl_id, FALSE);
#endif /*H5T_CONV_INTERNAL_FP_LDOUBLE*/
#endif /* H5_SIZEOF_LONG_DOUBLE != 0 */
/* from long long */
status |= H5T_register(H5T_PERS_HARD, "llong_ullong", native_llong, native_ullong, H5T__conv_llong_ullong, H5AC_dxpl_id, FALSE);

20
src/H5Tconv.c
View File

@ -7086,7 +7086,6 @@ H5T__conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
* destination values are packed.
*-------------------------------------------------------------------------
*/
#if H5T_CONV_INTERNAL_FP_FP
herr_t
H5T__conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
@ -7095,7 +7094,6 @@ H5T__conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
{
H5T_CONV_fF(FLOAT, DOUBLE, float, double, -, -);
}
#endif /* H5T_CONV_INTERNAL_FP_FP */
/*-------------------------------------------------------------------------
@ -7113,7 +7111,7 @@ H5T__conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
*-------------------------------------------------------------------------
*/
#if H5T_CONV_INTERNAL_FP_LDOUBLE
#if H5_SIZEOF_LONG_DOUBLE != 0
herr_t
H5T__conv_float_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
@ -7122,7 +7120,7 @@ H5T__conv_float_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
{
H5T_CONV_fF(FLOAT, LDOUBLE, float, long double, -, -);
}
#endif /*H5T_CONV_INTERNAL_FP_LDOUBLE*/
#endif /* H5_SIZEOF_LONG_DOUBLE != 0 */
/*-------------------------------------------------------------------------
@ -7147,7 +7145,6 @@ H5T__conv_float_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
* destination values are packed.
*-------------------------------------------------------------------------
*/
#if H5T_CONV_INTERNAL_FP_FP
herr_t
H5T__conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
@ -7156,7 +7153,6 @@ H5T__conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
{
H5T_CONV_Ff(DOUBLE, FLOAT, double, float, -FLT_MAX, FLT_MAX);
}
#endif /*H5T_CONV_INTERNAL_FP_FP*/
/*-------------------------------------------------------------------------
@ -7174,7 +7170,7 @@ H5T__conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
*-------------------------------------------------------------------------
*/
#if H5T_CONV_INTERNAL_FP_LDOUBLE
#if H5_SIZEOF_LONG_DOUBLE != 0
herr_t
H5T__conv_double_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
@ -7183,7 +7179,7 @@ H5T__conv_double_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
{
H5T_CONV_fF(DOUBLE, LDOUBLE, double, long double, -, -);
}
#endif /*H5T_CONV_INTERNAL_FP_LDOUBLE*/
#endif /* H5_SIZEOF_LONG_DOUBLE != 0 */
/*-------------------------------------------------------------------------
@ -7201,7 +7197,7 @@ H5T__conv_double_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
*-------------------------------------------------------------------------
*/
#if H5T_CONV_INTERNAL_FP_LDOUBLE
#if H5_SIZEOF_LONG_DOUBLE != 0
herr_t
H5T__conv_ldouble_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
@ -7210,7 +7206,7 @@ H5T__conv_ldouble_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
{
H5T_CONV_Ff(LDOUBLE, FLOAT, long double, float, -FLT_MAX, FLT_MAX);
}
#endif /* H5T_CONV_INTERNAL_FP_LDOUBLE */
#endif /* H5_SIZEOF_LONG_DOUBLE != 0 */
/*-------------------------------------------------------------------------
@ -7228,7 +7224,7 @@ H5T__conv_ldouble_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
*-------------------------------------------------------------------------
*/
#if H5T_CONV_INTERNAL_FP_LDOUBLE
#if H5_SIZEOF_LONG_DOUBLE != 0
herr_t
H5T__conv_ldouble_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
@ -7237,7 +7233,7 @@ H5T__conv_ldouble_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
{
H5T_CONV_Ff(LDOUBLE, DOUBLE, long double, double, -DBL_MAX, DBL_MAX);
}
#endif /*H5T_CONV_INTERNAL_FP_LDOUBLE*/
#endif /* H5_SIZEOF_LONG_DOUBLE != 0 */
/*-------------------------------------------------------------------------

13
src/H5Tpkg.h
View File

@ -111,19 +111,6 @@
/* (_not_ setting H5T_VISIT_SIMPLE and setting either H5T_VISIT_COMPLEX_FIRST or H5T_VISIT_COMPLEX_LAST will mean visiting all nodes _except_ "simple" "leafs" in the "tree" */
/* Define an internal macro for converting between floating number(float and double) and floating number.
* All Cray compilers don't support denormalized floating values generating exception(?). */
#if H5_CONVERT_DENORMAL_FLOAT
#define H5T_CONV_INTERNAL_FP_FP 1
#endif /*H5_CONVERT_DENORMAL_FLOAT*/
/* Define an internal macro for converting between floating number(float and double) and long double.
* All Cray compilers don't support denormalized floating values generating exception(?). NEC doesn't
* support long double. */
#if H5_SIZEOF_LONG_DOUBLE && H5_CONVERT_DENORMAL_FLOAT
#define H5T_CONV_INTERNAL_FP_LDOUBLE 1
#endif /*H5_SIZEOF_LONG_DOUBLE && H5_CONVERT_DENORMAL_FLOAT*/
/* Define an internal macro for converting long long to long double. Mac OS 10.4 gives some
* incorrect conversions. */
#if (H5_WANT_DATA_ACCURACY && defined(H5_LLONG_TO_LDOUBLE_CORRECT)) || (!H5_WANT_DATA_ACCURACY)

4
src/H5config.h.in
View File

@ -10,10 +10,6 @@
writing. */
#undef CLEAR_MEMORY
/* Define if your system can handle converting denormalized floating-point
values. */
#undef CONVERT_DENORMAL_FLOAT
/* Define if C++ compiler recognizes offsetof */
#undef CXX_HAVE_OFFSETOF

53
test/dt_arith.c
View File

@ -3294,7 +3294,6 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
check_mant[1] = HDfrexpl(hw_ld, check_expo+1);
#endif
}
#ifdef H5_CONVERT_DENORMAL_FLOAT
/* Special check for denormalized values */
if(check_expo[0]<(-(int)dst_ebias) || check_expo[1]<(-(int)dst_ebias)) {
int expo_diff=check_expo[0]-check_expo[1];
@ -3317,58 +3316,6 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
HDfabs(check_mant[0]-check_mant[1])<FP_EPSILON)
continue;
} /* end else */
#else /* H5_CONVERT_DENORMAL_FLOAT */
{
hssize_t expo; /*exponent */
uint8_t tmp[32];
assert(src_size<=sizeof(tmp));
if(sendian==H5T_ORDER_LE)
HDmemcpy(tmp,&saved[j*src_size],src_size);
else if(sendian==H5T_ORDER_BE)
for (k=0; k<src_size; k++)
tmp[k]=saved[j*src_size+(src_size-(k+1))];
else {
for (k = 0; k < src_size; k += 4) {
tmp[k] = saved[j*src_size+(src_size-2)-k];
tmp[k+1] = saved[j*src_size+(src_size-1)-k];
tmp[(src_size-2)-k] = saved[j*src_size+k];
tmp[(src_size-1)-k] = saved[j*src_size+k+1];
}
}
expo = H5T__bit_get_d(tmp, src_epos, src_esize);
if(expo==0)
continue; /* Denormalized floating-point value detected */
else {
assert(dst_size<=sizeof(tmp));
if(sendian==H5T_ORDER_LE)
HDmemcpy(tmp,&buf[j*dst_size],dst_size);
else if(sendian==H5T_ORDER_BE)
for (k=0; k<dst_size; k++)
tmp[k]=buf[j*dst_size+(dst_size-(k+1))];
else {
for (k = 0; k < src_size; k += 4) {
tmp[k] = buf[j*dst_size+(dst_size-2)-k];
tmp[k+1] = buf[j*dst_size+(dst_size-1)-k];
tmp[(dst_size-2)-k] = buf[j*dst_size+k];
tmp[(dst_size-1)-k] = buf[j*dst_size+k+1];
}
}
expo = H5T__bit_get_d(tmp, dst_epos, dst_esize);
if(expo==0)
continue; /* Denormalized floating-point value detected */
else {
if (check_expo[0]==check_expo[1] &&
HDfabs(check_mant[0]-check_mant[1])<FP_EPSILON)
continue;
} /* end else */
} /* end else */
}
#endif /* H5_CONVERT_DENORMAL_FLOAT */
}
if (0==fails_this_test++) {