[svn-r17606] Code Cleanup:

TFLOPS machine has retired long ago. Removed all code specific for its
support.

Test:
h5committested.
This commit is contained in:
Albert Cheng 2009-10-07 00:08:05 -05:00
parent 7f1379704f
commit 8d8f365711
10 changed files with 25 additions and 276 deletions

View File

@ -93,7 +93,6 @@
./config/ia64-linux-gnu
./config/intel-fflags
./config/intel-flags
./config/intel-osf1
./config/irix5.x
./config/irix6.x
./config/linux-gnu

View File

@ -1,180 +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 TFLOPS machine
# The default compiler is `cicc'
if test "X-" = "X-$CC"; then
CC=cicc
CC_BASENAME=cicc
fi
# The default archiver is `xar'
AR=${AR:-xar}
# There is no ranlib
RANLIB=:
# Additional libraries
LIBS="$LIBS -lnoop_stubs"
# How to run serial and parallel test programs
# Default parallel tests can fit within 1 processor in -proc 3 mode.
# You may want to use -proc 3 to use fewer physical nodes.
RUNSERIAL=${RUNSERIAL:-"yod -sz 1"}
RUNPARALLEL=${RUNPARALLEL:-"yod -sz 8"}
# CFLAGS must be set else configure set it to -g
CFLAGS="$CFLAGS"
# What must *always* be present for things to compile correctly?
# -DH5_TFLOPS: for the Sandia Tflops machine. Had used the builtin
# __PUMAGON__ but H5_TFLOPS is more meaningful.
CPPFLAGS="$CPPFLAGS -DH5_TFLOPS"
# 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=
# Turn off shared lib option. It does not work for TFLOPS yet.
enable_shared="${enable_shared:-no}"
# Disable stream-vfd option. It does not work for TFLOPS.
enable_stream_vfd="${enable_stream_vfd:-no}"
# 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='4'}
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}
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='4'}
ac_cv_type_ssize_t=${ac_cv_type_ssize_t=yes}
ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t='4'}
ac_cv_type_off_t=${ac_cv_type_off_t=yes}
ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t='4'}
# 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'}
# Hard set sizeof_intN_t to 0 because they are not supported.
ac_cv_type_int8_t=${ac_cv_type_int8_t=no}
ac_cv_type_int16_t=${ac_cv_type_int16_t=no}
ac_cv_type_int32_t=${ac_cv_type_int32_t=no}
ac_cv_type_int64_t=${ac_cv_type_int64_t=no}
ac_cv_type_uint8_t=${ac_cv_type_uint8_t=no}
ac_cv_type_uint16_t=${ac_cv_type_uint16_t=no}
ac_cv_type_uint32_t=${ac_cv_type_uint32_t=no}
ac_cv_type_uint64_t=${ac_cv_type_uint64_t=no}
ac_cv_sizeof_int8_t=${ac_cv_sizeof_int8_t='0'}
ac_cv_sizeof_int16_t=${ac_cv_sizeof_int16_t='0'}
ac_cv_sizeof_int32_t=${ac_cv_sizeof_int32_t='0'}
ac_cv_sizeof_int64_t=${ac_cv_sizeof_int64_t='0'}
ac_cv_sizeof_uint8_t=${ac_cv_sizeof_uint8_t='0'}
ac_cv_sizeof_uint16_t=${ac_cv_sizeof_uint16_t='0'}
ac_cv_sizeof_uint32_t=${ac_cv_sizeof_uint32_t='0'}
ac_cv_sizeof_uint64_t=${ac_cv_sizeof_uint64_t='0'}
# Hard set sizeof_int_leastN_t to 0 because they are not supported.
ac_cv_type_int_least8_t=${ac_cv_type_int_least8_t=no}
ac_cv_type_int_least16_t=${ac_cv_type_int_least16_t=no}
ac_cv_type_int_least32_t=${ac_cv_type_int_least32_t=no}
ac_cv_type_int_least64_t=${ac_cv_type_int_least64_t=no}
ac_cv_type_uint_least8_t=${ac_cv_type_uint_least8_t=no}
ac_cv_type_uint_least16_t=${ac_cv_type_uint_least16_t=no}
ac_cv_type_uint_least32_t=${ac_cv_type_uint_least32_t=no}
ac_cv_type_uint_least64_t=${ac_cv_type_uint_least64_t=no}
ac_cv_sizeof_int_least8_t=${ac_cv_sizeof_int_least8_t='0'}
ac_cv_sizeof_int_least16_t=${ac_cv_sizeof_int_least16_t='0'}
ac_cv_sizeof_int_least32_t=${ac_cv_sizeof_int_least32_t='0'}
ac_cv_sizeof_int_least64_t=${ac_cv_sizeof_int_least64_t='0'}
ac_cv_sizeof_uint_least8_t=${ac_cv_sizeof_uint_least8_t='0'}
ac_cv_sizeof_uint_least16_t=${ac_cv_sizeof_uint_least16_t='0'}
ac_cv_sizeof_uint_least32_t=${ac_cv_sizeof_uint_least32_t='0'}
ac_cv_sizeof_uint_least64_t=${ac_cv_sizeof_uint_least64_t='0'}
# Hard set sizeof_int_fastN_t to 0 because they are not supported.
ac_cv_type_int_fast8_t=${ac_cv_type_int_fast8_t=no}
ac_cv_type_int_fast16_t=${ac_cv_type_int_fast16_t=no}
ac_cv_type_int_fast32_t=${ac_cv_type_int_fast32_t=no}
ac_cv_type_int_fast64_t=${ac_cv_type_int_fast64_t=no}
ac_cv_type_uint_fast8_t=${ac_cv_type_uint_fast8_t=no}
ac_cv_type_uint_fast16_t=${ac_cv_type_uint_fast16_t=no}
ac_cv_type_uint_fast32_t=${ac_cv_type_uint_fast32_t=no}
ac_cv_type_uint_fast64_t=${ac_cv_type_uint_fast64_t=no}
ac_cv_sizeof_int_fast8_t=${ac_cv_sizeof_int_fast8_t='0'}
ac_cv_sizeof_int_fast16_t=${ac_cv_sizeof_int_fast16_t='0'}
ac_cv_sizeof_int_fast32_t=${ac_cv_sizeof_int_fast32_t='0'}
ac_cv_sizeof_int_fast64_t=${ac_cv_sizeof_int_fast64_t='0'}
ac_cv_sizeof_uint_fast8_t=${ac_cv_sizeof_uint_fast8_t='0'}
ac_cv_sizeof_uint_fast16_t=${ac_cv_sizeof_uint_fast16_t='0'}
ac_cv_sizeof_uint_fast32_t=${ac_cv_sizeof_uint_fast32_t='0'}
ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t='0'}
hdf5_cv_system_scope_threads=${hdf5_cv_system_scope_threads="no"}
# Hard set MPI_File_set_size() working for files over 2GB to no
hdf5_cv_mpi_file_set_size_big=${hdf5_cv_mpi_file_set_size_big='no'}
# 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_bottom_bit_works=${hdf5_cv_fp_to_ullong_bottom_bit_works='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_sw_ulong_to_fp_bottom_bit_works=${hdf5_cv_sw_ulong_to_fp_bottom_bit_works='no'}
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_fp_to_integer_overflow_works=${hdf5_cv_fp_to_integer_overflow_works='yes'}

