Skip to content

Commit

Permalink
Fix warnings files (#753)
Browse files Browse the repository at this point in the history
* OESS-98 convert plugin option to FetchContent, add tests

* Fixes for pkcfg files because of plugin option

* OESS-98 fix tools test for plugins

* Keep doxygen comments under 100 chars long - format hint

* Whitespace

* HDFFV-11144 - Reclassify CMake messages

* HDFFV-11099/11100 added help text

* Reworked switch statement to compare string instead

* Fix typo

* Update CDash mode

* Correct name of threadsafe

* Correct option name

* Undo accidental commit

* Note LLVM 10 to 11 format default changes

* Update format plugin

* Undo clang-format version 11 changes

* One more correction

* Update supported platforms

* Revert whitespace changes

* Correct whitespace

* Changes from PR#3

* HDFFV-11213 added option to control gcc10 warnings diagnostics

* HDFFV-11212 Use the new references correctly in JNI utility and tests

* format source

* Fix typo

* Add new test file

* HDFFV-11212 - update test and remove unused arg

* Minor non-space formatting changes

* Use H5I_INVALID_ID instead of "-1"

* source formatting

* add missing testfile, update jni function

* Undo commit of debug code

* remove mislocated file

* Fix h5repack test for handling of fapls and id close

* Update h5diff test files usage text

* HDFFV-11212 add new ref tests for JNI export dataset

* src format update

* Remove blank line typo

* src format typo

* long double requires %Lg

* Another long double foramt specifer S.B. %Lg

* issue with t128bit test

* Windows issue with h5dump and type.

* Fix review issues

* refactor function nesting and fix error checks

* format fixes

* Remove untested functions and javadoc quiet comments

* Restore TRY block.

* Change string append errors to memory exception

* revert to H5_JNI_FATAL_ERROR - support functions need work

* Add assertion error for h5util functions

* remove duplicate function

* format fix

* Revert HD function error handling

* Update copyright comments

* GH #386 java folder copyright corrections

* Whitespace

* GH #359 implement and fix tools 1.6 API usage

* remove excessive comments

* Flip inits to correct ifdef section

* rework ifdef to be simpler

* format issue

* Reformat ifdef inits

* remove static attribute

* format compliance

* Update names

* Revert because logic relies on float not being int

* Changes noticed from creating merge of #412

* Double underscore change

* Correct compiler version variable used

* Remove header guard underscores

* Whitespace cleanup

* Split format source and commit changes on repo push

* remove pre-split setting

* Change windows TS to use older VS.

* correct window os name

* HDFFV-11212 JNI export util and Javadoc

* Suggested review changes

* Another change found

* Committing clang-format changes

* HDFFV-11113 long double in tools

* HDFFV-11113 add note

* Disable long double tests for now

* HDFFV-11228 remove arbitrary CMake warning groups.

* Make each flag a string

* Some Javadoc warning fixes

* Updated javadoc fixes

* # WARNING: head commit changed in the meantime

HDFFV-11229 Fix long double usage in tools and java

Changed h5dump and h5ls to just print 128-bit for long double type.
Added test and file for dataset and attributes with all three float
types.

* Committing clang-format changes

* HDFFV-11229 Add release note

* HDFFV-11229 windows testfile needed

* fix typo

* Remove non supported message text

* HDFFV-11229 - change ldouble test to check both native and general

* HDFFV-11229 add second file compare

* HDFFV-11229 fix reference file

* HDFFV-11229 autotools check two refs

* HDFFV-11229 revert back to removal of NATIVE_LDOUBLE in tools output

* Committing clang-format changes

* Update release note

* Update attribute type of ref file

* Change source of ninja for macs

* try port instead of brew

* Recommended is to use brew.

* Undo non long double changes

* remove unneeded file

* Fix perl and doxygen CMake code

* Add "option" command for clang options

* Rework CMake add_custom to use the BYPRODUCTS argument

* Add stamp files to BYPRODUCTS

* Only one copy of file exists

* Fix custom cmmand depends targets

* Fix fortran custom command DEPENDS

* Add LD_LIBRARY_PATH to tests

* Add custom target for DEPENDS

* Add h5detect conditionaly to generated target DEPENDS

* Correct DEPENDS targets

* Parallel builds need the mpi compiler for pkgconfig scripts.

* install only if MPI build

* Fortran target depends

* Remove incorrect source attribute

* doxygen adjustments

* doxygen build updates

* Correct version

* Correct function version - function has been merged to 1.12

* Correct version string for map functions

* Cleanup warnings for tools debug builds

* TRILAB-227 - fix indexing for h5diff selections

* Correct location of pos to index function call

* TRILAB-227 Enable test

* Quote subset args

* Use MATCHES because of AppleClang

* if blocks needed for build modes

* Update list of DT platforms

* VS2019 correctly displays float values

* revert VS2019 change

* Issue #669 remove version from pkgcfg filename

* remove version from h5cc script

* Java reference functions updated

enabled fortran in cmake gcc action yaml file
java reference test changed to correctly test refs
jni reference functions that create ids changed to use jni id logging

* Correct BYPRODUCTS argument

* Correct more genereated files BYPRODUCTS

* BYPRODUCTS must have unique locations

* Fix typo

* Fix fortran configure checks

* Rework H5_PAC_C_MAX_REAL_PRECISION setting logic

* Add note about fortran configure change

* Adds a quick for for some egregious chunk_info badness (#722)

* Fixes issue with ccmake that prevents building Fortran (#723)

ccmake runs iteratively, and the check_fortran_source_runs
macros were clobbering a single output file that did not
get updated on further configure iterations

* Fix conflicts with merge

* Move MAX_PRECISION back to HDF5UseFortran.cmake

* Use STREQUAL to test macro argument

* Move C language test to ConfigureChecks from HDF5UseFortran

* MAX_PRECISION defines must be defined

* Organize flags and align autotools and cmake

* Fix comment in no-error-general warnings files.

* Flag cleanup and fix typos

* Add comment

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Dana Robinson <[email protected]>
  • Loading branch information
3 people authored Jun 15, 2021
1 parent 978b11c commit dfe4f29
Show file tree
Hide file tree
Showing 10 changed files with 113 additions and 50 deletions.
3 changes: 2 additions & 1 deletion MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,9 @@
./config/intel-warnings/15
./config/intel-warnings/18
./config/intel-warnings/developer-general
./config/intel-warnings/ifort-general
./config/intel-warnings/general
./config/intel-warnings/general-19
./config/intel-warnings/ifort-general

./config/site-specific/BlankForm

Expand Down
2 changes: 1 addition & 1 deletion config/gnu-cxxflags
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ if test "X-g++" = "X-$cxx_vendor"; then
# no cxx warnings, do NOT use C warnings

# gcc >= 10
if test $cc_vers_major -ge 10; then
if test $cxx_vers_major -ge 10; then
# Use the C warnings as CXX warnings are the same
DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments developer-10)"
fi
Expand Down
25 changes: 19 additions & 6 deletions config/intel-cxxflags
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ if test "X-icpc" = "X-$cxx_vendor"; then
# Debug #
#########

# NDEBUG is handled explicitly by the configure script
# NDEBUG is handled explicitly in configure
# -g is handled by the symbols flags
DEBUG_CXXFLAGS=

Expand Down Expand Up @@ -123,19 +123,19 @@ if test "X-icpc" = "X-$cxx_vendor"; then
# Warnings #
############

# First load the C warnings then add CXX warnings (if needed)

###########
# General #
###########

# Add various general warning flags in intel-warnings.
# Use the C warnings as CXX warnings are the same
H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments general)"

######################
# Developer warnings #
######################

# Use the C warnings as CXX warnings are the same
#NO_DEVELOPER_WARNING_CXXFLAGS=$(load_intel_arguments no-developer-general)
#DEVELOPER_WARNING_CXXFLAGS=$(load_intel_arguments developer-general)

Expand All @@ -144,21 +144,34 @@ if test "X-icpc" = "X-$cxx_vendor"; then
#############################

# intel == 8.0
if test $cc_vers_major -eq 8 -a $cc_vers_minor -eq 0; then
if test $cxx_vers_major -eq 8 -a $cxx_vers_minor -eq 0; then
# v8.0 -O3 infinite loops when compiling test/tselect.c. Use -O2.
HIGH_OPT_CFLAGS="-O2"
fi

# intel == 10
if test $cc_vers_major -eq 10; then
if test $cxx_vers_major -eq 10; then
HIGH_OPT_CFLAGS="-O1"
fi

# intel >= 15
if test $cc_vers_major -ge 15; then
if test $cxx_vers_major -ge 15; then
# Use the C warnings as CXX warnings are the same
H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments 15)"
fi

