[Numpy-svn] r8079 - trunk/numpy/distutils/fcompiler

[numpy-svn at scipy.org]

Author: oliphant
Date: 2010-01-24 17:11:57 -0600 (Sun, 24 Jan 2010)
New Revision: 8079

Modified:
   trunk/numpy/distutils/fcompiler/__init__.py
   trunk/numpy/distutils/fcompiler/intel.py
Log:
Apply ifort.patch from ticket #1372 to allow Intel Fortran Compiler 11.1 to be called by numpy.distutils.

Modified: trunk/numpy/distutils/fcompiler/__init__.py
===================================================================
--- trunk/numpy/distutils/fcompiler/__init__.py	2010-01-21 21:10:02 UTC (rev 8078)
+++ trunk/numpy/distutils/fcompiler/__init__.py	2010-01-24 23:11:57 UTC (rev 8079)
@@ -688,7 +688,8 @@
 
 _default_compilers = (
     # sys.platform mappings
-    ('win32', ('gnu','intelv','absoft','compaqv','intelev','gnu95','g95')),
+    ('win32', ('gnu','intelv','absoft','compaqv','intelev','gnu95','g95',
+               'intelvem', 'intelem')),
     ('cygwin.*', ('gnu','intelv','absoft','compaqv','intelev','gnu95','g95')),
     ('linux.*', ('gnu','intel','lahey','pg','absoft','nag','vast','compaq',
                 'intele','intelem','gnu95','g95')),

Modified: trunk/numpy/distutils/fcompiler/intel.py
===================================================================
--- trunk/numpy/distutils/fcompiler/intel.py	2010-01-21 21:10:02 UTC (rev 8078)
+++ trunk/numpy/distutils/fcompiler/intel.py	2010-01-24 23:11:57 UTC (rev 8079)
@@ -8,7 +8,7 @@
 
 compilers = ['IntelFCompiler', 'IntelVisualFCompiler',
              'IntelItaniumFCompiler', 'IntelItaniumVisualFCompiler',
-             'IntelEM64TFCompiler']
+             'IntelEM64VisualFCompiler', 'IntelEM64TFCompiler']
 
 def intel_version_match(type):
     # Match against the important stuff in the version string
@@ -165,9 +165,14 @@
     compiler_type = 'intelv'
     description = 'Intel Visual Fortran Compiler for 32-bit apps'
     version_match = intel_version_match('32-bit|IA-32')
+    
+    def update_executables(self):
+        f = dummy_fortran_file()    
+        self.executables['version_cmd'] = ['<F77>', '/FI', '/c',
+                                           f + '.f', '/o', f + '.o']
 
     ar_exe = 'lib.exe'
-    possible_executables = ['ifl']
+    possible_executables = ['ifort', 'ifl']
 
     executables = {
         'version_cmd'  : None,
@@ -196,7 +201,7 @@
         return ['/4Yb','/d2']
 
     def get_flags_opt(self):
-        return ['/O3','/Qip','/Qipo','/Qipo_obj']
+        return ['/O3','/Qip']
 
     def get_flags_arch(self):
         opt = []
@@ -231,6 +236,13 @@
         'ranlib'       : None
         }
 
+class IntelEM64VisualFCompiler(IntelVisualFCompiler):
+    compiler_type = 'intelvem'
+    description = 'Intel Visual Fortran Compiler for 64-bit apps'
+
+    version_match = simple_version_match(start='Intel\(R\).*?64,')
+
+
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)