View File

@ -107,12 +107,7 @@ static int clean_file_g = -1; /*whether to cleanup temporary test */
* is about the best guess.
*/
#ifndef HDF5_PARAPREFIX
# ifdef __PUMAGON__
/* For the PFS of TFLOPS */
# define HDF5_PARAPREFIX "pfs:/pfs_grande/multi/tmp_1"
# else
# define HDF5_PARAPREFIX ""
# endif /* __PUMAGON__ */
#endif /* !HDF5_PARAPREFIX */
#ifndef MIN

View File

@ -315,6 +315,8 @@ Bug Fixes since HDF5-1.8.0 release
Configuration
-------------
- Support for TFLOPS, config/intel-osf1, is removed since the TFLOPS
machine has long retired. AKC - 2009/10/06.
- Added $(EXEEXT) extension to H5detect when it's executed in the
src/Makfile to generate H5Tinit.c so it works correctly on platforms
that require the full extension when running executables.
@ -712,17 +714,6 @@ Known Problems
This warning is innocuous and can be safely ignored.
* The Stream VFD was not tested yet under Windows. It is not supported
in the TFLOPS machine.
* The ./dsets tests failed in the TFLOPS machine if the test program,
dsets.c, is compiled with the -O option. The hdf5 library still works
correctly with the -O option. The test program works fine if it is
compiled with -O1 or -O0. Only -O (same as -O2) causes the test
program to fail.
* Certain platforms give false negatives when testing h5ls:
- Cray J90 and Cray T90IEEE give errors during testing when displaying
some floating-point values. These are benign differences due to

