Skip to content

Commit 1ec3c7f

Browse files
committed
lint: Re-sort all imports with new isort rules
1 parent 2ccf2ab commit 1ec3c7f

File tree

187 files changed

+987
-870
lines changed

Some content is hidden

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

187 files changed

+987
-870
lines changed

auto_lint.sh

Lines changed: 0 additions & 22 deletions
This file was deleted.

benchmarks/regression/benchmarks/arguments.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
from devito import Grid, Function, TimeFunction, SparseTimeFunction, Eq, Operator
2-
1+
from devito import Eq, Function, Grid, Operator, SparseTimeFunction, TimeFunction
32

43
# ASV config
54
repeat = 10

benchmarks/regression/benchmarks/codegen.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from examples.seismic.tti.tti_example import tti_setup
22

3-
43
repeat = 3
54

65

benchmarks/regression/benchmarks/simple_operators.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
from devito import Grid, Function, TimeFunction, Eq, Operator, gaussian_smooth, norm
2-
1+
from devito import Eq, Function, Grid, Operator, TimeFunction, gaussian_smooth, norm
32

43
# ASV config
54
repeat = 3

benchmarks/user/advisor/roofline.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,18 @@
66
77
This module has been partly extracted from the examples directory of Intel Advisor 2018.
88
"""
9-
import click
109
import json
1110
import math
11+
import os
12+
import sys
13+
14+
import click
1215
import matplotlib
13-
from matplotlib.ticker import ScalarFormatter
1416
import matplotlib.pyplot as plt # noqa
15-
1617
import numpy as np
1718
import pandas as pd
18-
import sys
19-
import os
20-
2119
from advisor_logging import check, err, log
22-
20+
from matplotlib.ticker import ScalarFormatter
2321

2422
try:
2523
import advisor

benchmarks/user/advisor/run_advisor.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
import click
21
import datetime
32
import logging
43
import os
54
import sys
6-
75
from pathlib import Path
8-
from subprocess import check_output, PIPE, Popen
6+
from subprocess import PIPE, Popen, check_output
97
from tempfile import gettempdir, mkdtemp
108

11-
from advisor_logging import check, log, progress, log_process
9+
import click
10+
from advisor_logging import check, log, log_process, progress
1211

1312

1413
@click.command()

benchmarks/user/benchmark.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
import numpy as np
2-
import click
31
import os
42

5-
from devito import Device, configuration, info, warning, set_log_level, switchconfig, norm
3+
import click
4+
import numpy as np
5+
6+
from devito import Device, configuration, info, norm, set_log_level, switchconfig, warning
67
from devito.arch.compiler import IntelCompiler
78
from devito.mpi import MPI
89
from devito.operator.profiling import PerformanceSummary
910
from devito.tools import all_equal, as_tuple, sweep
1011
from devito.types.dense import DiscreteFunction
11-
12-
from examples.seismic.acoustic.acoustic_example import run as acoustic_run, acoustic_setup
13-
from examples.seismic.tti.tti_example import run as tti_run, tti_setup
14-
from examples.seismic.elastic.elastic_example import run as elastic_run, elastic_setup
15-
from examples.seismic.self_adjoint.example_iso import run as acoustic_sa_run, \
16-
acoustic_sa_setup
17-
from examples.seismic.viscoelastic.viscoelastic_example import run as viscoelastic_run, \
18-
viscoelastic_setup
19-
12+
from examples.seismic.acoustic.acoustic_example import acoustic_setup
13+
from examples.seismic.acoustic.acoustic_example import run as acoustic_run
14+
from examples.seismic.elastic.elastic_example import elastic_setup
15+
from examples.seismic.elastic.elastic_example import run as elastic_run
16+
from examples.seismic.self_adjoint.example_iso import acoustic_sa_setup
17+
from examples.seismic.self_adjoint.example_iso import run as acoustic_sa_run
18+
from examples.seismic.tti.tti_example import run as tti_run
19+
from examples.seismic.tti.tti_example import tti_setup
20+
from examples.seismic.viscoelastic.viscoelastic_example import run as viscoelastic_run
21+
from examples.seismic.viscoelastic.viscoelastic_example import viscoelastic_setup
2022

2123
model_type = {
2224
'viscoelastic': {

conftest.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66
from sympy import Add
77
from sympy.printing import sstr
88

9-
from devito import Eq, configuration, Revolver # noqa
9+
from devito import Eq, Revolver, configuration # noqa
10+
from devito.arch import Arm, Cpu64, Device, get_advisor_path, sniff_mpi_distro
11+
from devito.arch.compiler import (
12+
IntelCompiler, NvidiaCompiler, OneapiCompiler, compiler_registry
13+
)
1014
from devito.checkpointing import NoopRevolver
1115
from devito.finite_differences.differentiable import EvalDerivative
12-
from devito.arch import Cpu64, Device, sniff_mpi_distro, Arm, get_advisor_path
13-
from devito.arch.compiler import (compiler_registry, IntelCompiler, OneapiCompiler,
14-
NvidiaCompiler)
15-
from devito.ir.iet import (FindNodes, FindSymbols, Iteration, ParallelBlock,
16-
retrieve_iteration_tree)
16+
from devito.ir.iet import (
17+
FindNodes, FindSymbols, Iteration, ParallelBlock, retrieve_iteration_tree
18+
)
1719
from devito.tools import as_tuple
1820

1921
try:

devito/arch/archinfo.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
"""Collection of utilities to detect properties of the underlying architecture."""
22

3-
from contextlib import suppress
4-
from functools import cached_property
5-
from subprocess import PIPE, Popen, DEVNULL, run, CalledProcessError
6-
from pathlib import Path
73
import ctypes
8-
import re
4+
import json
95
import os
6+
import re
107
import sys
11-
import json
8+
from contextlib import suppress
9+
from functools import cached_property
10+
from pathlib import Path
11+
from subprocess import DEVNULL, PIPE, CalledProcessError, Popen, run
1212

1313
import cpuinfo
1414
import numpy as np
15-
from packaging.version import parse, InvalidVersion
1615
import psutil
16+
from packaging.version import InvalidVersion, parse
1717

1818
from devito.logger import warning
19-
from devito.tools import as_tuple, all_equal, memoized_func
19+
from devito.tools import all_equal, as_tuple, memoized_func
2020

2121
__all__ = [
2222
'platform_registry', 'get_cpu_info', 'get_gpu_info', 'get_visible_devices',

devito/arch/compiler.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1+
import platform
2+
import time
3+
import warnings
14
from functools import partial
25
from hashlib import sha1
36
from itertools import filterfalse
4-
from os import environ, path, makedirs
5-
from packaging.version import Version
6-
from subprocess import (DEVNULL, PIPE, CalledProcessError, check_output,
7-
check_call, run)
8-
import platform
9-
import warnings
10-
import time
7+
from os import environ, makedirs, path
8+
from subprocess import DEVNULL, PIPE, CalledProcessError, check_call, check_output, run
119

1210
import numpy.ctypeslib as npct
1311
from codepy.jit import compile_from_string
14-
from codepy.toolchain import (GCCToolchain,
15-
call_capture_output as _call_capture_output)
12+
from codepy.toolchain import GCCToolchain
13+
from codepy.toolchain import call_capture_output as _call_capture_output
14+
from packaging.version import Version
1615

1716
from devito.arch import (
18-
AMDGPUX, Cpu64, AppleArm, NvidiaDevice, POWER8, POWER9, Graviton,
19-
Cortex, IntelDevice, get_nvidia_cc, NvidiaArm, check_cuda_runtime,
20-
get_cuda_version, get_m1_llvm_path
17+
AMDGPUX, POWER8, POWER9, AppleArm, Cortex, Cpu64, Graviton, IntelDevice, NvidiaArm,
18+
NvidiaDevice, check_cuda_runtime, get_cuda_version, get_m1_llvm_path, get_nvidia_cc
2119
)
2220
from devito.exceptions import CompilationError
2321
from devito.logger import debug, warning
2422
from devito.parameters import configuration
25-
from devito.tools import (as_list, change_directory, filter_ordered,
26-
memoized_func, make_tempdir)
23+
from devito.tools import (
24+
as_list, change_directory, filter_ordered, make_tempdir, memoized_func
25+
)
2726

2827
__all__ = ['compiler_registry', 'sniff_mpi_distro']
2928

0 commit comments

Comments
 (0)