Update Autotools to correctly configure oneAPI (#3751)

* Update Autotools to correctly configure oneAPI

Splits the Intel config files under the Autotools into 'classic'
Intel and oneAPI versions, fixing 'unsupported option' messages.

Also turns off `-check uninit` (new in 2023) in Fortran, which kills
the H5_buildiface program due to false positives.

* Enable Fortran in oneAPI CI workflow

* Turn on Fortran in CMake, update LD_LIBRARY_PATH

* Go back to disabling Fortran w/ Intel

For some reason there's a linking problem w/ Fortran

error while loading shared libraries: libifport.so.5: cannot open shared object file: No such file or directory
This commit is contained in:
Dana Robinson 2023-10-23 12:50:15 -07:00 committed by GitHub
parent 744a20fc21
commit a6d1bda6d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 539 additions and 24 deletions

View File

@ -55,30 +55,19 @@ fi
# Figure out C compiler flags
. $srcdir/config/gnu-flags
. $srcdir/config/clang-flags
. $srcdir/config/oneapi-flags
. $srcdir/config/intel-flags
# temp patch: if GCC 4.2.1 is used in Lion or Mountain Lion systems, do not
# use -O option as it causes failures in test/dt_arith.
case "$host_os" in
darwin1[12].*) # lion & mountain lion
#echo cc_vendor=$cc_vendor'-'cc_version=$cc_version
case "$cc_vendor-$cc_version" in
gcc-4.2.1)
# Remove any -O flags
#echo PROD_CFLAGS=$PROD_CFLAGS
PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O[0-3]*//'`"
#echo new PROD_CFLAGS=$PROD_CFLAGS
;;
esac
;;
esac
if test "X-" = "X-$FC"; then
case $CC_BASENAME in
gcc*)
FC=gfortran
FC_BASENAME=gfortran
;;
icx*)
FC=ifx
FC_BASENAME=ifx
;;
icc*)
FC=ifort
FC_BASENAME=ifort
@ -97,6 +86,7 @@ fi
# Figure out FORTRAN compiler flags
. $srcdir/config/gnu-fflags
. $srcdir/config/oneapi-fflags
. $srcdir/config/intel-fflags
@ -107,6 +97,10 @@ if test "X-" = "X-$CXX"; then
CXX=g++
CXX_BASENAME=g++
;;
icx)
CXX=icpx
CXX_BASENAME=icpx
;;
icc)
CXX=icpc
CXX_BASENAME=icpc
@ -123,6 +117,7 @@ if test "X-" = "X-$CXX"; then
fi
# Figure out C++ compiler flags
. $srcdir/config/oneapi-cxxflags
. $srcdir/config/intel-cxxflags # Do this ahead of GNU to avoid icpc being detected as g++
. $srcdir/config/gnu-cxxflags
. $srcdir/config/clang-cxxflags
@ -139,6 +134,11 @@ case $CC in
grep 'GCC' | sed 's/.*\((GCC) [-a-z0-9\. ]*.*\)/\1/'`
;;
*icx*)
cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -V 2>&1 | grep 'Version' |\
sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
;;
*icc*)
cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -V 2>&1 | grep 'Version' |\
sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
@ -156,6 +156,11 @@ case $FC in
grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'`
;;
*ifx*)
fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\
sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
;;
*ifc*|*ifort*)
fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\
sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
@ -179,6 +184,11 @@ case $CXX in
grep 'GCC' | sed 's/.*\((GCC) [-a-z0-9\. ]*.*\)/\1/'`
;;
*icpx*)
cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Version' |\
sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
;;
*icpc*)
cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Version' |\
sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`

View File

@ -29,7 +29,10 @@ fi
# Figure out GNU C compiler flags
. $srcdir/config/gnu-flags
# Figure out Intel C compiler flags
# Figure out Intel oneAPI C compiler flags
. $srcdir/config/oneapi-flags
# Figure out Intel classic C compiler flags
. $srcdir/config/intel-flags
# The default Fortran 90 compiler
@ -43,6 +46,10 @@ if test "X-" = "X-$FC"; then
FC=gfortran
FC_BASENAME=gfortran
;;
icx*)
FC=ifx
FC_BASENAME=ifx
;;
icc*)
FC=ifort
FC_BASENAME=ifort
@ -57,8 +64,11 @@ fi
# Figure out FORTRAN compiler flags
. $srcdir/config/gnu-fflags
# Figure out Intel F90 compiler flags
. $srcdir/config/intel-fflags
# Figure out Intel oneAPI FC compiler flags
. $srcdir/config/oneapi-fflags
# Figure out Intel classic FC compiler flags
. $srcdir/config/classic-fflags
# The default C++ compiler

