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

numpy-svn at scipy.org numpy-svn at scipy.org
Thu Oct 19 17:03:27 CDT 2006


Author: pearu
Date: 2006-10-19 17:03:23 -0500 (Thu, 19 Oct 2006)
New Revision: 3371

Modified:
   trunk/numpy/distutils/fcompiler/intel.py
Log:
Add Intel Itanium compiler 9.x support (needs testing).

Modified: trunk/numpy/distutils/fcompiler/intel.py
===================================================================
--- trunk/numpy/distutils/fcompiler/intel.py	2006-10-19 18:26:00 UTC (rev 3370)
+++ trunk/numpy/distutils/fcompiler/intel.py	2006-10-19 22:03:23 UTC (rev 3371)
@@ -74,10 +74,15 @@
 
 class IntelItaniumFCompiler(IntelFCompiler):
     compiler_type = 'intele'
-    version_pattern = r'Intel\(R\) Fortran 90 Compiler Itanium\(TM\) Compiler'\
-                      ' for the Itanium\(TM\)-based applications,'\
-                      ' Version (?P<version>[^\s*]*)'
+    version_pattern = r'Intel\(R\) Fortran (90 Compiler Itanium\(TM\)|Itanium\(R\)) Compiler'\
+                      ' for (the Itanium\(TM\)|Itanium\(R\))-based applications(,|)'\
+                      '\s+Version (?P<version>[^\s*]*)'
 
+Intel(R) Fortran Itanium(R) Compiler for Itanium(R)-based applications
+Version 9.1    Build 20060928 Package ID: l_fc_c_9.1.039
+Copyright (C) 1985-2006 Intel Corporation.  All rights reserved.
+30 DAY EVALUATION LICENSE
+
     for fc_exe in map(find_executable,['ifort','efort','efc']):
         if os.path.isfile(fc_exe):
             break
@@ -176,9 +181,9 @@
 class IntelItaniumVisualFCompiler(IntelVisualFCompiler):
 
     compiler_type = 'intelev'
-    version_pattern = r'Intel\(R\) Fortran 90 Compiler Itanium\(TM\) Compiler'\
-                      ' for the Itanium\(TM\)-based applications,'\
-                      ' Version (?P<version>[^\s*]*)'
+    version_pattern = r'Intel\(R\) Fortran (90 Compiler Itanium\(TM\)|Itanium\(R\)) Compiler'\
+                      ' for (the Itanium\(TM\)|Itanium\(R\))-based applications(,|)'\
+                      '\s+Version (?P<version>[^\s*]*)'
 
     fc_exe = 'efl' # XXX this is a wild guess
     ar_exe = IntelVisualFCompiler.ar_exe



More information about the Numpy-svn mailing list