Skip to content

Commit 98880f1

Browse files
committed
misc: Isort and flake8 petsc branch since merge with main
1 parent d0d0486 commit 98880f1

47 files changed

Lines changed: 207 additions & 203 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/pytest-core-mpi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ on:
1212
push:
1313
branches:
1414
- main
15+
- petsc
1516
pull_request:
1617
branches:
1718
- main
19+
- petsc
1820

1921
jobs:
2022
test-mpi-basic:

.github/workflows/tutorials.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ on:
1212
push:
1313
branches:
1414
- main
15+
- petsc
1516
pull_request:
1617
branches:
1718
- main
19+
- petsc
1820

1921
jobs:
2022
tutorials-basic:

conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
from devito.ir.iet import (
1818
FindNodes, FindSymbols, Iteration, ParallelBlock, retrieve_iteration_tree
1919
)
20-
from devito.tools import as_tuple
2120
from devito.petsc.config import PetscOSError, get_petsc_dir
21+
from devito.tools import as_tuple
2222

2323
try:
2424
from mpi4py import MPI # noqa

devito/core/cpu.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010
)
1111
from devito.passes.equations import collect_derivatives
1212
from devito.passes.iet import (
13-
COmpTarget, CTarget, CXXOmpTarget, CXXTarget, avoid_denormals, check_stability,
14-
hoist_prodders, linearize, mpiize, relax_incr_dimensions, PetscTarget
13+
COmpTarget, CTarget, CXXOmpTarget, CXXTarget, PetscTarget, avoid_denormals,
14+
check_stability, hoist_prodders, linearize, mpiize, relax_incr_dimensions
1515
)
16-
from devito.tools import timed_pass
17-
1816
from devito.petsc.iet.passes import lower_petsc_symbols
17+
from devito.tools import timed_pass
1918

2019
__all__ = [
2120
'Cpu64AdvCOperator',

devito/ir/iet/algorithms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
Section, Switch, SyncSpot
66
)
77
from devito.ir.support import GuardCaseSwitch, GuardSwitch
8-
from devito.tools import as_mapper, timed_pass
9-
from devito.petsc.types import MetaData
108
from devito.petsc.iet.nodes import petsc_iet_mapper
9+
from devito.petsc.types import MetaData
10+
from devito.tools import as_mapper, timed_pass
1111

1212
__all__ = ['iet_build']
1313

devito/ir/iet/nodes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
Signer, as_tuple, ctypes_to_cstr, filter_ordered, filter_sorted, flatten
2424
)
2525
from devito.types.basic import AbstractFunction, AbstractSymbol, Basic, Indexed, Symbol
26-
from devito.types.object import AbstractObject, LocalObject, LocalCompositeObject
26+
from devito.types.object import AbstractObject, LocalCompositeObject, LocalObject
2727

2828
__all__ = [
2929
'AugmentedExpression',

devito/ir/iet/visitors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
is_external_ctype, sorted_priority
3030
)
3131
from devito.types import (
32-
ArrayObject, CompositeObject, DeviceMap, Dimension, IndexedData, Pointer,
33-
LocalCompositeObject
32+
ArrayObject, CompositeObject, DeviceMap, Dimension, IndexedData, LocalCompositeObject,
33+
Pointer
3434
)
3535
from devito.types.basic import AbstractFunction, AbstractSymbol, Basic
3636

devito/operator/operator.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
Graph, error_mapper, generate_implicit, generate_macros, is_on_device, lower_dtypes,
3636
lower_index_derivatives, minimize_symbols, optimize_pows, unevaluate
3737
)
38+
from devito.petsc.clusters import petsc_preprocess
39+
from devito.petsc.equations import lower_exprs_petsc
40+
from devito.petsc.iet.passes import lower_petsc
3841
from devito.symbolics import estimate_cost, subs_op_args
3942
from devito.tools import (
4043
DAG, CacheInstances, MemoryEstimate, OrderedSet, ReducerMap, Signer, as_mapper,
@@ -43,9 +46,6 @@
4346
)
4447
from devito.types import Buffer, Evaluable, device_layer, disk_layer, host_layer
4548
from devito.types.dimension import Thickness
46-
from devito.petsc.iet.passes import lower_petsc
47-
from devito.petsc.clusters import petsc_preprocess
48-
from devito.petsc.equations import lower_exprs_petsc
4949
from devito.warnings import warn
5050

5151
__all__ = ['Operator']

devito/operator/profiling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
from devito.logger import warning
1717
from devito.mpi import MPI
1818
from devito.parameters import configuration
19+
from devito.petsc.logging import PetscSummary
1920
from devito.symbolics import subs_op_args
2021
from devito.tools import DefaultOrderedDict, flatten
21-
from devito.petsc.logging import PetscSummary
2222

2323
__all__ = ['create_profile']
2424

devito/passes/iet/engine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
Temp, ThreadArray, Wildcard
2424
)
2525
from devito.types.args import ArgProvider
26+
from devito.types.array import ArrayBasic
2627
from devito.types.dense import DiscreteFunction
2728
from devito.types.dimension import AbstractIncrDimension, BlockDimension
28-
from devito.types.array import ArrayBasic
2929

3030
__all__ = ['Graph', 'iet_pass', 'iet_visit']
3131

0 commit comments

Comments
 (0)