View File

@ -38,7 +38,10 @@ fi
# Figure out CCE C compiler flags
. $srcdir/config/cce-flags
# Figure out Intel C compiler flags
# Figure out Intel oneAPI C compiler flags
. $srcdir/config/oneapi-flags
# Figure out Intel classic C compiler flags
. $srcdir/config/intel-flags
# Figure out Clang C compiler flags
@ -55,6 +58,10 @@ if test "X-" = "X-$FC"; then
FC=pgf90
FC_BASENAME=pgf90
;;
icx*)
FC=ifx
FC_BASENAME=ifx
;;
icc*)
FC=ifort
FC_BASENAME=ifort
@ -119,7 +126,10 @@ fi
# Figure out CCE FC compiler flags
. $srcdir/config/cce-fflags
# Figure out Intel FC compiler flags
# Figure out Intel oneAPI FC compiler flags
. $srcdir/config/oneapi-fflags
# Figure out Intel classic FC compiler flags
. $srcdir/config/intel-fflags
# Figure out Clang FC compiler flags
@ -200,7 +210,10 @@ if test -z "$CXX"; then
CXX_BASENAME=g++
fi
# Figure out Intel CXX compiler flags
# Figure out Intel oneAPI CXX compiler flags
. $srcdir/config/oneapi-cxxflags
# Figure out Intel classic CXX compiler flags
# Do this ahead of GNU to avoid icpc being detected as g++
. $srcdir/config/intel-cxxflags
@ -237,6 +250,11 @@ case $CC in
cc_version_info=`echo $cc_version_info`
;;
*icx*)
cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -V 2>&1 | grep 'Version' |\
sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
;;
*icc*)
cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -V 2>&1 | grep 'Version' |\
sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
@ -271,6 +289,11 @@ case $FC in
fc_version_info=`echo $fc_version_info`
;;
*ifx*)
fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\
sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
;;
*ifc*|*ifort*)
fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\
sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
@ -333,6 +356,10 @@ case $CXX in
cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\
grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'`
;;
*icpx*)
cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Version' |\
sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
;;
*icpc*)
cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Version' |\
sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`

View File

@ -26,7 +26,10 @@ fi
# Figure out C compiler flags
. $srcdir/config/gnu-flags
# Figure out Intel C compiler flags
# Figure out Intel oneAPI C compiler flags
. $srcdir/config/oneapi-flags
# Figure out Intel classic C compiler flags
. $srcdir/config/intel-flags
# The default Fortran 90 compiler
@ -36,6 +39,10 @@ if test "X-" = "X-$FC"; then
FC=gfortran
FC_BASENAME=gfortran
;;
icx*)
FC=ifx
FC_BASENAME=ifx
;;
icc*)
FC=ifort
FC_BASENAME=ifort
@ -50,6 +57,8 @@ fi
# Figure out FORTRAN compiler flags
. $srcdir/config/gnu-fflags
# Figure out Intel F90 compiler flags
# Figure out Intel oneAPI FC compiler flags
. $srcdir/config/intel-fflags
# Figure out Intel classic FC compiler flags
. $srcdir/config/oneapi-fflags

155
config/oneapi-cxxflags Normal file
View File

