Skip to content

Commit

Permalink
ENH: remove obsolete ifort flags, ensure generated binaries work ever…
Browse files Browse the repository at this point in the history
…ywhere.
  • Loading branch information
cournape committed Apr 23, 2013
1 parent 1975606 commit a09fc33
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions numpy/distutils/fcompiler/intel.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import sys

from numpy.distutils.cpuinfo import cpu
from numpy.distutils.ccompiler import simple_version_match
from numpy.distutils.fcompiler import FCompiler, dummy_fortran_file

Expand Down Expand Up @@ -163,21 +162,10 @@ def get_flags_debug(self):
return ['/4Yb','/d2']

def get_flags_opt(self):
return ['/O1']
return ['/O2']

def get_flags_arch(self):
opt = []
if cpu.is_PentiumPro() or cpu.is_PentiumII():
opt.extend(['/G6','/Qaxi'])
elif cpu.is_PentiumIII():
opt.extend(['/G6','/QaxK'])
elif cpu.is_Pentium():
opt.append('/G5')
elif cpu.is_PentiumIV():
opt.extend(['/G7','/QaxW'])
if cpu.has_mmx():
opt.append('/QaxM')
return opt
return ["/arch:IA-32", "/QaxSSE3"]

class IntelItaniumVisualFCompiler(IntelVisualFCompiler):
compiler_type = 'intelev'
Expand All @@ -204,6 +192,9 @@ class IntelEM64VisualFCompiler(IntelVisualFCompiler):

version_match = simple_version_match(start='Intel\(R\).*?64,')

def get_flags_arch(self):
return ["/arch:SSE2"]


if __name__ == '__main__':
from distutils import log
Expand Down

0 comments on commit a09fc33

Please sign in to comment.