Skip to content

Commit 4326bf9

Browse files
committed
misc: More cleanup
1 parent bd4e7bc commit 4326bf9

6 files changed

Lines changed: 20 additions & 29 deletions

File tree

devito/passes/iet/linearization.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ def linearize_accesses(iet, key0, tracker=None):
239239
# E.g. `{x_fsz0 -> u_vec->size[1]}`
240240
defines = FindSymbols('defines').visit(iet)
241241
offers = filter_ordered(i for i in defines if key0(i.function))
242-
243242
instances = {}
244243
for i in offers:
245244
f = i.function

devito/petsc/equations.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111

1212
def lower_exprs_petsc(expressions, **kwargs):
13-
# Constrain EssentialBCs using PetscSection if specified to do so
13+
14+
# Process `ConstrainBC` equations
1415
expressions = constrain_essential_bcs(expressions, **kwargs)
1516

1617
return expressions

devito/petsc/iet/builder.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,16 +344,16 @@ def _setup(self):
344344

345345
class ConstrainedBCMixin:
346346
"""
347-
not really a mixin?
348347
"""
349348
def _create_dmda_calls(self, dmda):
350349
sobjs = self.solver_objs
351-
# mainctx = sobjs['mainctx']
352350
mainctx = sobjs['userctx']
353-
# TODO: CLEAN UP
351+
354352
dmda_create = self._create_dmda(dmda)
355-
# TODO: probs need to set the dm options prefix the same as snes?
356-
# don't hardcode this probs? - the dm needs to be specific to the solver as well
353+
354+
# TODO: likely need to set the dm options prefix the same as snes?
355+
# likely shouldn't hardcode this option like this.. (should be set in the options
356+
# callback)
357357
da_create_section = petsc_call(
358358
'PetscOptionsSetValue', [Null, String("-da_use_section"), Null]
359359
)

devito/petsc/iet/callbacks.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -646,20 +646,19 @@ def _create_initial_guess_body(self, body):
646646

647647
def _make_constrain_bc(self):
648648
"""
649-
To constrain essential boundary nodes, two additional callbacks are
650-
required - this function generates the two new efuncs `CountBCs` and
651-
`SetPointBCs`.
649+
To constrain essential boundary nodes, two additional callbacks are required.
650+
This method constructs the corresponding efuncs: `CountBCs` and `SetPointBCs`.
652651
"""
653652
increment_exprs = self.field_data.constrain_bc.increment_exprs
654653
point_bc_exprs = self.field_data.constrain_bc.point_bc_exprs
655654
sobjs = self.solver_objs
656655

657-
# Compile constrain `eqns` into an IET via recursive compilation
656+
# Compile `increment_exprs` into an IET via recursive compilation
658657
irs0, _ = self.rcompile(
659658
increment_exprs, options={'mpi': False}, sregistry=self.sregistry,
660659
concretize_mapper=self.concretize_mapper
661660
)
662-
# Compile constrain `eqns` into an IET via recursive compilation
661+
# Compile `point_bc_exprs` into an IET via recursive compilation
663662
irs1, _ = self.rcompile(
664663
point_bc_exprs, options={'mpi': False}, sregistry=self.sregistry,
665664
concretize_mapper=self.concretize_mapper

devito/petsc/types/dimension.py

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ def _arg_values(self, grid=None, **kwargs):
2020
grtkn = kwargs.get(self.subdim.rtkn.name, self.subdim.rtkn.value)
2121
# decomposition info
2222
decomp = dist.decomposition[self.subdim.parent]
23-
g_x_M = decomp.glb_max
24-
val = decomp.index_glb_to_loc_unsafe(g_x_M - grtkn)
25-
23+
glb_max = decomp.glb_max
24+
val = decomp.index_glb_to_loc_unsafe(glb_max - grtkn)
2625
return {self.name: int(val)}
2726

2827

@@ -43,12 +42,10 @@ def _arg_values(self, grid=None, **kwargs):
4342
dist = grid.distributor
4443
# global ltkn
4544
gltkn = kwargs.get(self.subdim.ltkn.name, self.subdim.ltkn.value)
46-
4745
# decomposition info
4846
decomp = dist.decomposition[self.subdim.parent]
49-
g_x_m = decomp.glb_min
50-
val = decomp.index_glb_to_loc_unsafe(g_x_m + gltkn)
51-
47+
glb_min = decomp.glb_min
48+
val = decomp.index_glb_to_loc_unsafe(glb_min + gltkn)
5249
return {self.name: int(val)}
5350

5451

@@ -68,18 +65,14 @@ def space_dim(self):
6865
def _arg_values(self, grid=None, **kwargs):
6966
dist = grid.distributor
7067
decomp = dist.decomposition[self.space_dim]
71-
# obvs not just x etc..
72-
g_x_M = decomp.glb_max
73-
74-
val = decomp.index_glb_to_loc_unsafe(g_x_M)
75-
68+
glb_max = decomp.glb_max
69+
val = decomp.index_glb_to_loc_unsafe(glb_max)
7670
return {self.name: int(val)}
7771

7872

7973
class SpaceDimMin(Thickness):
8074
"""
8175
"""
82-
8376
def __init_finalize__(self, *args, **kwargs):
8477
self._space_dim = kwargs.pop('space_dim')
8578
self._dtype = self._space_dim.dtype
@@ -93,8 +86,6 @@ def space_dim(self):
9386
def _arg_values(self, grid=None, **kwargs):
9487
dist = grid.distributor
9588
decomp = dist.decomposition[self.space_dim]
96-
# Obvs not just x etc..
97-
g_x_m = decomp.glb_min
98-
val = decomp.index_glb_to_loc_unsafe(g_x_m)
99-
89+
glb_min = decomp.glb_min
90+
val = decomp.index_glb_to_loc_unsafe(glb_min)
10091
return {self.name: int(val)}

devito/types/misc.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ def bind(self, pname):
153153
@property
154154
def linear_index(self):
155155
"""
156+
TODO: Add tests
156157
"""
157158
f = self.function
158159
strides_map = self.strides_map

0 commit comments

Comments
 (0)