@ -0,0 +1,155 @@
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# 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://www.hdfgroup.org/licenses.
# 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 the
# Intel icpx compiler or a derivative. It is careful not to do anything
# if the compiler is not Intel; otherwise `cxx_flags_set' is set to `yes'
#
#
# Prepend `$srcdir/config/intel-warnings/` to the filename suffix(es) given as
# subroutine argument(s), remove comments starting with # and ending
# at EOL, replace spans of whitespace (including newlines) with spaces,
# and re-emit the file(s) thus filtered on the standard output stream.
#
load_intel_arguments()
{
set -- $(for arg; do
sed 's,#.*$,,' $srcdir/config/intel-warnings/${arg}
done)
IFS=' ' echo "$*"
}
# Get the compiler version in a way that works for icpx
# icpx unless a compiler version is already known
#
# cxx_vendor: The compiler name: icpx
# cxx_version: Version number: 2023.2.0
#
if test X = "X$cxx_flags_set"; then
cxx_version="`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 |grep 'oneAPI'`"
if test X != "X$cxx_version"; then
cxx_vendor=icpx
cxx_version=`echo $cxx_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`
echo "compiler '$CXX' is Intel oneAPI $cxx_vendor-$cxx_version"
# Some version numbers
# Intel oneAPI version numbers are of the form: "major.minor.patch"
cxx_vers_major=`echo $cxx_version | cut -f1 -d.`
cxx_vers_minor=`echo $cxx_version | cut -f2 -d.`
cxx_vers_patch=`echo $cxx_version | cut -f2 -d.`
test -n "$cxx_vers_major" || cxx_vers_major=0
test -n "$cxx_vers_minor" || cxx_vers_minor=0
test -n "$cxx_vers_patch" || cxx_vers_patch=0
cxx_vers_all=`expr $cxx_vers_major '*' 1000000 + $cxx_vers_minor '*' 1000 + $cxx_vers_patch`
fi
fi
# Common Intel flags for various situations
if test "X-icpx" = "X-$cxx_vendor"; then
# Insert section about version specific problems from compiler flags here,
# if necessary.
arch=
# Architecture-specific flags
# Nothing currently. (Uncomment code below and modify to add any)
#case "$host_os-$host_cpu" in
# *-i686)
# arch="-march=i686"
# ;;
#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
###########
# General #
###########
# Default to C++11 standard
H5_CXXFLAGS="$H5_CXXFLAGS $arch -std=c++11"
##############
# Production #
##############
PROD_CXXFLAGS=
#########
# Debug #
#########
# NDEBUG is handled explicitly in configure
# -g is handled by the symbols flags
DEBUG_CXXFLAGS=
###########
# Symbols #
###########
NO_SYMBOLS_CXXFLAGS="-Wl,-s"
SYMBOLS_CXXFLAGS="-g"
#############
# Profiling #
#############
PROFILE_CXXFLAGS="-p"
################
# Optimization #
################
HIGH_OPT_CXXFLAGS="-O3"
DEBUG_OPT_CXXFLAGS="-O0"
NO_OPT_CXXFLAGS="-O0"
############
# Warnings #
############
###########
# 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 oneapi/general)"
######################
# Developer warnings #
######################
# Use the C warnings as CXX warnings are the same
DEVELOPER_WARNING_CXXFLAGS=$(load_intel_arguments oneapi/developer-general)
#############################
# Version-specific warnings #
#############################
#################
# 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=
fi

145
config/oneapi-fflags Normal file
View File

@ -0,0 +1,145 @@
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# 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://www.hdfgroup.org/licenses.
# 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 the
# Intel oneAPI ifx compiler or a derivative. It is careful not to do anything
# if the compiler is not Intel; otherwise `f9x_flags_set' is set to `yes'
#
#
# Prepend `$srcdir/config/intel-warnings/` to the filename suffix(es) given as
# subroutine argument(s), remove comments starting with # and ending
# at EOL, replace spans of whitespace (including newlines) with spaces,
# and re-emit the file(s) thus filtered on the standard output stream.
#
load_intel_arguments()
{
set -- $(for arg; do
sed 's,#.*$,,' $srcdir/config/intel-warnings/${arg}
done)
IFS=' ' echo "$*"
}
# Get the compiler version in a way that works for ifx
# ifx unless a compiler version is already known
#
# f9x_vendor: The compiler name: ifx
# f9x_version: Version number: 2023.2.0
#
if test X = "X$f9x_flags_set"; then
f9x_version="`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 |grep '^Intel'`"
if test X != "X$f9x_version"; then
f9x_vendor=ifx
f9x_version="`echo $f9x_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`"
echo "compiler '$FC' is Intel oneAPI $f9x_vendor-$f9x_version"
# Some version numbers
# Intel oneAPI version numbers are of the form: "major.minor.patch"
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 -f2 -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
if test "X-ifx" = "X-$f9x_vendor"; then
FC_BASENAME=ifx
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
###############################
# Architecture-specific flags #
###############################
arch=
# Nothing currently. (Uncomment code below and modify to add any)
#case "$host_os-$host_cpu" in
# *-i686)
# arch="-march=i686"
# ;;
#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
##############
# Production #
##############
PROD_FCFLAGS=
#########
# Debug #
#########
# Don't use -check uninit or you'll get false positives from H5_buildiface
DEBUG_FCFLAGS="-check all,nouninit"
###########
# Symbols #
###########
NO_SYMBOLS_FCFLAGS=
SYMBOLS_FCFLAGS="-g"
#############
# Profiling #
#############
PROFILE_FCFLAGS="-p"
################
# Optimization #
################
HIGH_OPT_FCFLAGS="-O3"
DEBUG_OPT_FCFLAGS="-O0"
NO_OPT_FCFLAGS="-O0"
############
# Warnings #
############
###########
# General #
###########
H5_FCFLAGS="$H5_FCFLAGS -free"
H5_FCFLAGS="$H5_FCFLAGS $(load_intel_arguments oneapi/ifort-general)"
#############################
# Version-specific warnings #
#############################
#################
# Flags are set #
#################
f9x_flags_set=yes
fi
# Clear f9x info if no flags set
if test "X-$f9x_flags_set" = "X-"; then
f9x_vendor=
f9x_version=
fi

