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

Merge pull request #1808 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:gnu-flags-work to develop

Browse Source 
* commit '7d291d059da6287f769951c4854c566da0b93ce8':
  Parallel Fortran tests now use the MPI module instead of including mpif.h.
  First stab at gfortran versions. Tested on gfortran 7-9 so far.
  Moved the -std=f2008 option to gfortran 9 for now.
  Updated gfortran options. * Removed conclude_fc.am, which was causing verbose builds. Need to   investigate more, though. * Added gfortran 9 warnings and flags. This will need to be separated   into other version blocks based on when the options first appeared. * The standard is now explicitly set at 2008.
This commit is contained in:
Dana Robinson 2019-07-29 16:13:24 -05:00
commit d169391529
13 changed files with 130 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST
View File

@ -119,7 +119,6 @@
./config/cce-flags
./config/commence.am
./config/conclude.am
./config/conclude_fc.am
./config/examples.am
./config/freebsd
./config/gnu-cxxflags

31
config/conclude_fc.am
View File

@ -1,31 +0,0 @@
## config/conclude_fc.am
## (Use double hashes for copyright notice so that automake treats it as
## comments and does not pass it to Makefile.in)
## 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 COPYING file, which can be found at the root of the source code
## distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
## If you do not have access to either file, you may request a copy from
## help@hdfgroup.org.
## Textually included at the end of the Fortran HDF5 Makefiles.am.
# Makefile.am include fragment with Fortran helper rules and macros.
# AM_FCCPPFLAGS, FCCPPFLAGS are currently not used.
PPFCCOMPILE = $(FC) $(FCDEFS) $(DEFAULT_INCLUDES) $(FCINCLUDES) $(AM_FCCPPFLAGS) $(FCCPPFLAGS) $(AM_FCFLAGS) $(FCFLAGS)
LTPPFCCOMPILE = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(PPFCCOMPILE)
# Treat all .f90 and .F90 files as preprocessed Fortran.
.f90.o:
$(PPFCCOMPILE) -c -o $@ $<
.F90.o:
$(PPFCCOMPILE) -c -o $@ $<
include $(top_srcdir)/config/conclude.am

151
config/gnu-fflags
View File

