compiler: Edit _C_ctype property of PETScFunction to utilise CustomDtype

devito/types/petsc.py

@@ -1,8 +1,6 @@
-from devito.tools import (dtype_to_petsctype, CustomDtype,
-                          dtype_to_ctype)
+from devito.tools import dtype_to_petsctype, CustomDtype
 from devito.types import LocalObject
 from devito.types.array import ArrayBasic
-from ctypes import POINTER
 import numpy as np
 
 
@@ -77,11 +75,9 @@ def __dtype_setup__(cls, **kwargs):
     @property
     def _C_ctype(self):
         petsc_type = dtype_to_petsctype(self.dtype)
-        ctype = dtype_to_ctype(self.dtype)
-        r = type(petsc_type, (ctype,), {})
-        for n in range(len(self.dimensions)):
-            r = POINTER(r)
-        return r
+        modifier = '*' * len(self.dimensions)
+        customtype = CustomDtype(petsc_type, modifier=modifier)
+        return customtype
 
     @property
     def _C_name(self):

tests/test_petsc.py

@@ -57,9 +57,9 @@ def test_petsc_functions():
 
     expr = DummyExpr(ptr0.indexed[x, y], ptr1.indexed[x, y] + 1)
 
-    assert str(defn0) == 'PetscScalar **restrict ptr0;'
-    assert str(defn1) == 'const PetscScalar **restrict ptr1;'
-    assert str(defn2) == 'const PetscScalar **restrict ptr2;'
-    assert str(defn3) == 'PetscInt **restrict ptr3;'
-    assert str(defn4) == 'const PetscInt **restrict ptr4;'
+    assert str(defn0) == 'PetscScalar**restrict ptr0;'
+    assert str(defn1) == 'const PetscScalar**restrict ptr1;'
+    assert str(defn2) == 'const PetscScalar**restrict ptr2;'
+    assert str(defn3) == 'PetscInt**restrict ptr3;'
+    assert str(defn4) == 'const PetscInt**restrict ptr4;'
     assert str(expr) == 'ptr0[x][y] = ptr1[x][y] + 1;'