Skip to content

Commit 5bb4515

Browse files
committed
misc: Clean up internals
1 parent 6b6fc00 commit 5bb4515

8 files changed

Lines changed: 25 additions & 19 deletions

File tree

devito/petsc/iet/callback_builder.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
from collections import OrderedDict
22

3-
from devito.ir.iet import (Call, FindSymbols, List, Uxreplace, CallableBody,
4-
Dereference, DummyExpr, BlankLine, Callable, Iteration,
5-
PointerCast, Definition)
3+
from devito.ir.iet import (
4+
Call, FindSymbols, List, Uxreplace, CallableBody, Dereference, DummyExpr,
5+
BlankLine, Callable, Iteration, PointerCast, Definition
6+
)
67
from devito.symbolics import (
78
Byref, FieldFromPointer, IntDiv, Deref, Mod, String, Null, VOID
89
)

devito/petsc/iet/object_builder.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
from devito.types import Symbol
55
from devito.tools import frozendict
66

7-
from devito.petsc.types import (PetscBundle, DM, Mat, CallbackVec, Vec,
8-
KSP, PC, SNES, PetscInt, StartPtr, PointerIS, PointerDM,
9-
VecScatter, JacobianStruct, SubMatrixStruct,
10-
CallbackDM, PetscMPIInt, PetscErrorCode, PointerMat,
11-
MatReuse, CallbackPointerDM, CallbackPointerIS,
12-
CallbackMat, DummyArg, NofSubMats)
7+
from devito.petsc.types import (
8+
PetscBundle, DM, Mat, CallbackVec, Vec, KSP, PC, SNES, PetscInt, StartPtr,
9+
PointerIS, PointerDM, VecScatter, JacobianStruct, SubMatrixStruct, CallbackDM,
10+
PetscMPIInt, PetscErrorCode, PointerMat, MatReuse, CallbackPointerDM,
11+
CallbackPointerIS, CallbackMat, DummyArg, NofSubMats
12+
)
1313

1414

1515
class BaseObjectBuilder:

devito/petsc/iet/run_solver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from devito.ir.iet import (
44
BlankLine, FindNodes, retrieve_iteration_tree, filter_iterations
55
)
6-
from devito.symbolics import (Byref, Null)
6+
from devito.symbolics import Byref, Null
77

88
from devito.petsc.iet.nodes import PetscMetaData, petsc_call
99
from devito.petsc.types.modes import InsertMode, ScatterMode

devito/petsc/initialize.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from devito import Operator, switchconfig
77
from devito.types import Symbol
88
from devito.types.equation import PetscEq
9+
910
from devito.petsc.types import Initialize, Finalize
1011

1112
global _petsc_initialized

devito/petsc/solve.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
from devito.operations.solve import eval_time_derivatives
55
from devito.symbolics import retrieve_functions, retrieve_dimensions
66

7-
from devito.petsc.types import (LinearSolverMetaData, PETScArray, DMDALocalInfo,
8-
FieldData, MultipleFieldData, Jacobian, Residual,
9-
MixedResidual, MixedJacobian, InitialGuess)
7+
from devito.petsc.types import (
8+
LinearSolverMetaData, PETScArray, DMDALocalInfo, FieldData, MultipleFieldData,
9+
Jacobian, Residual, MixedResidual, MixedJacobian, InitialGuess
10+
)
1011
from devito.petsc.types.equation import EssentialBC
11-
from devito.petsc.solver_parameters import (linear_solver_parameters,
12-
format_options_prefix)
12+
from devito.petsc.solver_parameters import (
13+
linear_solver_parameters, format_options_prefix
14+
)
1315

1416

1517
__all__ = ['PETScSolve']

devito/petsc/solver_parameters.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
from petsctools import flatten_parameters
21
import itertools
32

3+
from petsctools import flatten_parameters
4+
45

56
# NOTE: Will be extended, the default preconditioner is not going to be 'none'
67
base_solve_defaults = {

devito/petsc/types/modes.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
class InsertMode:
32
"""
43
How the entries are combined with the current values in the vectors or matrices.

devito/petsc/types/object.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
from ctypes import POINTER, c_char
22

33
from devito.tools import CustomDtype, dtype_to_ctype, as_tuple, CustomIntType
4-
from devito.types import (LocalObject, LocalCompositeObject, ModuloDimension,
5-
TimeDimension, ArrayObject, CustomDimension, Scalar)
4+
from devito.types import (
5+
LocalObject, LocalCompositeObject, ModuloDimension, TimeDimension, ArrayObject,
6+
CustomDimension, Scalar
7+
)
68
from devito.symbolics import Byref, cast
79
from devito.types.basic import DataSymbol, LocalType
810

0 commit comments

Comments
 (0)