From 3a429d1034c480e574a10367c399728bfe5eb935 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Wed, 19 Apr 2017 14:18:54 -0600 Subject: 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] --- numpy/distutils/fcompiler/intel.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'numpy/distutils/fcompiler/intel.py') 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 [''] -- cgit v1.2.1