# intel >= 18
if test $cxx_vers_major -ge 18; then
# Use the C warnings as CXX warnings are the same
H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments 18)"
fi

# intel <= 19
if test $cxx_vers_major -le 19; then
# Use the C warnings as CXX warnings are the same
H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments general-19)"
fi

#################
# Flags are set #
#################
Expand Down
2 changes: 0 additions & 2 deletions config/intel-fflags
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ if test X = "X$f9x_flags_set"; then
fi
fi

# Common Intel flags for various situations
if test "X-ifort" = "X-$f9x_vendor"; then

FC_BASENAME=ifort
Expand Down Expand Up @@ -116,7 +115,6 @@ if test "X-ifort" = "X-$f9x_vendor"; then
DEBUG_OPT_FCFLAGS=
NO_OPT_FCFLAGS=


############
# Warnings #
############
Expand Down
19 changes: 16 additions & 3 deletions config/intel-flags
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,17 @@ if test "X-icc" = "X-$cc_vendor"; then
# ;;
#esac

# General
###########
# General #
###########

# Default to C99 standard.
H5_CFLAGS="$H5_CFLAGS $arch -std=c99"

##############
# Production #
##############

PROD_CFLAGS=

#########
Expand Down Expand Up @@ -154,6 +157,17 @@ if test "X-icc" = "X-$cc_vendor"; then
H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments 15)"
fi

