compiler: Add missing CXX and CXXOmp DataManagers and Orchestrators

Author: EdCaunt

devito/passes/iet/languages/CXX.py

@@ -2,11 +2,13 @@
 from sympy.printing.cxx import CXX11CodePrinter
 
 from devito.ir import Call, UsingNamespace, BasePrinter
+from devito.passes.iet.definitions import DataManager
+from devito.passes.iet.orchestration import Orchestrator
 from devito.passes.iet.langbase import LangBB
 from devito.symbolics import c_complex, c_double_complex
 from devito.tools import dtype_to_cstr
 
-__all__ = ['CXXBB']
+__all__ = ['CXXBB', 'CXXDataManager', 'CXXOrchestrator']
 
 
 def std_arith(prefix=None):
@@ -88,6 +90,14 @@ class CXXBB(LangBB):
     }
 
 
+class CXXDataManager(DataManager):
+    langbb = CXXBB
+
+
+class CXXOrchestrator(Orchestrator):
+    langbb = CXXBB
+
+
 class CXXPrinter(BasePrinter, CXX11CodePrinter):
 
     _default_settings = {**BasePrinter._default_settings,

devito/passes/iet/languages/openmp.py

@@ -22,7 +22,8 @@
 
 __all__ = ['SimdOmpizer', 'Ompizer', 'OmpIteration', 'OmpRegion',
            'DeviceOmpizer', 'DeviceOmpIteration', 'DeviceOmpDataManager',
-           'OmpDataManager', 'OmpOrchestrator', 'DeviceOmpOrchestrator']
+           'OmpDataManager', 'OmpOrchestrator', 'DeviceOmpOrchestrator',
+           'CXXOmpDataManager', 'CXXOmpOrchestrator']
 
 
 class OmpRegion(ParallelBlock):
@@ -257,6 +258,10 @@ class OmpDataManager(DataManager):
     langbb = OmpBB
 
 
+class CXXOmpDataManager(DataManager):
+    langbb = CXXOmpBB
+
+
 class DeviceOmpDataManager(DeviceAwareDataManager):
     langbb = DeviceOmpBB
 
@@ -265,5 +270,9 @@ class OmpOrchestrator(Orchestrator):
     langbb = OmpBB
 
 
+class CXXOmpOrchestrator(Orchestrator):
+    langbb = CXXOmpBB
+
+
 class DeviceOmpOrchestrator(Orchestrator):
     langbb = DeviceOmpBB

devito/passes/iet/languages/targets.py

@@ -1,9 +1,10 @@
 from devito.passes.iet.languages.C import CDataManager, COrchestrator, CPrinter
-from devito.passes.iet.languages.CXX import CXXPrinter
+from devito.passes.iet.languages.CXX import CXXDataManager, CXXOrchestrator, CXXPrinter
 from devito.passes.iet.languages.openmp import (SimdOmpizer, Ompizer, DeviceOmpizer,
                                                 OmpDataManager, DeviceOmpDataManager,
                                                 OmpOrchestrator, DeviceOmpOrchestrator,
-                                                CXXSimdOmpizer, CXXOmpizer)
+                                                CXXSimdOmpizer, CXXOmpizer,
+                                                CXXOmpDataManager, CXXOmpOrchestrator)
 from devito.passes.iet.languages.openacc import (DeviceAccizer, DeviceAccDataManager,
                                                  AccOrchestrator, AccPrinter)
 from devito.passes.iet.instrument import instrument
@@ -36,8 +37,8 @@ class CTarget(Target):
 
 class CXXTarget(Target):
     Parizer = CXXSimdOmpizer
-    DataManager = CDataManager
-    Orchestrator = COrchestrator
+    DataManager = CXXDataManager
+    Orchestrator = CXXOrchestrator
     Printer = CXXPrinter
 
 
@@ -53,8 +54,8 @@ class COmpTarget(Target):
 
 class CXXOmpTarget(Target):
     Parizer = CXXOmpizer
-    DataManager = OmpDataManager
-    Orchestrator = OmpOrchestrator
+    DataManager = CXXOmpDataManager
+    Orchestrator = CXXOmpOrchestrator
     Printer = CXXPrinter