lint: Re-sort all imports with new isort rules

Author: JDBetteridge

benchmarks/regression/benchmarks/arguments.py

@@ -1,5 +1,4 @@
-from devito import Grid, Function, TimeFunction, SparseTimeFunction, Eq, Operator
-
+from devito import Eq, Function, Grid, Operator, SparseTimeFunction, TimeFunction
 
 # ASV config
 repeat = 10

benchmarks/regression/benchmarks/codegen.py

@@ -1,6 +1,5 @@
 from examples.seismic.tti.tti_example import tti_setup
 
-
 repeat = 3
 
 

benchmarks/regression/benchmarks/simple_operators.py

@@ -1,5 +1,4 @@
-from devito import Grid, Function, TimeFunction, Eq, Operator, gaussian_smooth, norm
-
+from devito import Eq, Function, gaussian_smooth, Grid, norm, Operator, TimeFunction
 
 # ASV config
 repeat = 3

benchmarks/user/advisor/roofline.py

@@ -6,20 +6,18 @@
 
 This module has been partly extracted from the examples directory of Intel Advisor 2018.
 """
-import click
 import json
 import math
+import os
+import sys
+
+import click
 import matplotlib
-from matplotlib.ticker import ScalarFormatter
 import matplotlib.pyplot as plt  # noqa
-
 import numpy as np
 import pandas as pd
-import sys
-import os
-
 from advisor_logging import check, err, log
-
+from matplotlib.ticker import ScalarFormatter
 
 try:
     import advisor

benchmarks/user/advisor/run_advisor.py

@@ -1,14 +1,13 @@
-import click
 import datetime
 import logging
 import os
 import sys
-
 from pathlib import Path
 from subprocess import check_output, PIPE, Popen
 from tempfile import gettempdir, mkdtemp
 
-from advisor_logging import check, log, progress, log_process
+import click
+from advisor_logging import check, log, log_process, progress
 
 
 @click.command()

benchmarks/user/benchmark.py

@@ -1,22 +1,24 @@
-import numpy as np
-import click
 import os
 
-from devito import Device, configuration, info, warning, set_log_level, switchconfig, norm
+import click
+import numpy as np
+
+from devito import configuration, Device, info, norm, set_log_level, switchconfig, warning
 from devito.arch.compiler import IntelCompiler
 from devito.mpi import MPI
 from devito.operator.profiling import PerformanceSummary
 from devito.tools import all_equal, as_tuple, sweep
 from devito.types.dense import DiscreteFunction
-
-from examples.seismic.acoustic.acoustic_example import run as acoustic_run, acoustic_setup
-from examples.seismic.tti.tti_example import run as tti_run, tti_setup
-from examples.seismic.elastic.elastic_example import run as elastic_run, elastic_setup
-from examples.seismic.self_adjoint.example_iso import run as acoustic_sa_run, \
-    acoustic_sa_setup
-from examples.seismic.viscoelastic.viscoelastic_example import run as viscoelastic_run, \
-    viscoelastic_setup
-
+from examples.seismic.acoustic.acoustic_example import acoustic_setup
+from examples.seismic.acoustic.acoustic_example import run as acoustic_run
+from examples.seismic.elastic.elastic_example import elastic_setup
+from examples.seismic.elastic.elastic_example import run as elastic_run
+from examples.seismic.self_adjoint.example_iso import acoustic_sa_setup
+from examples.seismic.self_adjoint.example_iso import run as acoustic_sa_run
+from examples.seismic.tti.tti_example import run as tti_run
+from examples.seismic.tti.tti_example import tti_setup
+from examples.seismic.viscoelastic.viscoelastic_example import run as viscoelastic_run
+from examples.seismic.viscoelastic.viscoelastic_example import viscoelastic_setup
 
 model_type = {
     'viscoelastic': {

conftest.py

@@ -6,14 +6,16 @@
 from sympy import Add
 from sympy.printing import sstr
 
-from devito import Eq, configuration, Revolver  # noqa
+from devito import configuration, Eq, Revolver  # noqa
+from devito.arch import Arm, Cpu64, Device, get_advisor_path, sniff_mpi_distro
+from devito.arch.compiler import (
+    compiler_registry, IntelCompiler, NvidiaCompiler, OneapiCompiler
+)
 from devito.checkpointing import NoopRevolver
 from devito.finite_differences.differentiable import EvalDerivative
-from devito.arch import Cpu64, Device, sniff_mpi_distro, Arm, get_advisor_path
-from devito.arch.compiler import (compiler_registry, IntelCompiler, OneapiCompiler,
-                                  NvidiaCompiler)
-from devito.ir.iet import (FindNodes, FindSymbols, Iteration, ParallelBlock,
-                           retrieve_iteration_tree)
+from devito.ir.iet import (
+    FindNodes, FindSymbols, Iteration, ParallelBlock, retrieve_iteration_tree
+)
 from devito.tools import as_tuple
 
 try:

devito/__init__.py

@@ -1,54 +1,53 @@
 import atexit
-from itertools import product
 import os
+from itertools import product
 
 import numpy as np
 
+# Other stuff exposed to the user
+from devito.builtins import *  # noqa
+from devito.data.allocators import *  # noqa
+from devito.finite_differences import *  # noqa
+from devito.logger import error, info, set_log_level, warning  # noqa
+from devito.mpi import CustomTopology, MPI  # noqa
+from devito.operations.solve import *
+from devito.operator import Operator  # noqa
 # Import the global `configuration` dict
 from devito.parameters import *  # noqa
-
+from devito.symbolics import CondEq, CondNe  # noqa
 # DSL imports
-from devito.types import NODE, CELL, Buffer  # noqa
+from devito.types import Buffer, CELL, NODE  # noqa
 from devito.types.caching import _SymbolCache, CacheManager  # noqa
 from devito.types.constant import *  # noqa
-from devito.types.dimension import *  # noqa
 from devito.types.dense import *  # noqa
+from devito.types.dimension import *  # noqa
 from devito.types.equation import *  # noqa
 from devito.types.grid import *  # noqa
 from devito.types.relational import *  # noqa
 from devito.types.sparse import *  # noqa
 from devito.types.tensor import *  # noqa
-from devito.finite_differences import *  # noqa
-from devito.operations.solve import *
-from devito.operator import Operator  # noqa
-from devito.symbolics import CondEq, CondNe  # noqa
-
-# Other stuff exposed to the user
-from devito.builtins import *  # noqa
-from devito.data.allocators import *  # noqa
-from devito.logger import error, warning, info, set_log_level  # noqa
 from devito.warnings import warn  # noqa
-from devito.mpi import MPI, CustomTopology  # noqa
+
 try:
-    from devito.checkpointing import DevitoCheckpoint, CheckpointOperator  # noqa
     from pyrevolve import Revolver
+
+    from devito.checkpointing import CheckpointOperator, DevitoCheckpoint  # noqa
 except ImportError:
     from devito.checkpointing import NoopCheckpoint as DevitoCheckpoint  # noqa
     from devito.checkpointing import NoopCheckpointOperator as CheckpointOperator  # noqa
     from devito.checkpointing import NoopRevolver as Revolver  # noqa
 
 # Imports required to initialize Devito
-from devito.arch import compiler_registry, platform_registry
-from devito.core import *   # noqa
-from devito.logger import logger_registry, _set_log_level  # noqa
-from devito.mpi.routines import mpi_registry
-from devito.operator import profiler_registry, operator_registry
+from importlib.metadata import PackageNotFoundError, version
 
+from devito.arch import compiler_registry, platform_registry
+from devito.core import *  # noqa
+from devito.logger import _set_log_level, logger_registry  # noqa
 # Apply monkey-patching while we wait for our patches to be upstreamed and released
 from devito.mpatches import *  # noqa
+from devito.mpi.routines import mpi_registry
+from devito.operator import operator_registry, profiler_registry
 
-
-from importlib.metadata import version, PackageNotFoundError
 try:
     __version__ = version("devito")
 except PackageNotFoundError:

devito/arch/archinfo.py

@@ -1,20 +1,20 @@
 """Collection of utilities to detect properties of the underlying architecture."""
 
-from functools import cached_property
-from subprocess import PIPE, Popen, DEVNULL, run
-from pathlib import Path
 import ctypes
-import re
+import json
 import os
+import re
 import sys
-import json
+from functools import cached_property
+from pathlib import Path
+from subprocess import DEVNULL, PIPE, Popen, run
 
 import cpuinfo
 import numpy as np
 import psutil
 
 from devito.logger import warning
-from devito.tools import as_tuple, all_equal, memoized_func
+from devito.tools import all_equal, as_tuple, memoized_func
 
 __all__ = ['platform_registry', 'get_cpu_info', 'get_gpu_info', 'get_visible_devices',
            'get_nvidia_cc', 'get_cuda_path', 'get_hip_path', 'check_cuda_runtime',

devito/arch/compiler.py

@@ -1,26 +1,27 @@
-from functools import partial
-from hashlib import sha1
-from os import environ, path, makedirs
-from packaging.version import Version
-from subprocess import (DEVNULL, PIPE, CalledProcessError, check_output,
-                        check_call, run)
 import platform
-import warnings
 import time
+import warnings
+from functools import partial
+from hashlib import sha1
+from os import environ, makedirs, path
+from subprocess import CalledProcessError, check_call, check_output, DEVNULL, PIPE, run
 
 import numpy.ctypeslib as npct
 from codepy.jit import compile_from_string
-from codepy.toolchain import (GCCToolchain,
-                              call_capture_output as _call_capture_output)
+from codepy.toolchain import call_capture_output as _call_capture_output
+from codepy.toolchain import GCCToolchain
+from packaging.version import Version
 
-from devito.arch import (AMDGPUX, Cpu64, AppleArm, NvidiaDevice, POWER8, POWER9,
-                         Graviton, Cortex, IntelDevice, get_nvidia_cc, NvidiaArm,
-                         check_cuda_runtime, get_m1_llvm_path)
+from devito.arch import (
+    AMDGPUX, AppleArm, check_cuda_runtime, Cortex, Cpu64, get_m1_llvm_path, get_nvidia_cc,
+    Graviton, IntelDevice, NvidiaArm, NvidiaDevice, POWER8, POWER9
+)
 from devito.exceptions import CompilationError
 from devito.logger import debug, warning
 from devito.parameters import configuration
-from devito.tools import (as_list, change_directory, filter_ordered,
-                          memoized_func, make_tempdir)
+from devito.tools import (
+    as_list, change_directory, filter_ordered, make_tempdir, memoized_func
+)
 
 __all__ = ['sniff_mpi_distro', 'compiler_registry']