# intel >= 18
if test $cc_vers_major -ge 18; then
H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments 18)"
fi

# intel <= 19
# this file has warnings only available before oneapi versions
if test $cc_vers_major -le 19; then
H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments general-19)"
fi

#################
# Flags are set #
#################
Expand All @@ -165,4 +179,3 @@ if test "X-$cc_flags_set" = "X-"; then
cc_vendor=
cc_version=
fi

1 change: 0 additions & 1 deletion config/intel-warnings/general
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-Wall
-Wcheck
2 changes: 2 additions & 0 deletions config/intel-warnings/general-19
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# this is only available before oneapi versions
-Wcheck
23 changes: 14 additions & 9 deletions config/pgi-cxxflags
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- shell-script -*-
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# All rights reserved.
Expand Down Expand Up @@ -44,30 +44,33 @@ fi
# Common PGI flags for various situations
if test "X-pgc++" = "X-$cxx_vendor"; then

# C++-specific
###########
# General #
###########

# Default to C++11 standard
H5_CXXFLAGS="$H5_CXXFLAGS -std=c++11 -Minform=warn"

##############
# Production #
##############

# NDEBUG is handled explicitly by the configure script
PROD_CXXFLAGS="-fast"
PROD_CXXFLAGS=

#########
# Debug #
#########

# NDEBUG is handled explicitly by the configure script
# NDEBUG is handled explicitly in configure
# -g is handled by the symbols flags
DEBUG_CXXFLAGS="-Mbounds"

###########
# Symbols #
###########

SYMBOLS_CXXFLAGS="-g"
NO_SYMBOLS_CXXFLAGS="-s"
SYMBOLS_CXXFLAGS="-g"

#############
# Profiling #
Expand All @@ -85,12 +88,14 @@ if test "X-pgc++" = "X-$cxx_vendor"; then
DEBUG_OPT_CXXFLAGS="-gopt -O2"
NO_OPT_CXXFLAGS="-O0"

# Flags are set
#################
# Flags are set #
#################
cxx_flags_set=yes
fi

