diff options
| author | Ralf Gommers <ralf.gommers@gmail.com> | 2016-05-22 19:22:16 +0200 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@gmail.com> | 2016-05-22 19:22:16 +0200 |
| commit | 25e3ebf4def51b290f544fb0bc7f6d8eb5c04b85 (patch) | |
| tree | 78216e1f955b2a8f6be662376f744d16cf434691 | |
| parent | 6ce33a18a62fbc42af2c7a325130f705740c2a1e (diff) | |
| parent | d5e128c331a2ab404821e744f826da3f840733da (diff) | |
| download | numpy-25e3ebf4def51b290f544fb0bc7f6d8eb5c04b85.tar.gz | |
Merge pull request #7655 from charris/intel-compiler-flags
BLD: Remove Intel compiler flag -xSSE4.2
| -rw-r--r-- | numpy/distutils/fcompiler/intel.py | 4 | ||||
| -rw-r--r-- | numpy/distutils/intelccompiler.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py index c4f15a073..f3e616e1d 100644 --- a/numpy/distutils/fcompiler/intel.py +++ b/numpy/distutils/fcompiler/intel.py @@ -123,7 +123,7 @@ class IntelEM64TFCompiler(IntelFCompiler): return ['-openmp -fp-model strict -O1'] def get_flags_arch(self): - return ['-xSSE4.2'] + return [''] # Is there no difference in the version string between the above compilers # and the Visual compilers? @@ -205,7 +205,7 @@ class IntelEM64VisualFCompiler(IntelVisualFCompiler): version_match = simple_version_match(start='Intel\(R\).*?64,') def get_flags_arch(self): - return ['/QaxSSE4.2'] + return [''] if __name__ == '__main__': diff --git a/numpy/distutils/intelccompiler.py b/numpy/distutils/intelccompiler.py index 20c6d2ba4..ee089dbae 100644 --- a/numpy/distutils/intelccompiler.py +++ b/numpy/distutils/intelccompiler.py @@ -54,7 +54,7 @@ class IntelEM64TCCompiler(UnixCCompiler): def __init__(self, verbose=0, dry_run=0, force=0): UnixCCompiler.__init__(self, verbose, dry_run, force) self.cc_exe = ('icc -m64 -fPIC -fp-model strict -O3 ' - '-fomit-frame-pointer -openmp -xSSE4.2') + '-fomit-frame-pointer -openmp') compiler = self.cc_exe if platform.system() == 'Darwin': shared_flag = '-Wl,-undefined,dynamic_lookup' @@ -88,7 +88,7 @@ if platform.system() == 'Windows': self.lib = self.find_exe('xilib') self.linker = self.find_exe('xilink') self.compile_options = ['/nologo', '/O3', '/MD', '/W3', - '/Qstd=c99', '/QaxSSE4.2'] + '/Qstd=c99'] self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/Qstd=c99', '/Z7', '/D_DEBUG'] |