@ -1,4 +1,4 @@
# -*- shell-script -*-
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
@ -25,9 +25,8 @@
#
if test X = "X$f9x_flags_set"; then
f9x_version="`$FC $FCFLAGS $H5_FCFLAGS -v 2>&1 |grep 'gcc version' |\
sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
if test X != "X$f9x_version"; then
# is_mpi="`$FC $FCFLAGS $H5_FCFLAGS -help 2>&1 |grep 'link MPI'`"
f9x_vendor=`echo $f9x_version |sed 's/\([a-z]*\).*/\1/'`
f9x_version=`echo $f9x_version |sed 's/[-a-z]//g'`
if test X = "X$f9x_vendor" -a X != "X$f9x_version"; then
@ -37,24 +36,38 @@ if test X = "X$f9x_flags_set"; then
echo "compiler '$FC' is GNU $f9x_vendor-$f9x_version"
fi
# Some version numbers
# Get the compiler version numbers
f9x_vers_major=`echo $f9x_version | cut -f1 -d.`
f9x_vers_minor=`echo $f9x_version | cut -f2 -d.`
f9x_vers_patch=`echo $f9x_version | cut -f3 -d.`
test -n "$f9x_vers_major" || f9x_vers_major=0
test -n "$f9x_vers_minor" || f9x_vers_minor=0
test -n "$f9x_vers_patch" || f9x_vers_patch=0
f9x_vers_all=`expr $f9x_vers_major '*' 1000000 + $f9x_vers_minor '*' 1000 + $f9x_vers_patch`
fi
fi
# Common GNU flags for various situations
if test "X-gfortran" = "X-$f9x_vendor"; then
# Insert section about version specific problems from gnu-flags here, if
# necessary.
FC_BASENAME=gfortran
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
# Need Fortran 2008 support for storage_size() in gcc 4.6 on
# (2008ts in some versions)
if test $f9x_vers_major -ge 8; then
H5_FCFLAGS="$H5_FCFLAGS -std=f2008"
elif test $f9x_vers_major -ge 5 -o $f9x_vers_major -eq 4 -a $f9x_vers_minor -ge 6; then
H5_FCFLAGS="$H5_FCFLAGS -std=f2008ts"
else
H5_FCFLAGS="$H5_FCFLAGS -std=f2003"
fi
###############################
# Architecture-specific flags #
###############################
arch=
# Architecture-specific flags
# Nothing currently. (Uncomment code below and modify to add any)
#case "$host_os-$host_cpu" in
# *-i686)
@ -62,43 +75,113 @@ if test "X-gfortran" = "X-$f9x_vendor"; then
# ;;
#esac
# Host-specific flags
# Nothing currently. (Uncomment code below and modify to add any)
#case "`hostname`" in
# sleipnir.ncsa.uiuc.edu)
# arch="$arch -pipe"
# ;;
#esac
H5_FCFLAGS="$H5_FCFLAGS $arch"
# General
FC_BASENAME=gfortran
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
H5_FCFLAGS="$H5_FCFLAGS -pedantic -Wall -Wextra -Wunderflow -Wimplicit-interface -Wsurprising"
##############
# Production #
##############
# Turn off warnings for passing non-ANSI types to BIND().
# We pass a lot of hid_t, etc. types so this generates a LOT of spurious warnings.
H5_FCFLAGS="$H5_FCFLAGS -Wno-c-binding-type"
# Production
PROD_FCFLAGS=
# Debug
DEBUG_FCFLAGS="-fbounds-check"
#########
# Debug #
#########
if test $f9x_vers_major -ge 5 -o $f9x_vers_major -eq 4 -a $f9x_vers_minor -ge 5; then
DEBUG_FCFLAGS="-fcheck=all"
else
DEBUG_FCFLAGS="-fbounds-check"
fi
###########
# Symbols #
###########
# Symbols
SYMBOLS_FCFLAGS="-g"
NO_SYMBOLS_FCFLAGS="-s"
# Profiling
#############
# Profiling #
#############
PROFILE_FCFLAGS="-pg"
# Optimization
HIGH_OPT_FCFLAGS="-O2"
DEBUG_OPT_FCFLAGS="-O0"
################
# Optimization #
################
if test $f9x_vers_major -le 4; then
HIGH_OPT_CFLAGS="-O3"
DEBUG_OPT_CFLAGS=
else
HIGH_OPT_CFLAGS="-O3"
DEBUG_OPT_CFLAGS="-Og"
fi
NO_OPT_FCFLAGS="-O0"
# Flags are set
############
# Warnings #
############
###########
# General #
###########
H5_FCFLAGS="$H5_FCFLAGS -pedantic -Wall -Wextra -Wunderflow -Wimplicit-interface -Wsurprising"
H5_FCFLAGS="$H5_FCFLAGS -Waliasing -Wcharacter-truncation -Wimplicit-procedure"
#############################
# Version-specific warnings #
#############################
# gfortran 4.3 (nothing new)
# gfortran 4.4
if test $f9x_vers_major -ge 5 -o $f9x_vers_major -eq 4 -a $f9x_vers_minor -ge 4; then
H5_FCFLAGS="$H5_FCFLAGS -Warray-temporaries -Wintrinsics-std"
fi
# gfortran 4.5 (nothing new)
# gfortran 4.6 (nothing new)
# gfortran 4.7
if test $f9x_vers_major -ge 5 -o $f9x_vers_major -eq 4 -a $f9x_vers_minor -ge 7; then
H5_FCFLAGS="$H5_FCFLAGS -Wreal-q-constant -Wfunction-elimination"
fi
# gfortran 4.8
if test $f9x_vers_major -ge 5 -o $f9x_vers_major -eq 4 -a $f9x_vers_minor -ge 8; then
H5_FCFLAGS="$H5_FCFLAGS -Wrealloc-lhs -Wrealloc-lhs-all"
# Turn off warnings for passing non-ANSI types to BIND().
# We pass a lot of hid_t, etc. types so this generates a LOT of spurious warnings.
H5_FCFLAGS="$H5_FCFLAGS -Wno-c-binding-type"
fi
# gfortran 4.9 (nothing new)
# gfortran 5
if test $f9x_vers_major -ge 5; then
H5_FCFLAGS="$H5_FCFLAGS -Wuse-without-only"
fi
# gfortran 6
if test $f9x_vers_major -ge 6; then
H5_FCFLAGS="$H5_FCFLAGS -Winteger-division"
fi
# gfortran 7 (nothing new)
# gfortran 8
if test $f9x_vers_major -ge 8; then
H5_FCFLAGS="$H5_FCFLAGS -Wfrontend-loop-interchange"
fi
# gfortran 9 (nothing new)
#################
# Flags are set #
#################
f9x_flags_set=yes
fi

