advisor: Isolate profiler and compiler

Author: George Bisbas

devito/arch/compiler.py

@@ -769,18 +769,6 @@ def __init_finalize__(self, **kwargs):
             self.__init_intel_mpi__()
             self.__init_intel_mpi_flags__()
 
-        if configuration['profiling'] == 'advisor':
-            # Locate the Intel Advisor installation and
-            # add the necessary paths and flags to the compiler
-            path = get_advisor_path()
-            self.add_include_dirs(path.joinpath('include').as_posix())
-
-            _default_libs = ['ittnotify']
-            self.add_libraries(_default_libs)
-
-            libdir = path.joinpath('lib64').as_posix()
-            self.add_library_dirs(libdir, rpath=True)
-
     def __init_intel_mpi__(self, **kwargs):
         # Make sure the MPI compiler uses an Intel compiler underneath,
         # whatever the MPI distro is

devito/operator/operator.py

@@ -219,6 +219,12 @@ def _build(cls, expressions, **kwargs):
 
         # Required for the jit-compilation
         op._compiler = kwargs['compiler']
+
+        # Add any metadata from the profiler
+        op._compiler.add_include_dirs(profiler._include_dirs)
+        op._compiler.add_library_dirs(profiler._lib_dirs, rpath=True)
+        op._compiler.add_libraries(profiler._default_libs)
+
         op._language = kwargs['language']
         op._lib = None
         op._cfunction = None

devito/operator/profiling.py

@@ -8,6 +8,7 @@
 import numpy as np
 from sympy import S
 
+from devito.arch import get_advisor_path
 from devito.ir.iet import (ExpressionBundle, List, TimedList, Section,
                            Iteration, FindNodes, Transformer)
 from devito.ir.support import IntervalGroup
@@ -32,6 +33,9 @@ class Profiler:
     _default_libs = []
     _ext_calls = []
 
+    _include_dirs = []
+    _lib_dirs = []
+
     _supports_async_sections = False
 
     _verbosity = 0
@@ -365,7 +369,11 @@ class AdvisorProfiler(AdvancedProfiler):
 
     def __init__(self, name):
         super(AdvisorProfiler, self).__init__(name)
-        return
+        path = get_advisor_path()
+        self._include_dirs = [path.joinpath('include').as_posix()]
+
+        libdir = path.joinpath('lib64').as_posix()
+        self._lib_dirs = [libdir]
 
     def analyze(self, iet):
         return