diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-04-19 14:18:54 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2017-04-19 15:17:17 -0600 |
| commit | 3a429d1034c480e574a10367c399728bfe5eb935 (patch) | |
| tree | 8a9f404266a9547f3635f859b756bad16b70bf73 /numpy/distutils/fcompiler/intel.py | |
| parent | c853b93c1823711b7a9bf3992c63ab55ac27fc38 (diff) | |
| download | numpy-3a429d1034c480e574a10367c399728bfe5eb935.tar.gz | |
MAINT: Update Intel compiler options.
The '-openmp' option was deprecated in Intel version 15 and removed
in version 18. The replacement is '-qopenmp'.
Closes #8941.
[skip ci]
Diffstat (limited to 'numpy/distutils/fcompiler/intel.py')
| -rw-r--r-- | numpy/distutils/fcompiler/intel.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py index f6f2d7e32..eb6150201 100644 --- a/numpy/distutils/fcompiler/intel.py +++ b/numpy/distutils/fcompiler/intel.py @@ -56,7 +56,9 @@ class IntelFCompiler(BaseIntelFCompiler): return ['-fPIC'] def get_flags_opt(self): # Scipy test failures with -O2 - return ['-xhost -openmp -fp-model strict -O1'] + v = self.get_version() + mpopt = 'openmp' if v and int(v.split('.')[0]) < 15 else 'qopenmp' + return ['-xhost -fp-model strict -O1 -{}'.format(mpopt)] def get_flags_arch(self): return [] @@ -120,7 +122,9 @@ class IntelEM64TFCompiler(IntelFCompiler): return ['-fPIC'] def get_flags_opt(self): # Scipy test failures with -O2 - return ['-openmp -fp-model strict -O1'] + v = self.get_version() + mpopt = 'openmp' if v and int(v.split('.')[0]) < 15 else 'qopenmp' + return ['-fp-model strict -O1 -{}'.format(mpopt)] def get_flags_arch(self): return [''] |