rffraq

Author: ZoeLeibowitz

devito/passes/iet/linearization.py

@@ -212,7 +212,7 @@ def linearize_accesses(iet, key0, tracker=None):
     indexeds = FindSymbols('indexeds').visit(iet)
     needs = filter_ordered(i.function for i in indexeds if key0(i.function))
     needs = sorted(needs, key=lambda f: len(f.dimensions), reverse=True)
-    # from IPython import embed; embed()
+
     # Update unique sizes and strides
     tracker.update(needs)
 
@@ -230,16 +230,17 @@ def linearize_accesses(iet, key0, tracker=None):
             continue
 
         v = generate_linearization(f, i, tracker)
-        # from IPython import embed; embed()
+
         if v is not None:
             subs[i] = v
-    # from IPython import embed; embed()
+
     iet = Uxreplace(subs).visit(iet)
 
     # 2) What `iet` *offers*
     # E.g. `{x_fsz0 -> u_vec->size[1]}`
     defines = FindSymbols('defines').visit(iet)
     offers = filter_ordered(i for i in defines if key0(i.function))
+    # from IPython import embed; embed()
     instances = {}
     for i in offers:
         f = i.function
@@ -294,7 +295,7 @@ def linearize_accesses(iet, key0, tracker=None):
     if stmts:
         body = iet.body._rebuild(strides=stmts)
         iet = iet._rebuild(body=body)
-
+    # from IPython import embed; embed()
     return iet
 
 

devito/petsc/iet/builder.py

@@ -40,6 +40,13 @@ def snes_ctx(self):
     def _setup(self):
         sobjs = self.solver_objs
         dmda = sobjs['dmda']
+        mainctx = sobjs['userctx']
+
+        call_struct_callback = petsc_call(
+            self.callback_builder.user_struct_callback.name, [Byref(mainctx)]
+        )
+
+        calls_set_app_ctx = petsc_call('DMSetApplicationContext', [dmda, Byref(mainctx)])
 
         snes_create = petsc_call('SNESCreate', [sobjs['comm'], Byref(sobjs['snes'])])
 
@@ -105,18 +112,12 @@ def _setup(self):
 
         dmda_calls = self._create_dmda_calls(dmda)
 
-        mainctx = sobjs['userctx']
-
-        call_struct_callback = petsc_call(
-            self.callback_builder.user_struct_callback.name, [Byref(mainctx)]
-        )
-
         # TODO: maybe don't need to explictly set this
         mat_set_dm = petsc_call('MatSetDM', [sobjs['Jac'], dmda])
 
-        calls_set_app_ctx = petsc_call('DMSetApplicationContext', [dmda, Byref(mainctx)])
-
         base_setup = dmda_calls + (
+            call_struct_callback,
+            calls_set_app_ctx,
             snes_create,
             snes_options_prefix,
             set_options,
@@ -131,9 +132,7 @@ def _setup(self):
             matvec_operation,
             formfunc_operation,
             snes_set_options,
-            call_struct_callback,
             mat_set_dm,
-            calls_set_app_ctx,
             BlankLine
         )
         extended_setup = self._extend_setup()
@@ -257,8 +256,6 @@ def _setup(self):
         # TODO: maybe don't need to explictly set this
         mat_set_dm = petsc_call('MatSetDM', [sobjs['Jac'], dmda])
 
-        calls_set_app_ctx = petsc_call('DMSetApplicationContext', [dmda, Byref(mainctx)])
-
         create_field_decomp = petsc_call(
             'DMCreateFieldDecomposition',
             [dmda, Byref(sobjs['nfields']), Null, Byref(sobjs['fields']),

devito/petsc/iet/callbacks.py

@@ -12,7 +12,7 @@
 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
+from devito.passes.iet.linearization import linearize_accesses, Stride
 
 from devito.petsc.iet.nodes import PETScCallable, MatShellSetOp, petsc_call
 from devito.petsc.types import DMCast, MainUserStruct, CallbackUserStruct
@@ -771,6 +771,7 @@ def _create_set_point_bc_body(self, body):
         findexeds = FindSymbols('indexeds').visit(body)
         mapper_findexeds = {i: i.linear_index for i in findexeds}
 
+
         # from IPython import embed; embed()
 
         # findexeds = 
@@ -791,7 +792,13 @@ def _create_set_point_bc_body(self, body):
         malloc = petsc_call(
             'PetscMalloc1', [1, sobjs['bcPoints']]
         )
-        body = body._rebuild(body=body.body + (is_create_general,malloc))
+
+        dummy_expr = DummyExpr(sobjs['bcPoints'].indexed[0], sobjs['bcPointsIS'])
+
+        set_point_bc = petsc_call(
+            'DMDASetPointBC', [dmda, 1, sobjs['bcPoints'], Null]
+        )
+        body = body._rebuild(body=body.body + (is_create_general, malloc, dummy_expr, set_point_bc))
 
         stacks = (
             dm_get_local_info,
@@ -811,7 +818,6 @@ def _create_set_point_bc_body(self, body):
         # Replace non-function data with pointer to data in struct
         subs = {i._C_symbol: FieldFromPointer(i._C_symbol, ctx) for
                 i in fields if not isinstance(i.function, AbstractFunction)}
-        
 
         subs[Counter._C_symbol] = sobjs['bcPointsArr'].indexed[sobjs['k_iter']]
 
@@ -1303,7 +1309,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, PostIncrementIndex)
+    avoid = (Temp, TempArray, LocalType, PostIncrementIndex, Stride)
     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/types/object.py

@@ -12,6 +12,9 @@
 from devito.petsc.iet.nodes import petsc_call
 
 
+# TODO: unnecessary use of "CALLBACK" types - just create a simple way of destroying or not destroying a certain type
+
+
 class PetscMixin:
     @property
     def _C_free_priority(self):
@@ -208,6 +211,12 @@ class SingleIS(PetscObject):
     dtype = CustomDtype('IS')
 
 
+# class SingleISDestroy(SingleIS):
+#     @property
+#     def _C_free(self):
+#         return petsc_call('ISDestroy', [Byref(self.function)])
+ 
+
 class PetscSectionGlobal(PetscObject):
     dtype = CustomDtype('PetscSection')