151
config/oneapi-flags Normal file
View File

@ -0,0 +1,151 @@
# -*- shell-script -*-
#
# Copyright by The HDF Group.
# 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://www.hdfgroup.org/licenses.
# 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 the
# Intel icx compiler or a derivative. It is careful not to do anything
# if the compiler is not Intel; otherwise `cc_flags_set' is set to `yes'
#
#
# Prepend `$srcdir/config/intel-warnings/` to the filename suffix(es) given as
# subroutine argument(s), remove comments starting with # and ending
# at EOL, replace spans of whitespace (including newlines) with spaces,
# and re-emit the file(s) thus filtered on the standard output stream.
#
load_intel_arguments()
{
set -- $(for arg; do
sed 's,#.*$,,' $srcdir/config/intel-warnings/${arg}
done)
IFS=' ' echo "$*"
}
# Get the compiler version in a way that works for icx
# icx unless a compiler version is already known
# cc_vendor: The compiler name: icx
# cc_version: Version number: 2023.2.0
#
if test X = "X$cc_flags_set"; then
cc_version="`$CC $CFLAGS $H5_CFLAGS -V 2>&1 |grep 'oneAPI'`"
if test X != "X$cc_version"; then
cc_vendor=icx
cc_version=`echo $cc_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`
echo "compiler '$CC' is Intel oneAPI $cc_vendor-$cc_version"
# Some version numbers
# Intel oneAPI version numbers are of the form: "major.minor.patch"
cc_vers_major=`echo $cc_version | cut -f1 -d.`
cc_vers_minor=`echo $cc_version | cut -f2 -d.`
cc_vers_patch=`echo $cc_version | cut -f2 -d.`
test -n "$cc_vers_major" || cc_vers_major=0
test -n "$cc_vers_minor" || cc_vers_minor=0
test -n "$cc_vers_patch" || cc_vers_patch=0
cc_vers_all=`expr $cc_vers_major '*' 1000000 + $cc_vers_minor '*' 1000 + $cc_vers_patch`
fi
fi
# Common Intel flags for various situations
if test "X-icx" = "X-$cc_vendor"; then
# Insert section about version specific problems from compiler flags here,
# if necessary.
arch=
# Architecture-specific flags
# Nothing currently. (Uncomment code below and modify to add any)
#case "$host_os-$host_cpu" in
# *-i686)
# arch="-march=i686"
# ;;
#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
###########
# General #
###########
# Default to C99 standard.
H5_CFLAGS="$H5_CFLAGS $arch -std=c99"
##############
# Production #
##############
PROD_CFLAGS=
#########
# Debug #
#########
# NDEBUG is handled explicitly in configure
DEBUG_CFLAGS=
###########
# Symbols #
###########
NO_SYMBOLS_CFLAGS="-Wl,-s"
SYMBOLS_CFLAGS="-g"
#############
# Profiling #
#############
PROFILE_CFLAGS="-p"
################
# Optimization #
################
HIGH_OPT_CFLAGS="-O3"
DEBUG_OPT_CFLAGS="-O0"
NO_OPT_CFLAGS="-O0"
############
# Warnings #
############
###########
# General #
###########
# Add various general warning flags in intel-warnings.
H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments oneapi/general)"
######################
# Developer warnings #
######################
DEVELOPER_WARNING_CFLAGS=$(load_intel_arguments oneapi/developer-general)
#############################
# Version-specific warnings #
#############################
#################
# 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=
fi

View File

@ -47,6 +47,14 @@ New Features
Configuration:
-------------
- Improved support for Intel oneAPI
* Separates the old 'classic' Intel compiler settings and warnings
from the oneAPI settings
* Uses `-check nouninit` in debug builds to avoid false positives
when building H5_buildiface with `-check all`
* Both Autotools and CMake
- Added new options for CMake and Autotools to control the Doxygen
warnings as errors setting.