2
fortran/examples/Makefile.am
View File

@ -105,4 +105,4 @@ compound_fortran2003: compound_fortran2003.f90
compound_complex_fortran2003: compound_complex_fortran2003.f90
include $(top_srcdir)/config/examples.am
include $(top_srcdir)/config/conclude_fc.am
include $(top_srcdir)/config/conclude.am

2
fortran/src/Makefile.am
View File

@ -165,4 +165,4 @@ HDF5.lo: $(srcdir)/HDF5.F90 H5f90global.lo H5_ff.lo H5Aff.lo \
H5Off.lo H5Pff.lo H5Rff.lo \
H5Sff.lo H5Tff.lo H5Zff.lo H5_gen.lo
include $(top_srcdir)/config/conclude_fc.am
include $(top_srcdir)/config/conclude.am

2
fortran/test/Makefile.am
View File

@ -100,4 +100,4 @@ H5_test_buildiface_LDADD =
fflush2.chkexe_: fflush1.chkexe_
include $(top_srcdir)/config/conclude_fc.am
include $(top_srcdir)/config/conclude.am

2
fortran/testpar/Makefile.am
View File

@ -48,4 +48,4 @@ LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
# Mark this directory as part of the Fortran API
FORTRAN_API=yes
include $(top_srcdir)/config/conclude_fc.am
include $(top_srcdir)/config/conclude.am

3
fortran/testpar/hyper.f90
View File

@ -18,9 +18,10 @@
SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors)
USE HDF5
USE MPI
USE TH5_MISC
IMPLICIT NONE
INCLUDE 'mpif.h'
INTEGER, INTENT(in) :: length ! array length
LOGICAL, INTENT(in) :: do_collective ! use collective I/O

3
fortran/testpar/mdset.f90
View File

@ -18,9 +18,10 @@
SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors)
USE HDF5
USE MPI
USE TH5_MISC
IMPLICIT NONE
INCLUDE 'mpif.h'
INTEGER, INTENT(in) :: length ! array length
LOGICAL, INTENT(in) :: do_collective ! use collective I/O

2
fortran/testpar/ptest.f90
View File

@ -16,7 +16,7 @@
!
PROGRAM parallel_test
USE hdf5
USE HDF5
USE MPI
USE TH5_MISC

2
hl/fortran/examples/Makefile.am
View File

@ -62,4 +62,4 @@ EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl
# and fortran libraries above.
include $(top_srcdir)/config/examples.am
include $(top_srcdir)/config/conclude_fc.am
include $(top_srcdir)/config/conclude.am

3
hl/fortran/src/Makefile.am
View File

@ -114,4 +114,5 @@ H5IMff.lo: $(srcdir)/H5IMff.F90
H5TBff.lo: $(srcdir)/H5TBff.F90
H5LTff_gen.lo: H5LTff.lo H5LTff_gen.F90
H5TBff_gen.lo: H5TBff.lo H5LTff_gen.F90 H5TBff_gen.F90
include $(top_srcdir)/config/conclude_fc.am
include $(top_srcdir)/config/conclude.am

2
hl/fortran/test/Makefile.am
View File

@ -62,4 +62,4 @@ clean-local:
# from tests in conclude.am)
FORTRAN_API=yes
include $(top_srcdir)/config/conclude_fc.am
include $(top_srcdir)/config/conclude.am