Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add processing of NVHPC flags in linux-gnulibc1 file #3804

Merged
merged 2 commits into from
Nov 1, 2023
Merged

Add processing of NVHPC flags in linux-gnulibc1 file #3804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9400b0b
Add processing of NVHPC flags in linux-gnulibc1 file
jhendersonHDF Oct 30, 2023
c1b888f
Disable testing as tests are failing the same as in CMake
jhendersonHDF Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/nvhpc-auto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ jobs:

# RUN TESTS
# NORMAL
- name: Autotools Run Tests
run: |
export PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/comm_libs/openmpi4/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/compilers/bin:$PATH
make check -j
working-directory: ${{ runner.workspace }}/build
# - name: Autotools Run Tests
# run: |
# export PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/comm_libs/openmpi4/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/compilers/bin:$PATH
# make check -j
# working-directory: ${{ runner.workspace }}/build
Copy link
Member

@derobins derobins Oct 31, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are the checks commented out?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See previous comment.


# INSTALL (note that this runs even when we don't run the tests)
- name: Autotools Install
Expand Down
25 changes: 23 additions & 2 deletions config/linux-gnulibc1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ fi
# Figure out Clang C compiler flags
. $srcdir/config/clang-flags

# Figure out NVHPC C compiler flags
. $srcdir/config/nvidia-flags

# Use default Fortran 90 compiler according to what C compiler is used.
if test "X-" = "X-$FC"; then
case $CC_BASENAME in
Expand All @@ -58,6 +61,10 @@ if test "X-" = "X-$FC"; then
FC=pgf90
FC_BASENAME=pgf90
;;
nvc*)
FC=nvfortran
FC_BASENAME=nvfortran
;;
icx*)
FC=ifx
FC_BASENAME=ifx
Expand All @@ -79,7 +86,7 @@ if test "X-" = "X-$FC"; then
else
case $FC in
# The PGI and Intel compilers are automatically detected below
ifc*|ifort*|pgf90*)
ifc*|ifort*|pgf90*|nvfortran*)
;;

*f95*)
Expand Down Expand Up @@ -135,6 +142,9 @@ fi
# Figure out Clang FC compiler flags
. $srcdir/config/clang-fflags

# Figure out NVHPC FC compiler flags
. $srcdir/config/nvidia-fflags

case $FC_BASENAME in
#
# Absoft compiler
Expand Down Expand Up @@ -226,6 +236,9 @@ fi
# Figure out Clang CXX compiler flags
. $srcdir/config/clang-cxxflags

# Figure out NVHPC CXX compiler flags
. $srcdir/config/nvidia-cxxflags

# compiler version strings

# check if the compiler_version_info is already set
Expand All @@ -248,7 +261,11 @@ case $CC in
sed 's/\"/\\\"/g' |\
sed 's/^\([a-z]* \)/ built with \1/1'`
cc_version_info=`echo $cc_version_info`
;;
;;

*nvc*)
cc_version_info=`$CC $CFLAGS $H5_CFLAGS -V 2>&1 | grep 'nvc'`
;;

*icx*)
cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -V 2>&1 | grep 'Version' |\
Expand Down Expand Up @@ -322,6 +339,10 @@ case $FC in
fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'pgf90'`
;;

*nvfortran*)
fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'nvfortran'`
;;

*nagfor*|*nagftn*)
RM='rm -f'
tmpfile=/tmp/cmpver.$$
Expand Down