compiler: fix corner case cxx config

Author: mloubout

devito/ir/iet/visitors.py

@@ -423,7 +423,10 @@ def visit_PointerCast(self, o):
             if o.flat is None:
                 shape = ''.join(f"[{self.ccode(i)}]" for i in o.castshape)
                 rshape = f'(*){shape}'
-                lvalue = c.Value(cstr, f'(*{self._restrict_keyword} {v}){shape}')
+                if shape:
+                    lvalue = c.Value(cstr, f'(*{self._restrict_keyword} {v}){shape}')
+                else:
+                    lvalue = c.Value(cstr, f'*{self._restrict_keyword} {v}')
             else:
                 rshape = '*'
                 lvalue = c.Value(cstr, f'*{v}')

devito/operator/operator.py

@@ -1337,6 +1337,10 @@ def parse_kwargs(**kwargs):
 
     if not opt or isinstance(opt, str):
         mode, options = opt, {}
+        # Legacy Operator(..., opt='openmp', ...) support
+        if mode == 'openmp':
+            mode = 'noop'
+            options = {'openmp': True}
     elif isinstance(opt, tuple):
         if len(opt) == 0:
             mode, options = 'noop', {}
@@ -1353,7 +1357,7 @@ def parse_kwargs(**kwargs):
     # `opt`, deprecated kwargs
     kwopenmp = kwargs.get('openmp', options.get('openmp'))
     if kwopenmp is None:
-        openmp = kwargs.get('language', configuration['language']) == 'openmp'
+        openmp = 'openmp' in kwargs.get('language', configuration['language'])
     else:
         openmp = kwopenmp
 
@@ -1399,7 +1403,11 @@ def parse_kwargs(**kwargs):
         kwargs['language'] = language
     elif kwopenmp is not None:
         # Handle deprecated `openmp` kwarg for backward compatibility
-        kwargs['language'] = 'openmp' if openmp else 'C'
+        if configuration['language'] in ['C', 'CXX']:
+            lang = configuration['language']
+            kwargs['language'] = f'{lang}openmp' if openmp else lang
+        else:
+            kwargs['language'] = 'openmp' if openmp else 'C'
     else:
         kwargs['language'] = configuration['language']
 

devito/passes/iet/languages/CXX.py

@@ -93,7 +93,7 @@ class CXXPrinter(BasePrinter, CXX11CodePrinter):
     _func_literals = {}
     _func_prefix = {np.float32: 'f', np.float64: 'f'}
     _restrict_keyword = '__restrict'
-    _includes = ['stdlib.h', 'cmath', 'sys/time.h']
+    _includes = ['cstdlib', 'cmath', 'sys/time.h']
 
     # These cannot go through _print_xxx because they are classes not
     # instances

tests/test_cinterface.py

@@ -1,6 +1,6 @@
 import os
 
-from devito import Eq, Grid, Operator, TimeFunction
+from devito import Eq, Grid, Operator, TimeFunction, configuration
 from devito.types import Timer
 
 
@@ -15,11 +15,13 @@ def test_basic():
     op = Operator(eq, name=name)
 
     # Trigger the generation of a .c and a .h files
+    cpp = configuration['compiler']._cpp or 'CXX' in configuration['language']
     ccode, hcode = op.cinterface(force=True)
+    ec, eh = ('cpp', 'h') if cpp else ('c', 'h')
 
     dirname = op._compiler.get_jit_dir()
-    assert os.path.isfile(os.path.join(dirname, "%s.c" % name))
-    assert os.path.isfile(os.path.join(dirname, "%s.h" % name))
+    assert os.path.isfile(os.path.join(dirname, f"{name}.{ec}"))
+    assert os.path.isfile(os.path.join(dirname, f"{name}.{eh}"))
 
     ccode = str(ccode)
     hcode = str(hcode)