From 928ef5e3095de55c485fd64bc0970e72f053fb2c Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Comby Date: Fri, 2 Feb 2024 10:32:14 +0100 Subject: [PATCH] style: run black 24. (#79) --- docs/conf.py | 1 + examples/conftest.py | 1 + src/mrinufft/density/__init__.py | 1 + src/mrinufft/density/geometry_based.py | 1 + src/mrinufft/density/utils.py | 1 + src/mrinufft/io/__init__.py | 1 - src/mrinufft/io/cfl.py | 1 + src/mrinufft/operators/base.py | 1 + src/mrinufft/operators/interfaces/_cupy_kernels.py | 1 + src/mrinufft/operators/interfaces/sigpy.py | 1 + src/mrinufft/operators/interfaces/utils/__init__.py | 1 + src/mrinufft/operators/interfaces/utils/gpu_utils.py | 1 + src/mrinufft/operators/off_resonnance.py | 1 + src/mrinufft/operators/stacked.py | 1 + src/mrinufft/trajectories/__init__.py | 1 + src/mrinufft/trajectories/display.py | 1 + src/mrinufft/trajectories/tools.py | 1 + src/mrinufft/trajectories/trajectory2D.py | 1 + src/mrinufft/trajectories/trajectory3D.py | 1 + src/mrinufft/trajectories/utils.py | 1 + tests/case_trajectories.py | 1 + tests/conftest.py | 1 + tests/helpers/asserts.py | 1 - tests/helpers/factories.py | 1 + tests/test_batch.py | 1 + tests/test_bindings.py | 1 - tests/test_density.py | 1 - tests/test_interfaces.py | 1 + tests/test_io.py | 1 + tests/test_ndft.py | 1 + tests/test_stacked.py | 1 + tests/test_stacked_gpu.py | 1 + 32 files changed, 28 insertions(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index d387a68dc..eae90e553 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -5,6 +5,7 @@ list see the documentation: https://www.sphinx-doc.org/en/master/usage/configuration.html """ + # -- Path setup -------------------------------------------------------------- # If extensions (or modules to document with autodoc) are in another directory, diff --git a/examples/conftest.py b/examples/conftest.py index 4f9ad7117..395ee8cb2 100644 --- a/examples/conftest.py +++ b/examples/conftest.py @@ -11,6 +11,7 @@ https://stackoverflow.com/questions/56807698/how-to-run-script-as-pytest-test """ + from pathlib import Path import runpy import pytest diff --git a/src/mrinufft/density/__init__.py b/src/mrinufft/density/__init__.py index 484e559c5..6d25523ea 100644 --- a/src/mrinufft/density/__init__.py +++ b/src/mrinufft/density/__init__.py @@ -1,4 +1,5 @@ """Density compensation methods.""" + from .geometry_based import voronoi, voronoi_unique, cell_count from .nufft_based import pipe from .utils import get_density diff --git a/src/mrinufft/density/geometry_based.py b/src/mrinufft/density/geometry_based.py index bbc13af01..238bad955 100644 --- a/src/mrinufft/density/geometry_based.py +++ b/src/mrinufft/density/geometry_based.py @@ -1,4 +1,5 @@ """Compute density compensation weights using geometry-based methods.""" + import numpy as np from scipy.spatial import Voronoi diff --git a/src/mrinufft/density/utils.py b/src/mrinufft/density/utils.py index 0f5283aaa..0b42ac918 100644 --- a/src/mrinufft/density/utils.py +++ b/src/mrinufft/density/utils.py @@ -1,4 +1,5 @@ """Utilities for density compensation.""" + from functools import wraps import numpy as np diff --git a/src/mrinufft/io/__init__.py b/src/mrinufft/io/__init__.py index 53096ac4a..039d06004 100644 --- a/src/mrinufft/io/__init__.py +++ b/src/mrinufft/io/__init__.py @@ -1,6 +1,5 @@ """Input/Output module for trajectories and data.""" - from .cfl import traj2cfl, cfl2traj from .nsp import read_trajectory, write_trajectory diff --git a/src/mrinufft/io/cfl.py b/src/mrinufft/io/cfl.py index 856d81c4c..78c6b20fd 100644 --- a/src/mrinufft/io/cfl.py +++ b/src/mrinufft/io/cfl.py @@ -6,6 +6,7 @@ ---------- BART Toolbox: https://bart-doc.readthedocs.io/en/latest/data.html """ + from pathlib import Path import os import mmap diff --git a/src/mrinufft/operators/base.py b/src/mrinufft/operators/base.py index 22561f60c..611228b59 100644 --- a/src/mrinufft/operators/base.py +++ b/src/mrinufft/operators/base.py @@ -5,6 +5,7 @@ :author: Pierre-Antoine Comby """ + from abc import ABC, abstractmethod from functools import partial import warnings diff --git a/src/mrinufft/operators/interfaces/_cupy_kernels.py b/src/mrinufft/operators/interfaces/_cupy_kernels.py index 6573a0435..a5afcab50 100644 --- a/src/mrinufft/operators/interfaces/_cupy_kernels.py +++ b/src/mrinufft/operators/interfaces/_cupy_kernels.py @@ -1,4 +1,5 @@ """Kernel function for GPUArray data.""" + from .utils.gpu_utils import get_maxThreadBlock, CUPY_AVAILABLE update_density_kernel = lambda *args, **kwargs: None # noqa: E731 diff --git a/src/mrinufft/operators/interfaces/sigpy.py b/src/mrinufft/operators/interfaces/sigpy.py index a34919711..2e5e29e60 100644 --- a/src/mrinufft/operators/interfaces/sigpy.py +++ b/src/mrinufft/operators/interfaces/sigpy.py @@ -2,6 +2,7 @@ The SigPy NUFFT is fully implemented in Python. """ + import warnings import numpy as np diff --git a/src/mrinufft/operators/interfaces/utils/__init__.py b/src/mrinufft/operators/interfaces/utils/__init__.py index 110784f94..81a192157 100644 --- a/src/mrinufft/operators/interfaces/utils/__init__.py +++ b/src/mrinufft/operators/interfaces/utils/__init__.py @@ -1,4 +1,5 @@ """Utilities for interfaces.""" + from .utils import ( check_error, check_size, diff --git a/src/mrinufft/operators/interfaces/utils/gpu_utils.py b/src/mrinufft/operators/interfaces/utils/gpu_utils.py index dfc0ed13d..c7b42a904 100644 --- a/src/mrinufft/operators/interfaces/utils/gpu_utils.py +++ b/src/mrinufft/operators/interfaces/utils/gpu_utils.py @@ -1,4 +1,5 @@ """Utils for GPU.""" + import numpy as np from pathlib import Path from hashlib import md5 diff --git a/src/mrinufft/operators/off_resonnance.py b/src/mrinufft/operators/off_resonnance.py index 6e7777961..0c6f452cf 100644 --- a/src/mrinufft/operators/off_resonnance.py +++ b/src/mrinufft/operators/off_resonnance.py @@ -3,6 +3,7 @@ Based on the implementation of Guillaume Daval-Frérot in pysap-mri: https://github.com/CEA-COSMIC/pysap-mri/blob/master/mri/operators/fourier/orc_wrapper.py """ + import numpy as np from .base import FourierOperatorBase diff --git a/src/mrinufft/operators/stacked.py b/src/mrinufft/operators/stacked.py index 98cb3758d..d91a41428 100644 --- a/src/mrinufft/operators/stacked.py +++ b/src/mrinufft/operators/stacked.py @@ -1,4 +1,5 @@ """Stacked Operator for NUFFT.""" + import warnings import numpy as np diff --git a/src/mrinufft/trajectories/__init__.py b/src/mrinufft/trajectories/__init__.py index 0672d1571..f8619dccc 100644 --- a/src/mrinufft/trajectories/__init__.py +++ b/src/mrinufft/trajectories/__init__.py @@ -1,4 +1,5 @@ """Collection of trajectories and tools used for non-Cartesian MRI.""" + from .trajectory2D import ( initialize_2D_radial, initialize_2D_spiral, diff --git a/src/mrinufft/trajectories/display.py b/src/mrinufft/trajectories/display.py index 369995830..bc924bd49 100644 --- a/src/mrinufft/trajectories/display.py +++ b/src/mrinufft/trajectories/display.py @@ -1,4 +1,5 @@ """Display function for trajectories.""" + import itertools import matplotlib as mpl diff --git a/src/mrinufft/trajectories/tools.py b/src/mrinufft/trajectories/tools.py index e5feb4b4f..29acd041f 100644 --- a/src/mrinufft/trajectories/tools.py +++ b/src/mrinufft/trajectories/tools.py @@ -1,4 +1,5 @@ """Functions to manipulate trajectories.""" + import numpy as np from .utils import ( diff --git a/src/mrinufft/trajectories/trajectory2D.py b/src/mrinufft/trajectories/trajectory2D.py index 8beee3982..ec2fe0b70 100644 --- a/src/mrinufft/trajectories/trajectory2D.py +++ b/src/mrinufft/trajectories/trajectory2D.py @@ -1,4 +1,5 @@ """2D trajectory initializations.""" + import numpy as np from .utils import ( diff --git a/src/mrinufft/trajectories/trajectory3D.py b/src/mrinufft/trajectories/trajectory3D.py index 8b98d1736..043112032 100644 --- a/src/mrinufft/trajectories/trajectory3D.py +++ b/src/mrinufft/trajectories/trajectory3D.py @@ -1,4 +1,5 @@ """3D Trajectory initialization functions.""" + import numpy as np import numpy.linalg as nl diff --git a/src/mrinufft/trajectories/utils.py b/src/mrinufft/trajectories/utils.py index be2d72a60..5b68d9aea 100644 --- a/src/mrinufft/trajectories/utils.py +++ b/src/mrinufft/trajectories/utils.py @@ -1,4 +1,5 @@ """Utility functions for the trajectory design.""" + import numpy as np from enum import Enum, EnumMeta diff --git a/tests/case_trajectories.py b/tests/case_trajectories.py index 0f1e0397a..02d4f9c13 100644 --- a/tests/case_trajectories.py +++ b/tests/case_trajectories.py @@ -1,4 +1,5 @@ """Trajectories cases we want to test.""" + import numpy as np import scipy as sp diff --git a/tests/conftest.py b/tests/conftest.py index 473b54d50..69598fdb4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,5 @@ """Configuration for pytest.""" + import pytest from mrinufft.operators import FourierOperatorBase, check_backend, list_backends diff --git a/tests/helpers/asserts.py b/tests/helpers/asserts.py index 5d4e932b0..9198c8063 100644 --- a/tests/helpers/asserts.py +++ b/tests/helpers/asserts.py @@ -1,6 +1,5 @@ """Utils for tests.""" - import numpy as np import numpy.testing as npt import scipy as sp diff --git a/tests/helpers/factories.py b/tests/helpers/factories.py index 7e09ef710..579870584 100644 --- a/tests/helpers/factories.py +++ b/tests/helpers/factories.py @@ -1,4 +1,5 @@ """Useful factories to create matching data for an operator.""" + import numpy as np diff --git a/tests/test_batch.py b/tests/test_batch.py index 2ddaee28e..092ce44c6 100644 --- a/tests/test_batch.py +++ b/tests/test_batch.py @@ -2,6 +2,7 @@ Only finufft and cufinufft support batch computations. """ + import numpy as np import numpy.testing as npt import pytest diff --git a/tests/test_bindings.py b/tests/test_bindings.py index 18f8da214..8fb432579 100644 --- a/tests/test_bindings.py +++ b/tests/test_bindings.py @@ -1,6 +1,5 @@ """Test for mrinufft interfaces.""" - import mrinufft import pytest diff --git a/tests/test_density.py b/tests/test_density.py index b32fb92a1..771557394 100644 --- a/tests/test_density.py +++ b/tests/test_density.py @@ -1,6 +1,5 @@ """Test the density compensation methods.""" - import numpy as np import numpy.testing as npt from pytest_cases import fixture, parametrize, parametrize_with_cases diff --git a/tests/test_interfaces.py b/tests/test_interfaces.py index 6a5cdb116..155c64bed 100644 --- a/tests/test_interfaces.py +++ b/tests/test_interfaces.py @@ -1,4 +1,5 @@ """Test the interfaces module.""" + import numpy as np import numpy.testing as npt from pytest_cases import parametrize_with_cases, parametrize, fixture diff --git a/tests/test_io.py b/tests/test_io.py index 76d44cbe7..c549cefb9 100644 --- a/tests/test_io.py +++ b/tests/test_io.py @@ -1,4 +1,5 @@ """Test the trajectories io module.""" + import numpy as np from mrinufft.io import read_trajectory, write_trajectory from mrinufft.trajectories.trajectory2D import initialize_2D_radial diff --git a/tests/test_ndft.py b/tests/test_ndft.py index b6ee29f13..7ae595a89 100644 --- a/tests/test_ndft.py +++ b/tests/test_ndft.py @@ -1,4 +1,5 @@ """Test for the NDFT implementations.""" + import numpy as np import scipy as sp from pytest_cases import parametrize_with_cases diff --git a/tests/test_stacked.py b/tests/test_stacked.py index ccc49c845..d627f53e6 100644 --- a/tests/test_stacked.py +++ b/tests/test_stacked.py @@ -3,6 +3,7 @@ The tests compares the stacked NUFFT (which uses FFT in the z-direction) and the fully 3D ones. """ + import numpy as np import numpy.testing as npt diff --git a/tests/test_stacked_gpu.py b/tests/test_stacked_gpu.py index 0051a19ab..3db58f66c 100644 --- a/tests/test_stacked_gpu.py +++ b/tests/test_stacked_gpu.py @@ -3,6 +3,7 @@ The tests compares the stacked NUFFT (which uses FFT in the z-direction) and the fully 3D ones. """ + import numpy as np import numpy.testing as npt