compiler: Some progress with setpointbc petsc callback

Author: ZoeLeibowitz

devito/ir/cgen/printer.py

@@ -17,7 +17,8 @@
 from devito.arch.compiler import AOMPCompiler
 from devito.symbolics.inspection import has_integer_args, sympy_dtype
 from devito.symbolics.queries import q_leaf
-from devito.types.basic import AbstractFunction, PostIncrementIndex
+from devito.types.basic import AbstractFunction
+from devito.types.misc import PostIncrementIndex
 from devito.tools import ctypes_to_cstr, dtype_to_ctype, ctypes_vector_mapper
 
 __all__ = ['BasePrinter', 'ccode']

devito/petsc/iet/callbacks.py

@@ -9,6 +9,7 @@
 )
 from devito.symbolics.unevaluation import Mul
 from devito.types.basic import AbstractFunction
+from devito.types.misc import PostIncrementIndex
 from devito.types import Dimension, Temp, TempArray
 from devito.tools import filter_ordered
 from devito.passes.iet.linearization import linearize_accesses
@@ -694,7 +695,6 @@ def _create_count_bc_body(self, body):
         dmda = sobjs['callbackdm']
         ctx = objs['dummyctx']
 
-
         body = self.time_dependence.uxreplace_time(body)
 
         fields = get_user_struct_fields(body)
@@ -785,10 +785,13 @@ def _create_set_point_bc_body(self, body):
 
         comm = sobjs['comm']
         is_create_general = petsc_call(
-            'ISCreateGeneral', [comm, sobjs['numBC'], sobjs['bcPointsArr'], 'PETSC_OWN_POINTER']
+            'ISCreateGeneral', [comm, sobjs['numBC'], sobjs['bcPointsArr'], 'PETSC_OWN_POINTER', Byref(sobjs['bcPointsIS'])]
         )
 
-        body = body._rebuild(body=body.body + (is_create_general,))
+        malloc = petsc_call(
+            'PetscMalloc1', [1, sobjs['bcPoints']]
+        )
+        body = body._rebuild(body=body.body + (is_create_general,malloc))
 
         stacks = (
             dm_get_local_info,
@@ -1300,7 +1303,7 @@ def zero_vector(vec):
 def get_user_struct_fields(iet):
     fields = [f.function for f in FindSymbols('basics').visit(iet)]
     from devito.types.basic import LocalType
-    avoid = (Temp, TempArray, LocalType)
+    avoid = (Temp, TempArray, LocalType, PostIncrementIndex)
     fields = [f for f in fields if not isinstance(f.function, avoid)]
     fields = [
         f for f in fields if not (f.is_Dimension and not (f.is_Time or f.is_Modulo))

devito/petsc/iet/type_builder.py

@@ -2,14 +2,15 @@
 
 from devito.symbolics import String
 from devito.types import Symbol
+from devito.types.misc import PostIncrementIndex
 from devito.tools import frozendict
 
 from devito.petsc.types import (
     PetscBundle, DM, Mat, CallbackVec, Vec, KSP, PC, SNES, PetscInt, StartPtr,
     PointerIS, PointerDM, VecScatter, JacobianStruct, SubMatrixStruct, CallbackDM,
     PetscMPIInt, PetscErrorCode, PointerMat, MatReuse, CallbackPointerDM,
     CallbackPointerIS, CallbackMat, DummyArg, NofSubMats, PetscSectionGlobal, PetscSectionLocal, PetscSF,
-    PetscIntPtr, CallbackPetscInt, CallbackPointerPetscInt, PostIncrementIndex
+    PetscIntPtr, CallbackPetscInt, CallbackPointerPetscInt, SingleIS
 )
 
 
@@ -225,6 +226,9 @@ def _extend_build(self, base_dict):
         base_dict['k_iter'] = PostIncrementIndex(
             name='k_iter', initvalue=0
         )
+        # change names etc..
+        base_dict['bcPointsIS'] = SingleIS(name='bcPointsIS')
+        base_dict['bcPoints'] = PointerIS(name='bcPoints')
         return base_dict
 
 

devito/petsc/types/object.py

@@ -7,7 +7,7 @@
     CustomDimension, Scalar
 )
 from devito.symbolics import Byref, cast
-from devito.types.basic import DataSymbol, LocalType, PostIncrementIndex
+from devito.types.basic import DataSymbol, LocalType
 
 from devito.petsc.iet.nodes import petsc_call
 
@@ -320,10 +320,6 @@ def dtype(self):
         return CustomDtype('IS', modifier=' *')
 
 
-class PetscPostIncrementIndex(PostIncrementIndex):
-    pass
-    
-
 class CallbackPointerPetscInt(PETScArrayObject):
     """
     """

devito/types/basic.py

@@ -1927,7 +1927,3 @@ def _mem_internal_lazy(self):
     to impose pass-by-reference semantics.
     """
     _C_modifier = None
-
-
-class PostIncrementIndex(DataSymbol):
-    pass

devito/types/misc.py

@@ -172,6 +172,8 @@ def linear_index(self):
 
 
 # the special postindex type sould live in this file i think
+class PostIncrementIndex(Symbol):
+    pass
 
 
 class Global(Symbol):