BUG: fix 64-bit Intel Fortran compiler detection. Closes #1448.

rgommers · rgommers · commit ce9fea2c202f · 2011-03-09T21:42:05.000+08:00
diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py
@@ -136,9 +136,9 @@ class IntelItaniumFCompiler(IntelFCompiler):
 class IntelEM64TFCompiler(IntelFCompiler):
     compiler_type = 'intelem'
     compiler_aliases = ()
-    description = 'Intel Fortran Compiler for EM64T-based apps'
+    description = 'Intel Fortran Compiler for 64-bit apps'
 
-    version_match = intel_version_match('EM64T-based|Intel\\(R\\) 64')
+    version_match = intel_version_match('EM64T-based|Intel\\(R\\) 64|64|IA-64|64-bit')
 
     possible_executables = ['ifort', 'efort', 'efc']
 
@@ -165,9 +165,9 @@ class IntelVisualFCompiler(BaseIntelFCompiler):
     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()    
+        f = dummy_fortran_file()
         self.executables['version_cmd'] = ['<F77>', '/FI', '/c',
                                            f + '.f', '/o', f + '.o']
 
diff --git a/numpy/distutils/tests/test_fcompiler_intel.py b/numpy/distutils/tests/test_fcompiler_intel.py
@@ -0,0 +1,34 @@
+from numpy.testing import *
+
+import numpy.distutils.fcompiler
+
+intel_32bit_version_strings = [
+    ("Intel(R) Fortran Intel(R) 32-bit Compiler Professional for applications"\
+     "running on Intel(R) 32, Version 11.1", '11.1'),
+]
+
+intel_64bit_version_strings = [
+    ("Intel(R) Fortran IA-64 Compiler Professional for applications"\
+     "running on IA-64, Version 11.0", '11.0'),
+    ("Intel(R) Fortran Intel(R) 64 Compiler Professional for applications"\
+     "running on Intel(R) 64, Version 11.1", '11.1')
+]
+
+class TestIntelFCompilerVersions(TestCase):
+    def test_32bit_version(self):
+        fc = numpy.distutils.fcompiler.new_fcompiler(compiler='intel')
+        for vs, version in intel_32bit_version_strings:
+            v = fc.version_match(vs)
+            assert_(v == version)
+
+
+class TestIntelEM64TFCompilerVersions(TestCase):
+    def test_64bit_version(self):
+        fc = numpy.distutils.fcompiler.new_fcompiler(compiler='intelem')
+        for vs, version in intel_64bit_version_strings:
+            v = fc.version_match(vs)
+            assert_(v == version)
+
+
+if __name__ == '__main__':
+    run_module_suite()
