Merge pull request #74 from hiker/support_for_intel_on_cray

Added support for intel compiler.

Author: benvanwerkhoven

examples/fortran/vector_add.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 """This is a minimal example for calling Fortran functions"""
 
+from __future__ import print_function
 import logging
 import json
 import numpy as np
@@ -21,11 +22,17 @@ def tune():
     tune_params["N"] = [size]
     tune_params["NTHREADS"] = [16, 8, 4, 2, 1]
 
+    print("compile with ftn using intel on cray")
+    result, env = tune_kernel("time_vector_add", "vector_add.F90", size,
+                              args, tune_params, lang="C", compiler="ftn")
+
     print("compile with gfortran")
-    result, env = tune_kernel("time_vector_add", "vector_add.F90", size, args, tune_params, lang="C", compiler="gfortran")
+    result, env = tune_kernel("time_vector_add", "vector_add.F90", size,
+                              args, tune_params, lang="C", compiler="gfortran")
 
     print("compile with pgfortran")
-    result, env = tune_kernel("time_vector_add", "vector_add.F90", size, args, tune_params, lang="C", compiler="pgfortran")
+    result, env = tune_kernel("time_vector_add", "vector_add.F90", size,
+                              args, tune_params, lang="C", compiler="pgfortran")
 
     return result
 

kernel_tuner/c.py

@@ -134,7 +134,7 @@ def compile(self, kernel_name, kernel_string):
 
         #select right suffix based on compiler
         suffix = ".cc"
-        if self.compiler in ["gfortran", "pgfortran"]:
+        if self.compiler in ["gfortran", "pgfortran", "ftn", "ifort"]:
             suffix = ".F90"
         if self.compiler == "nvcc":
             suffix = suffix[:-1] + "u"
@@ -164,6 +164,8 @@ def compile(self, kernel_name, kernel_string):
         if match:
             if self.compiler == "gfortran":
                 kernel_name = "__" + match.group(1) + "_MOD_" + kernel_name
+            elif self.compiler in ["ftn", "ifort"]:
+                kernel_name = match.group(1) + "_mp_" + kernel_name + "_"
             elif self.compiler == "pgfortran":
                 kernel_name = match.group(1) + "_" + kernel_name + "_"