View File

@ -64,13 +64,8 @@
* is about the best guess.
*/
#ifndef HDF5_PARAPREFIX
#ifdef __PUMAGON__
/* For the PFS of TFLOPS */
#define HDF5_PARAPREFIX "pfs:/pfs_grande/multi/tmp_1"
#else
#define HDF5_PARAPREFIX ""
#endif
#endif
char *paraprefix = NULL; /* for command line option para-prefix */
#ifdef H5_HAVE_PARALLEL
MPI_Info h5_io_info_g=MPI_INFO_NULL;/* MPI INFO object for IO */

View File

@ -167,11 +167,7 @@ TOOLTEST_FAIL()
H5DIFFTEST()
{
VERIFY $@
if [ "`uname -s`" = "TFLOPS O/S" ]; then
$RUNSERIAL $H5DIFF_BIN -q $@
else
$RUNSERIAL $H5DIFF_BIN -q "$@"
fi
$RUNSERIAL $H5DIFF_BIN -q "$@"
RET=$?
if [ $RET != 0 ] ; then
echo "*FAILED*"
@ -186,11 +182,7 @@ H5DIFFTEST()
H5DIFFTEST_FAIL()
{
VERIFY $@
if [ "`uname -s`" = "TFLOPS O/S" ]; then
$RUNSERIAL $H5DIFF_BIN -q $@
else
$RUNSERIAL $H5DIFF_BIN -q "$@"
fi
$RUNSERIAL $H5DIFF_BIN -q "$@"
RET=$?
if [ $RET != 1 ] ; then

View File

@ -201,19 +201,12 @@ TOOLTEST() {
fi
# Run test.
# Tflops interprets "$@" as "" when no parameter is given (e.g., the
# case of missing file name). Changed it to use $@ till Tflops fixes it.
#TESTING $H5DIFF $@
(
#echo "#############################"
#echo "Expected output for '$H5DIFF $@'"
#echo "#############################"
#cd $srcdir/testfiles
if [ "`uname -s`" = "TFLOPS O/S" ]; then
eval $RUNCMD $H5DIFF_BIN $@
else
eval $RUNCMD $H5DIFF_BIN "$@"
fi
eval $RUNCMD $H5DIFF_BIN "$@"
) >$actual 2>$actual_err
# save actual and actual_err in case they are needed later.
cp $actual $actual_sav

View File

@ -161,12 +161,8 @@ DIFFTEST()
{
PRINT_H5DIFF $@
(
cd $srcdir/../testfiles
if [ "`uname -s`" = "TFLOPS O/S" ]; then
$RUNSERIAL $H5DIFF_BIN $@ -q
else
$RUNSERIAL $H5DIFF_BIN "$@" -q
fi
cd $srcdir/../testfiles
$RUNSERIAL $H5DIFF_BIN "$@" -q
)
RET=$?
if [ $RET != 0 ] ; then
@ -198,12 +194,8 @@ IMPORTTEST()
PRINT_H5IMPORT $@
(
cd $srcdir/../testfiles
if [ "`uname -s`" = "TFLOPS O/S" ]; then
$RUNSERIAL $H5IMPORT_BIN $@
else
$RUNSERIAL $H5IMPORT_BIN "$@"
fi
cd $srcdir/../testfiles
$RUNSERIAL $H5IMPORT_BIN "$@"
)
RET=$?
if [ $RET != 0 ] ; then

View File

@ -2109,15 +2109,12 @@ get_width(void)
width = w[0];
}
#elif defined(H5_HAVE_TIOCGWINSZ) && defined(H5_HAVE_IOCTL)
#ifndef __PUMAGON__
/* the ioctl() call coredump on TFLOPS. Turn it off for now. */
{
/* Unix with ioctl(TIOCGWINSZ) */
struct winsize w;
if (ioctl(2, TIOCGWINSZ, &w)>=0 && w.ws_col>0)
width = w.ws_col;
}
#endif
#elif defined(H5_HAVE_TIOCGETD) && defined(H5_HAVE_IOCTL)
{
/* Unix with ioctl(TIOCGETD) */

View File

@ -96,11 +96,7 @@ SKIP() {
DIFFTEST()
{
VERIFY $@
if [ "`uname -s`" = "TFLOPS O/S" ]; then
$RUNSERIAL $H5DIFF_BIN -q $@
else
$RUNSERIAL $H5DIFF_BIN -q "$@"
fi
$RUNSERIAL $H5DIFF_BIN -q "$@"
RET=$?
if [ $RET != 0 ] ; then
echo "*FAILED*"
@ -116,27 +112,20 @@ DIFFTEST()
TOOLTEST()
{
# Run test.
# Tflops interprets "$@" as "" when no parameter is given (e.g., the
# case of missing file name). Changed it to use $@ till Tflops fixes it.
TESTING $H5REPACK $@
infile=$srcdir/testfiles/$1
path=`pwd`
outfile=$path/out.$1
shift
if [ "`uname -s`" = "TFLOPS O/S" ]; then
$RUNSERIAL $H5REPACK_BIN $@ $infile $outfile
else
$RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
fi
$RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
RET=$?
if [ $RET != 0 ] ; then
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
else
echo " PASSED"
DIFFTEST $infile $outfile
echo " PASSED"
DIFFTEST $infile $outfile
fi
rm -f $outfile
}
@ -146,27 +135,20 @@ TOOLTEST()
TOOLTEST0()
{
# Run test.
# Tflops interprets "$@" as "" when no parameter is given (e.g., the
# case of missing file name). Changed it to use $@ till Tflops fixes it.
TESTING $H5REPACK $@
infile=$srcdir/testfiles/$1
path=`pwd`
outfile=$path/out.$1
shift
if [ "`uname -s`" = "TFLOPS O/S" ]; then
$RUNSERIAL $H5REPACK_BIN -i $infile -o $outfile $@
else
$RUNSERIAL $H5REPACK_BIN -i $infile -o $outfile "$@"
fi
$RUNSERIAL $H5REPACK_BIN -i $infile -o $outfile "$@"
RET=$?
if [ $RET != 0 ] ; then
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
else
echo " PASSED"
DIFFTEST $infile $outfile
echo " PASSED"
DIFFTEST $infile $outfile
fi
rm -f $outfile
}
@ -178,27 +160,20 @@ TOOLTEST0()
TOOLTEST1()
{
# Run test.
# Tflops interprets "$@" as "" when no parameter is given (e.g., the
# case of missing file name). Changed it to use $@ till Tflops fixes it.
TESTING $H5REPACK $@
infile=$srcdir/../testfiles/$1
path=`pwd`
outfile=$path/out.$1
shift
if [ "`uname -s`" = "TFLOPS O/S" ]; then
$RUNSERIAL $H5REPACK_BIN $@ $infile $outfile
else
$RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
fi
$RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
RET=$?
if [ $RET != 0 ] ; then
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
else
echo " PASSED"
DIFFTEST $infile $outfile
echo " PASSED"
DIFFTEST $infile $outfile
fi
rm -f $outfile
}