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

Jump to bottom

add complex return detection for nvfortran #765

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add complex return detection for nvfortran #765

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f341c98
add complex return detection for nvfortran
jeffhammond Aug 8, 2023
3f59778
Syntax error fix; whitespace changes.
fgvanzee Aug 8, 2023
40a72e0
ppc64le is gnu not intel
jeffhammond Aug 11, 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
32 changes: 29 additions & 3 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@ get_fc_search_list()
{
local list

list="gfortran ifort"
list="gfortran ifort ifx nvfortran"

echo "${list}"
}
Expand Down Expand Up @@ -4042,11 +4042,37 @@ main()
# Query the compiler "vendor" (ie: the compiler's simple name).
# The last part ({ read first rest ; echo $first ; }) is a workaround
# to OS X's egrep only returning the first match.
fc_vendor=$(echo "${vendor_string}" | grep -oE 'IFORT|GNU' |
fc_vendor=$(echo "${vendor_string}" | grep -oE 'IFORT|IFX|GNU|NVIDIA|PGI' |
{ read -r first rest ; echo "${first}"; })

if [[ ${fc_vendor} = IFORT ]]; then
if [[ ${fc_vendor} = IFORT || ${fc_vendor} = IFX ]]; then
complex_return='intel'
elif [[ ${fc_vendor} = NVIDIA || ${fc_vendor} = PGI ]]; then
# On x86_64 and aarch64 prior to 23.9, nvfortran
# uses the 'intel' convention.
# On and ppc64le and aarch64 starting with 23.9,
# the convention is 'gnu'.
if [[ "$(uname -m)" = "aarch64" ]]; then
fc_version=$(echo "${vendor_string}" \
| grep -oE '[0-9]+\.[0-9]+\.?[0-9]*' \
| { read -r first rest ; echo "${first}"; })
if [[ ${fc_version:0:2} -lt 23 ]]; then
complex_return='intel'
elif [[ ${fc_version:0:2} -eq 23 ]]; then
# Use 3:5 because minor version numbers include 1 and 11.
if [[ ${fc_version:3:5} -lt 9 ]]; then
complex_return='intel'
else
complex_return='gnu'
fi
else
complex_return='gnu'
fi
elif [[ "$(uname -m)" = "ppc64le" ]]; then
complex_return='gnu'
else
complex_return='intel'
fi
elif [[ ${fc_vendor} = GNU ]]; then
complex_return='gnu'
else
Expand Down