Browse Source

Merge pull request #3635 from martin-frbg/issue3634

Support compilation with the Intel ifx compiler
tags/v0.3.21
Martin Kroeker GitHub 3 years ago
parent
commit
771dc6a8d8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
  1. +6
    -2
      f_check
  2. +5
    -2
      f_check.pl

+ 6
- 2
f_check View File

@@ -45,7 +45,7 @@ if [ -z "$compiler" ]; then
pathf90 pathf95 pathf90 pathf95
pgf95 pgf90 pgf77 pgfortran nvfortran pgf95 pgf90 pgf77 pgfortran nvfortran
flang egfortran flang egfortran
ifort nagfor"
ifort nagfor ifx"


for list in $lists; do for list in $lists; do
for p in $path; do for p in $path; do
@@ -98,6 +98,10 @@ else
vendor=FLANG vendor=FLANG
openmp='-fopenmp' openmp='-fopenmp'
;; ;;
*ifx*)
vendor=INTEL
openmp='-fopenmp'
;;
*pgf*|*nvf*) *pgf*|*nvf*)
vendor=PGI vendor=PGI
openmp='-mp' openmp='-mp'
@@ -171,7 +175,7 @@ else
bu=_ bu=_
openmp='-fopenmp' openmp='-fopenmp'
;; ;;
*ifort*)
*ifort*|*ifx*)
vendor=INTEL vendor=INTEL
bu=_ bu=_
openmp='-fopenmp' openmp='-fopenmp'


+ 5
- 2
f_check.pl View File

@@ -34,7 +34,7 @@ if ($compiler eq "") {
"pathf90", "pathf95", "pathf90", "pathf95",
"pgf95", "pgf90", "pgf77", "pgfortran", "nvfortran", "pgf95", "pgf90", "pgf77", "pgfortran", "nvfortran",
"flang", "egfortran", "flang", "egfortran",
"ifort", "nagfor");
"ifort", "nagfor", "ifx");


OUTER: OUTER:
foreach $lists (@lists) { foreach $lists (@lists) {
@@ -90,6 +90,9 @@ if ($compiler eq "") {
if ($compiler =~ /flang/) { if ($compiler =~ /flang/) {
$vendor = FLANG; $vendor = FLANG;
$openmp = "-fopenmp"; $openmp = "-fopenmp";
} elsif ($compiler =~ /ifx/) {
$vendor = INTEL;
$openmp = "-fopenmp";
} elsif ($compiler =~ /pgf/ || $compiler =~ /nvf/) { } elsif ($compiler =~ /pgf/ || $compiler =~ /nvf/) {
$vendor = PGI; $vendor = PGI;
$openmp = "-mp"; $openmp = "-mp";
@@ -176,7 +179,7 @@ if ($compiler eq "") {
$openmp = "-fopenmp"; $openmp = "-fopenmp";
} }


if ($compiler =~ /ifort/) {
if ($compiler =~ /ifort/ || $compiler =~ /ifx/) {
$vendor = INTEL; $vendor = INTEL;
$bu = "_"; $bu = "_";
$openmp = "-fopenmp"; $openmp = "-fopenmp";


Loading…
Cancel
Save