arch: separate intel and oneapi compilers

Author: mloubout

devito/arch/compiler.py

@@ -912,7 +912,7 @@ def __init_finalize__(self, **kwargs):
             warning("Running on Intel KNL without OpenMP is highly discouraged")
 
 
-class OneapiCompiler(IntelCompiler):
+class OneapiCompiler(Compiler):
 
     def __init_finalize__(self, **kwargs):
         IntelCompiler.__init_finalize__(self, **kwargs)
@@ -955,8 +955,6 @@ def __init_intel_mpi__(self, **kwargs):
     def __init_intel_mpi_flags__(self, **kwargs):
         pass
 
-    get_version = Compiler.get_version
-
     def __lookup_cmds__(self):
         # OneAPI HPC ToolKit comes with icpx, which is clang++,
         # and icx, which is clang

devito/passes/iet/languages/openmp.py

@@ -6,7 +6,7 @@
 
 from devito.arch import AMDGPUX, INTELGPUX, NVIDIAX, PVC
 from devito.arch.compiler import (
-    CustomCompiler, GNUCompiler, IntelCompiler, NvidiaCompiler, OneapiCompiler
+    CustomCompiler, GNUCompiler, IntelCompiler, NvidiaCompiler
 )
 from devito.ir import (
     Call, Conditional, DeviceCall, FindSymbols, List, ParallelBlock, PointerCast, Pragma,
@@ -283,10 +283,8 @@ def _support_nested_parallelism(cls, compiler):
         # In case we have a CustomCompiler
         if isinstance(compiler, CustomCompiler):
             compiler = compiler._base()
-        # Only supported by icc (IntelCompiler) but not by
-        # OneAPI's DPC++ compiler (OneapiCompiler) that inherits from IntelCompiler
-        return isinstance(compiler, IntelCompiler) and not \
-            isinstance(compiler, OneapiCompiler)
+        # Only supported by icc (IntelCompiler)
+        return isinstance(compiler, IntelCompiler)
 
 
 class Ompizer(AbstractOmpizer):

tests/test_dle.py

@@ -12,7 +12,7 @@
     SparseTimeFunction, SubDimension, TimeFunction, configuration, cos, dimensions, info,
     switchconfig
 )
-from devito.arch.compiler import IntelCompiler, OneapiCompiler
+from devito.arch.compiler import IntelCompiler
 from devito.exceptions import InvalidArgument
 from devito.ir.iet import (
     Expression, FindNodes, IsPerfectIteration, Iteration, retrieve_iteration_tree
@@ -1489,8 +1489,7 @@ def test_nested_parallelism_support(self):
         # Check omp pargams
         assert trees[0][0].pragmas[0].ccode.value == \
             'omp for collapse(2) schedule(dynamic,1)'
-        if isinstance(configuration['compiler'], IntelCompiler) and \
-           not isinstance(configuration['compiler'], OneapiCompiler):
+        if isinstance(configuration['compiler'], IntelCompiler):
             # Supports nested parallelism
             assert trees[0][2].pragmas[0].ccode.value == \
                 'omp parallel for collapse(2) schedule(dynamic,1)'\