arch: Fix OneapiCompiler and SyclCompiler initialization

devito/arch/compiler.py

@@ -737,7 +737,7 @@ def __init_finalize__(self, **kwargs):
 
         if kwargs.get('mpi'):
             self.__init_intel_mpi__()
-            self.cflags.insert(0, '-cc=%s' % self.CC)
+            self.__init_intel_mpi_flags__()
 
     def __init_intel_mpi__(self, **kwargs):
         # Make sure the MPI compiler uses an Intel compiler underneath,
@@ -747,6 +747,9 @@ def __init_intel_mpi__(self, **kwargs):
             warning("Expected Intel MPI distribution with `%s`, but found `%s`"
                     % (self.__class__.__name__, mpi_distro))
 
+    def __init_intel_mpi_flags__(self, **kwargs):
+        self.cflags.insert(0, '-cc=%s' % self.CC)
+
     def get_version(self):
         if configuration['mpi']:
             cmd = (self.cc, "-cc=%s" % self.CC, "--version")
@@ -779,7 +782,7 @@ def __lookup_cmds__(self):
 class IntelKNLCompiler(IntelCompiler):
 
     def __init_finalize__(self, **kwargs):
-        IntelCompiler.__init_finalize__(self, **kwargs)
+        super().__init_finalize__(**kwargs)
 
         language = kwargs.pop('language', configuration['language'])
 
@@ -792,6 +795,8 @@ def __init_finalize__(self, **kwargs):
 class OneapiCompiler(IntelCompiler):
 
     def __init_finalize__(self, **kwargs):
+        super().__init_finalize__(**kwargs)
+
         platform = kwargs.pop('platform', configuration['platform'])
         language = kwargs.pop('language', configuration['language'])
 
@@ -817,9 +822,6 @@ def __init_finalize__(self, **kwargs):
                 self.cflags.append('-gline-tables-only')
                 self.cflags.append('-fdebug-info-for-profiling')
 
-        if kwargs.get('mpi'):
-            self.__init_intel_mpi__()
-
     def __init_intel_mpi__(self, **kwargs):
         super().__init_intel_mpi__(**kwargs)
 
@@ -830,6 +832,9 @@ def __init_intel_mpi__(self, **kwargs):
         if isinstance(platform, IntelDevice):
             environ['I_MPI_OFFLOAD'] = '1'
 
+    def __init_intel_mpi_flags__(self, **kwargs):
+        pass
+
     get_version = Compiler.get_version
 
     def __lookup_cmds__(self):
@@ -846,6 +851,8 @@ class SyclCompiler(OneapiCompiler):
     _cpp = True
 
     def __init_finalize__(self, **kwargs):
+        IntelCompiler.__init_finalize__(self, **kwargs)
+
         platform = kwargs.pop('platform', configuration['platform'])
         language = kwargs.pop('language', configuration['language'])
 
@@ -868,9 +875,6 @@ def __init_finalize__(self, **kwargs):
         else:
             raise NotImplementedError("Unsupported platform %s" % platform)
 
-        if kwargs.get('mpi'):
-            self.__init_intel_mpi__()
-
 
 class CustomCompiler(Compiler):