# Clear cxx info if no flags set
if test "X-$cxx_flags_set" = "X-"; then
cxx_vendor=
cxx_version=
cxx_vendor=
cxx_version=
fi
64 changes: 45 additions & 19 deletions config/pgi-fflags
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- shell-script -*-
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
Expand Down Expand Up @@ -45,11 +45,12 @@ fi

# Common PGI flags for various situations
if test "X-pgf90" = "X-$f9x_vendor"; then
# Insert section about version specific problems from gnu-flags here, if
# necessary.

###############################
# Architecture-specific flags #
###############################

arch=
# Architecture-specific flags
# Nothing currently. (Uncomment code below and modify to add any)
#case "$host_os-$host_cpu" in
# *-i686)
Expand All @@ -65,15 +66,10 @@ if test "X-pgf90" = "X-$f9x_vendor"; then
# ;;
#esac

# General
FC_BASENAME=pgf90
Fortran_COMPILER_ID=PGI
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
# Uncomment the following to add something specific for FCFLAGS.
#FCFLAGS="$FCFLAGS"
##############
# Production #
##############

# Production
# Check for MPI wrapper being used and tweak down compiler options
# Comment out the Tweaking since it caused problems to mpich1.2.6.
# Need to investigate the reasons to tweak.
Expand All @@ -84,24 +80,55 @@ if test "X-pgf90" = "X-$f9x_vendor"; then
#fi
PROD_FCFLAGS="-fast -Mnoframe"

# Debug
#########
# Debug #
#########

DEBUG_FCFLAGS="-Mbounds -Mchkptr -Mdclchk"

# Symbols
SYMBOLS_FCFLAGS="-g"
###########
# Symbols #
###########

NO_SYMBOLS_FCFLAGS="-s"
SYMBOLS_FCFLAGS="-g"

#############
# Profiling #
#############

# Profiling
PROFILE_FCFLAGS="-Mprof=func,line"
# Use this for profiling with gprof
#PROFILE_FCFLAGS="-pg"

# Optimization
################
# Optimization #
################

HIGH_OPT_FCFLAGS=
DEBUG_OPT_FCFLAGS=
NO_OPT_FCFLAGS=

# Flags are set
############
# Warnings #
############

###########
# General #
###########

FC_BASENAME=pgf90
Fortran_COMPILER_ID=PGI
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
# Uncomment the following to add something specific for FCFLAGS.
#FCFLAGS="$FCFLAGS"



#################
# Flags are set #
#################
f9x_flags_set=yes
fi

Expand All @@ -111,4 +138,3 @@ if test "X-$f9x_flags_set" = "X-"; then
f9x_version=
fi


22 changes: 14 additions & 8 deletions config/pgi-flags
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- shell-script -*-
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
Expand Down Expand Up @@ -45,8 +45,8 @@ fi

# Common PGI flags for various situations
if test "X-pgcc" = "X-$cc_vendor"; then
# Insert section about version specific problems from gnu-flags here, if
# necessary.
# Insert section about version specific problems from compiler flags here,
# if necessary.

arch=
# Architecture-specific flags
Expand All @@ -65,7 +65,11 @@ if test "X-pgcc" = "X-$cc_vendor"; then
# ;;
#esac

# General
###########
# General #
###########

# Default to C99 standard.
H5_CFLAGS="$H5_CFLAGS $arch -c99 -Minform=warn"

##############
Expand All @@ -87,8 +91,8 @@ if test "X-pgcc" = "X-$cc_vendor"; then
# Symbols #
###########

SYMBOLS_CFLAGS="-g"
NO_SYMBOLS_CFLAGS="-s"
SYMBOLS_CFLAGS="-g"

#############
# Profiling #
Expand All @@ -106,12 +110,14 @@ if test "X-pgcc" = "X-$cc_vendor"; then
DEBUG_OPT_CFLAGS="-gopt -O2"
NO_OPT_CFLAGS="-O0"

# Flags are set
#################
# Flags are set #
#################
cc_flags_set=yes
fi

# Clear cc info if no flags set
if test "X-$cc_flags_set" = "X-"; then
cc_vendor=
cc_version=
cc_vendor=
cc_version=
fi

0 comments on commit dfe4f29

Please sign in to comment.