diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2005-10-26 20:44:19 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2005-10-26 20:44:19 (GMT) |
| commit | 91715368236e3516f89f2fbdd85cfb21e76263c6 (patch) | |
| tree | 543cea6e4396830a6244138aeab05b05398e0daf /config/linux-gnulibc1 | |
| parent | 60ef06bdf6d1618bab53b899a4ab6ae8193789d6 (diff) | |
| download | hdf5-91715368236e3516f89f2fbdd85cfb21e76263c6.zip hdf5-91715368236e3516f89f2fbdd85cfb21e76263c6.tar.gz hdf5-91715368236e3516f89f2fbdd85cfb21e76263c6.tar.bz2 | |
[svn-r11610] Purpose:
Bug fix.
Description:
The previous way of detecting the MPICH version fails if the suspected
$CC does not give the expected MPICH version information. Though no
consequence, it generates error messages that alarm users.
Also, mpich2 gives the version information as if it were mpich v1.0.2
which was incorrectly included as an earlier version of the origianl
mpich.
Solution:
Implemented a more robust code to detect the version and narrow the
recognition down to v1.2.0-v1.2.5. Also, the code were duplicated in
two files (linux-gnulibc1 and ia64-linux-gnu). Combined them into a
new file called mpich.
Platforms tested:
Tested in heping using mpicc and mpich2/mpicc and also in tg-ncsa.
Misc. update:
Updated MANIFEST.
Diffstat (limited to 'config/linux-gnulibc1')
| -rw-r--r-- | config/linux-gnulibc1 | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1 index 719b915..11c51f7 100644 --- a/config/linux-gnulibc1 +++ b/config/linux-gnulibc1 @@ -109,19 +109,5 @@ if test -z "$CXX"; then CXX_BASENAME=g++ fi -# We know that for mpich 1.2.5 and previous version, complicated derived datatype is -# supported, we need to set the macro to hdf5_mpi_complex_derived_datatype_works to no. -# Notice that this fix will only work if the compiler name is mpicc and mpi package is -# mpich 1.x.x. - -if [ -z "$hdf5_mpi_complex_derived_datatype_works" -a \( $CC_BASENAME = mpicc -o $CC_BASENAME = mpiicc \) ]; then - ccversion=`$CC -v 2>&1 | sed -e 's/.*for //p'` - ccversion1=`echo $ccversion | cut -f1 -d.` - ccversion2=`echo $ccversion | cut -f2 -d.` - ccversiontemp=`echo $ccversion | cut -f3 -d.` - ccversion3=`echo $ccversiontemp | cut -c1` - ccversionval=`expr $ccversion1 \* 100 + $ccversion2 \* 10 + $ccversion3` - if [ $ccversionval -lt 126 ]; then - hdf5_mpi_complex_derived_datatype_works='no' - fi -fi +# Check MPICH settings +. $srcdir/config/mpich |