From ee99d87e910a210638eb13e841c2920f152459c0 Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Wed, 8 Nov 2023 16:51:16 +0000 Subject: [PATCH] Use -qopenmp instead of -fiopenmp for OpenMP in OneAPI Recommended in porting guide: qopenmp, unlike fiopenmp, works for both classic and oneapi compilers https://www.intel.com/content/www/us/en/developer/articles/guide/porting-guide-for-ifort-to-ifx.html Fixes #4376 --- easybuild/toolchains/compiler/intel_compilers.py | 5 +++-- test/framework/toolchain.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/easybuild/toolchains/compiler/intel_compilers.py b/easybuild/toolchains/compiler/intel_compilers.py index ef537d9315..ae97dfa87d 100644 --- a/easybuild/toolchains/compiler/intel_compilers.py +++ b/easybuild/toolchains/compiler/intel_compilers.py @@ -109,8 +109,9 @@ def set_variables(self): self.options.options_map['loose'] = ['fp-model fast'] # fp-model fast=2 gives "warning: overriding '-ffp-model=fast=2' option with '-ffp-model=fast'" self.options.options_map['veryloose'] = ['fp-model fast'] - # recommended in porting guide - self.options.options_map['openmp'] = ['fiopenmp'] + # recommended in porting guide: qopenmp, unlike fiopenmp, works for both classic and oneapi compilers + # https://www.intel.com/content/www/us/en/developer/articles/guide/porting-guide-for-ifort-to-ifx.html + self.options.options_map['openmp'] = ['qopenmp'] # -xSSE2 is not supported by Intel oneAPI compilers, # so use -march=x86-64 -mtune=generic when using optarch=GENERIC diff --git a/test/framework/toolchain.py b/test/framework/toolchain.py index d80d41c788..f6243bd3b3 100644 --- a/test/framework/toolchain.py +++ b/test/framework/toolchain.py @@ -2036,7 +2036,7 @@ def test_independence(self): 'CrayIntel': "-O2 -ftz -fp-speculation=safe -fp-model source -fopenmp -craype-verbose", 'GCC': "-O2 -ftree-vectorize -test -fno-math-errno -fopenmp", 'iccifort': "-O2 -test -ftz -fp-speculation=safe -fp-model source -fopenmp", - 'intel-compilers': "-O2 -test -ftz -fp-speculation=safe -fp-model precise -fiopenmp", + 'intel-compilers': "-O2 -test -ftz -fp-speculation=safe -fp-model precise -qopenmp", } toolchains = [