compiler: add missing C targets

Author: mloubout

devito/core/__init__.py

@@ -6,7 +6,8 @@
     Cpu64CustomOperator, Cpu64CustomCXXOperator,
     Cpu64CXXNoopCOperator, Cpu64CXXNoopOmpOperator,
     Cpu64AdvCXXOperator, Cpu64AdvCXXOmpOperator,
-    Cpu64FsgCXXOperator, Cpu64FsgCXXOmpOperator
+    Cpu64FsgCXXOperator, Cpu64FsgCXXOmpOperator,
+    Cpu64CustomCXXOmpOperator, Cpu64CustomCOperator
 )
 from devito.core.intel import (
     Intel64AdvCOperator, Intel64AdvOmpOperator,
@@ -33,11 +34,11 @@
 from devito.operator.registry import operator_registry
 
 # Register CPU Operators
-operator_registry.add(Cpu64CustomOperator, Cpu64, 'custom', 'C')
+operator_registry.add(Cpu64CustomCOperator, Cpu64, 'custom', 'C')
 operator_registry.add(Cpu64CustomOperator, Cpu64, 'custom', 'openmp')
 operator_registry.add(Cpu64CustomOperator, Cpu64, 'custom', 'Copenmp')
 operator_registry.add(Cpu64CustomCXXOperator, Cpu64, 'custom', 'CXX')
-operator_registry.add(Cpu64CustomCXXOperator, Cpu64, 'custom', 'CXXopenmp')
+operator_registry.add(Cpu64CustomCXXOmpOperator, Cpu64, 'custom', 'CXXopenmp')
 
 operator_registry.add(Cpu64NoopCOperator, Cpu64, 'noop', 'C')
 operator_registry.add(Cpu64NoopOmpOperator, Cpu64, 'noop', 'openmp')

devito/core/cpu.py

@@ -321,11 +321,24 @@ def _make_iet_passes_mapper(cls, **kwargs):
     assert not (set(_known_passes) & set(_known_passes_disabled))
 
 
-class Cpu64CustomCXXOperator(Cpu64CustomOperator):
+class Cpu64CustomCXXOmpOperator(Cpu64CustomOperator):
 
     _Target = CXXOmpTarget
     LINEARIZE = True
 
+
+class Cpu64CustomCOperator(Cpu64CustomOperator):
+
+    _Target = CTarget
+    LINEARIZE = False
+
+
+class Cpu64CustomCXXOperator(Cpu64CustomOperator):
+
+    _Target = CXXTarget
+    LINEARIZE = True
+
+
 # Language level
 
 

devito/operator/operator.py

@@ -1563,7 +1563,7 @@ def parse_kwargs(**kwargs):
         # Legacy Operator(..., opt='openmp', ...) support
         if mode == 'openmp':
             mode = 'noop'
-            options = {'openmp': True}
+            options = {'openmp': True}  
     elif isinstance(opt, tuple):
         if len(opt) == 0:
             mode, options = 'noop', {}
@@ -1580,7 +1580,11 @@ def parse_kwargs(**kwargs):
     # `opt`, deprecated kwargs
     kwopenmp = kwargs.get('openmp', options.get('openmp'))
     if kwopenmp is None:
-        openmp = 'openmp' in kwargs.get('language', configuration['language'])
+        if 'openmp' in mode:
+            openmp = True
+            kwopenmp = 'openmp'
+        else:
+            openmp = 'openmp' in kwargs.get('language', configuration['language'])
     else:
         openmp = kwopenmp