compiler: add missing Copenmp registry entries

Author: mloubout

devito/core/__init__.py

@@ -33,41 +33,49 @@
 # Register CPU Operators
 operator_registry.add(Cpu64CustomOperator, 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(Cpu64NoopCOperator, Cpu64, 'noop', 'C')
 operator_registry.add(Cpu64NoopOmpOperator, Cpu64, 'noop', 'openmp')
+operator_registry.add(Cpu64NoopOmpOperator, Cpu64, 'noop', 'Copenmp')
 operator_registry.add(Cpu64CXXNoopCOperator, Cpu64, 'noop', 'CXX')
 operator_registry.add(Cpu64CXXNoopOmpOperator, Cpu64, 'noop', 'CXXopenmp')
 
 operator_registry.add(Cpu64AdvCOperator, Cpu64, 'advanced', 'C')
 operator_registry.add(Cpu64AdvOmpOperator, Cpu64, 'advanced', 'openmp')
+operator_registry.add(Cpu64AdvOmpOperator, Cpu64, 'advanced', 'Copenmp')
 operator_registry.add(Cpu64AdvCXXOperator, Cpu64, 'advanced', 'CXX')
 operator_registry.add(Cpu64AdvCXXOmpOperator, Cpu64, 'advanced', 'CXXopenmp')
 
 operator_registry.add(Cpu64FsgCOperator, Cpu64, 'advanced-fsg', 'C')
 operator_registry.add(Cpu64FsgOmpOperator, Cpu64, 'advanced-fsg', 'openmp')
+operator_registry.add(Cpu64FsgOmpOperator, Cpu64, 'advanced-fsg', 'Copenmp')
 operator_registry.add(Cpu64FsgCXXOperator, Cpu64, 'advanced-fsg', 'CXX')
 operator_registry.add(Cpu64FsgCXXOmpOperator, Cpu64, 'advanced-fsg', 'CXXopenmp')
 
 operator_registry.add(Intel64AdvCOperator, Intel64, 'advanced', 'C')
 operator_registry.add(Intel64AdvOmpOperator, Intel64, 'advanced', 'openmp')
+operator_registry.add(Intel64AdvOmpOperator, Intel64, 'advanced', 'Copenmp')
 operator_registry.add(Intel64CXXAdvCOperator, Intel64, 'advanced', 'CXX')
 operator_registry.add(Intel64AdvCXXOmpOperator, Intel64, 'advanced', 'CXXopenmp')
 
 operator_registry.add(Intel64FsgCOperator, Intel64, 'advanced-fsg', 'C')
 operator_registry.add(Intel64FsgOmpOperator, Intel64, 'advanced-fsg', 'openmp')
+operator_registry.add(Intel64FsgOmpOperator, Intel64, 'advanced-fsg', 'Copenmp')
 operator_registry.add(Intel64FsgCXXOperator, Intel64, 'advanced-fsg', 'CXX')
 operator_registry.add(Intel64FsgCXXOmpOperator, Intel64, 'advanced-fsg', 'CXXopenmp')
 
 operator_registry.add(ArmAdvCOperator, Arm, 'advanced', 'C')
 operator_registry.add(ArmAdvOmpOperator, Arm, 'advanced', 'openmp')
+operator_registry.add(ArmAdvOmpOperator, Arm, 'advanced', 'Copenmp')
 operator_registry.add(ArmAdvCXXOperator, Arm, 'advanced', 'CXX')
 operator_registry.add(ArmAdvCXXOmpOperator, Arm, 'advanced', 'CXXopenmp')
 
 operator_registry.add(PowerAdvCOperator, Power, 'advanced', 'C')
 operator_registry.add(PowerAdvOmpOperator, Power, 'advanced', 'openmp')
+operator_registry.add(PowerAdvOmpOperator, Power, 'advanced', 'Copenmp')
 operator_registry.add(PowerCXXAdvCOperator, Power, 'advanced', 'CXX')
 operator_registry.add(PowerAdvCXXOmpOperator, Power, 'advanced', 'CXXopenmp')
 

devito/operator/operator.py

@@ -1403,11 +1403,9 @@ def parse_kwargs(**kwargs):
         kwargs['language'] = language
     elif kwopenmp is not None:
         # Handle deprecated `openmp` kwarg for backward compatibility
-        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'
+        omp = {'C': 'openmp', 'CXX': 'CXXopenmp'}.get(configuration['language'],
+                                                      'openmp')
+        kwargs['language'] = omp if openmp else 'C'
     else:
         kwargs['language'] = configuration['language']