From 72f4106a031c3483bdc2e6449c778cc3bd506e80 Mon Sep 17 00:00:00 2001 From: Holger Kohr Date: Tue, 13 Mar 2018 22:28:06 +0100 Subject: [PATCH] MAINT: sort imports in contrib --- odl/contrib/datasets/ct/fips.py | 3 ++- odl/contrib/datasets/images/cambridge.py | 1 + odl/contrib/datasets/images/examples/cambridge_images.py | 3 ++- odl/contrib/datasets/mri/tugraz.py | 3 ++- odl/contrib/datasets/util.py | 9 +++++---- odl/contrib/fom/examples/haarpsi.py | 1 + odl/contrib/fom/examples/noise_power_spectrum.py | 1 + odl/contrib/fom/examples/supervised_comparison.py | 5 +++-- odl/contrib/fom/supervised.py | 1 + odl/contrib/fom/test/test_supervised.py | 4 +++- odl/contrib/fom/test/test_unsupervised.py | 1 + odl/contrib/fom/unsupervised.py | 1 + odl/contrib/mrc/examples/mrc_io.py | 6 +++--- odl/contrib/mrc/examples/raw_binary_with_header_io.py | 4 ++-- odl/contrib/mrc/mrc.py | 9 +++++---- odl/contrib/mrc/test/mrc_test.py | 9 +++++---- odl/contrib/mrc/test/uncompr_bin_test.py | 7 ++++--- odl/contrib/mrc/uncompr_bin.py | 9 +++++---- odl/contrib/pyshearlab/pyshearlab_operator.py | 7 ++++--- odl/contrib/pyshearlab/test/operator_test.py | 4 ++-- odl/contrib/solvers/examples/tomography_nonlocalmeans.py | 2 +- .../solvers/functional/nonlocalmeans_functionals.py | 3 ++- .../tensorflow/examples/tensorflow_layer_matrix.py | 3 ++- .../tensorflow/examples/tensorflow_layer_productspace.py | 3 ++- .../examples/tensorflow_layer_ray_transform.py | 4 +++- .../tensorflow/examples/tensorflow_operator_matrix.py | 4 +++- odl/contrib/tensorflow/examples/tensorflow_tomography.py | 3 ++- odl/contrib/tensorflow/layer.py | 8 +++++--- odl/contrib/tensorflow/operator.py | 6 +++--- odl/contrib/tensorflow/space.py | 7 +++---- odl/contrib/tensorflow/test/tensorflow_test.py | 6 ++++-- odl/contrib/theano/examples/theano_layer_matrix.py | 6 ++++-- odl/contrib/theano/layer.py | 7 +++---- odl/contrib/theano/test/theano_test.py | 7 ++++--- odl/contrib/tomo/elekta.py | 2 +- .../examples/elekta_icon_algebraic_reconstruction.py | 1 + .../tomo/examples/elekta_xvi_algebraic_reconstruction.py | 1 + odl/contrib/torch/examples/operator_autograd.py | 4 +++- odl/contrib/torch/examples/operator_module.py | 4 ++-- odl/contrib/torch/operator.py | 2 ++ odl/contrib/torch/test/test_operator.py | 5 ++--- 41 files changed, 106 insertions(+), 70 deletions(-) diff --git a/odl/contrib/datasets/ct/fips.py b/odl/contrib/datasets/ct/fips.py index 7b07b4ffe90..80b8c094add 100644 --- a/odl/contrib/datasets/ct/fips.py +++ b/odl/contrib/datasets/ct/fips.py @@ -9,12 +9,13 @@ """Tomographic datasets from the Finish Inverse Problems Society (FIPS).""" from __future__ import division + import numpy as np + from odl.contrib.datasets.util import get_data from odl.discr import uniform_partition from odl.tomo import FanFlatGeometry - __all__ = ('walnut_data', 'walnut_geometry', 'lotus_root_data', 'lotus_root_geometry') diff --git a/odl/contrib/datasets/images/cambridge.py b/odl/contrib/datasets/images/cambridge.py index 28a4bf06d9d..0e2cabef708 100644 --- a/odl/contrib/datasets/images/cambridge.py +++ b/odl/contrib/datasets/images/cambridge.py @@ -9,6 +9,7 @@ """Images provided by the University of Cambridge.""" import numpy as np + import skimage.transform from odl.contrib.datasets.util import get_data diff --git a/odl/contrib/datasets/images/examples/cambridge_images.py b/odl/contrib/datasets/images/examples/cambridge_images.py index 542382e3f60..2d410680ce0 100644 --- a/odl/contrib/datasets/images/examples/cambridge_images.py +++ b/odl/contrib/datasets/images/examples/cambridge_images.py @@ -1,8 +1,9 @@ """Example of the Cambridge images.""" -import odl.contrib.datasets.images as images import numpy as np + import odl +import odl.contrib.datasets.images as images def convert_to_odl(image): diff --git a/odl/contrib/datasets/mri/tugraz.py b/odl/contrib/datasets/mri/tugraz.py index 8839ff26705..6f19eb2d012 100644 --- a/odl/contrib/datasets/mri/tugraz.py +++ b/odl/contrib/datasets/mri/tugraz.py @@ -11,8 +11,9 @@ import numpy as np from pkg_resources import parse_version -from odl.contrib.datasets.util import get_data import odl +from odl.contrib.datasets.util import get_data + if parse_version(np.__version__) < parse_version('1.12'): flip = odl.util.npy_compat.flip else: diff --git a/odl/contrib/datasets/util.py b/odl/contrib/datasets/util.py index cfcf5f359bf..3a6311d14f9 100644 --- a/odl/contrib/datasets/util.py +++ b/odl/contrib/datasets/util.py @@ -9,13 +9,14 @@ """Utilities for datasets.""" from __future__ import print_function + +import contextlib import os -from os.path import join, expanduser, exists -from future.moves.urllib.request import urlopen +from os.path import exists, expanduser, join from shutil import copyfileobj, rmtree -from scipy import io -import contextlib +from future.moves.urllib.request import urlopen +from scipy import io __all__ = ('get_data_dir', 'cleanup_data_dir', 'get_data') diff --git a/odl/contrib/fom/examples/haarpsi.py b/odl/contrib/fom/examples/haarpsi.py index 4c2bd42ae78..5e271213f4b 100644 --- a/odl/contrib/fom/examples/haarpsi.py +++ b/odl/contrib/fom/examples/haarpsi.py @@ -3,6 +3,7 @@ import matplotlib.pyplot as plt import numpy as np import scipy.misc + from odl.contrib import fom # --- Generate images --- # diff --git a/odl/contrib/fom/examples/noise_power_spectrum.py b/odl/contrib/fom/examples/noise_power_spectrum.py index b0208a7be33..9376efcb46d 100644 --- a/odl/contrib/fom/examples/noise_power_spectrum.py +++ b/odl/contrib/fom/examples/noise_power_spectrum.py @@ -1,6 +1,7 @@ """Simple example of noise power spectrum (NPS).""" import numpy as np + import odl from odl.contrib import fom diff --git a/odl/contrib/fom/examples/supervised_comparison.py b/odl/contrib/fom/examples/supervised_comparison.py index 166aa02a4f0..b7ba8503f89 100644 --- a/odl/contrib/fom/examples/supervised_comparison.py +++ b/odl/contrib/fom/examples/supervised_comparison.py @@ -7,10 +7,11 @@ """ +import matplotlib.pyplot as plt +import numpy as np + import odl from odl.contrib import fom -import numpy as np -import matplotlib.pyplot as plt # Discrete space: discretized functions on the rectangle # [-20, 20]^2 with 100 samples per dimension. diff --git a/odl/contrib/fom/supervised.py b/odl/contrib/fom/supervised.py index 0e3ca404553..17b0a037e6f 100644 --- a/odl/contrib/fom/supervised.py +++ b/odl/contrib/fom/supervised.py @@ -9,6 +9,7 @@ """Figures of merit (FOMs) for comparison against a known ground truth.""" from __future__ import division + import numpy as np import odl diff --git a/odl/contrib/fom/test/test_supervised.py b/odl/contrib/fom/test/test_supervised.py index 3404e175d60..b30ff9e8f7e 100644 --- a/odl/contrib/fom/test/test_supervised.py +++ b/odl/contrib/fom/test/test_supervised.py @@ -9,10 +9,12 @@ """Tests for supervised FoMs.""" from __future__ import division + import numpy as np import pytest -import scipy.signal import scipy.misc +import scipy.signal + import odl import odl.contrib.fom from odl.contrib.fom.util import filter_image_sep2d diff --git a/odl/contrib/fom/test/test_unsupervised.py b/odl/contrib/fom/test/test_unsupervised.py index e1179229dfc..0a09876add7 100644 --- a/odl/contrib/fom/test/test_unsupervised.py +++ b/odl/contrib/fom/test/test_unsupervised.py @@ -10,6 +10,7 @@ import numpy as np import pytest + import odl import odl.contrib.fom diff --git a/odl/contrib/fom/unsupervised.py b/odl/contrib/fom/unsupervised.py index 7bf1a014f76..b21c1c651a3 100644 --- a/odl/contrib/fom/unsupervised.py +++ b/odl/contrib/fom/unsupervised.py @@ -9,6 +9,7 @@ """Figures of Merit (FOMs) for measuring image quality without a reference.""" from __future__ import division + import numpy as np __all__ = ('estimate_noise_std',) diff --git a/odl/contrib/mrc/examples/mrc_io.py b/odl/contrib/mrc/examples/mrc_io.py index 0b7433b2a83..f445284f9a4 100644 --- a/odl/contrib/mrc/examples/mrc_io.py +++ b/odl/contrib/mrc/examples/mrc_io.py @@ -12,15 +12,15 @@ from __future__ import print_function -import matplotlib.pyplot as plt -import numpy as np import os import tempfile +import matplotlib.pyplot as plt +import numpy as np + from odl.contrib.mrc import ( FileReaderMRC, FileWriterMRC, mrc_header_from_params) - # --- Reading --- # file_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), diff --git a/odl/contrib/mrc/examples/raw_binary_with_header_io.py b/odl/contrib/mrc/examples/raw_binary_with_header_io.py index 5312a0af535..8305d94ffbe 100644 --- a/odl/contrib/mrc/examples/raw_binary_with_header_io.py +++ b/odl/contrib/mrc/examples/raw_binary_with_header_io.py @@ -12,16 +12,16 @@ sequence of dictionaries with a certain structure. """ +import tempfile from collections import OrderedDict + import matplotlib.pyplot as plt import numpy as np import scipy -import tempfile from odl.contrib.mrc import ( FileReaderRawBinaryWithHeader, FileWriterRawBinaryWithHeader) - # --- Writing --- # # Create some test data. We arbitrarily define origin and pixel size. diff --git a/odl/contrib/mrc/mrc.py b/odl/contrib/mrc/mrc.py index f7794c3b463..917ce4dfd83 100644 --- a/odl/contrib/mrc/mrc.py +++ b/odl/contrib/mrc/mrc.py @@ -8,19 +8,20 @@ """Specification and reader for the MRC2014 file format.""" -from __future__ import print_function, division, absolute_import +from __future__ import absolute_import, division, print_function + +import struct +import warnings from builtins import int, object from collections import OrderedDict from itertools import permutations + import numpy as np -import struct -import warnings from odl.contrib.mrc.uncompr_bin import ( FileReaderRawBinaryWithHeader, FileWriterRawBinaryWithHeader, header_fields_from_table) - __all__ = ('FileReaderMRC', 'FileWriterMRC', 'mrc_header_from_params') diff --git a/odl/contrib/mrc/test/mrc_test.py b/odl/contrib/mrc/test/mrc_test.py index 5a39323d839..02015821e89 100644 --- a/odl/contrib/mrc/test/mrc_test.py +++ b/odl/contrib/mrc/test/mrc_test.py @@ -9,17 +9,18 @@ """Tests for the MRC I/O routines.""" from __future__ import division + +import tempfile from itertools import permutations -import pytest + import numpy as np -import tempfile +import pytest import odl from odl.contrib.mrc import ( - mrc_header_from_params, FileWriterMRC, FileReaderMRC) + FileReaderMRC, FileWriterMRC, mrc_header_from_params) from odl.util.testutils import all_equal, simple_fixture - # --- pytest fixtures --- # diff --git a/odl/contrib/mrc/test/uncompr_bin_test.py b/odl/contrib/mrc/test/uncompr_bin_test.py index 941f5189a9d..7e9adf88ca0 100644 --- a/odl/contrib/mrc/test/uncompr_bin_test.py +++ b/odl/contrib/mrc/test/uncompr_bin_test.py @@ -13,15 +13,16 @@ """ from __future__ import division -import numpy as np + import tempfile +import numpy as np + import odl from odl.contrib.mrc import ( - FileWriterRawBinaryWithHeader, FileReaderRawBinaryWithHeader) + FileReaderRawBinaryWithHeader, FileWriterRawBinaryWithHeader) from odl.util.testutils import simple_fixture - # --- pytest fixtures --- # diff --git a/odl/contrib/mrc/uncompr_bin.py b/odl/contrib/mrc/uncompr_bin.py index 667b63a8fee..368682051a8 100644 --- a/odl/contrib/mrc/uncompr_bin.py +++ b/odl/contrib/mrc/uncompr_bin.py @@ -8,13 +8,14 @@ """Utilities and class for reading uncompressed binary files with header.""" -from __future__ import print_function, division, absolute_import -from builtins import int, object -from collections import OrderedDict +from __future__ import absolute_import, division, print_function + import csv -import numpy as np import struct +from builtins import int, object +from collections import OrderedDict +import numpy as np __all__ = ('FileReaderRawBinaryWithHeader', 'FileWriterRawBinaryWithHeader', diff --git a/odl/contrib/pyshearlab/pyshearlab_operator.py b/odl/contrib/pyshearlab/pyshearlab_operator.py index 635c857f7c8..4af98abb980 100644 --- a/odl/contrib/pyshearlab/pyshearlab_operator.py +++ b/odl/contrib/pyshearlab/pyshearlab_operator.py @@ -9,11 +9,12 @@ """ODL integration with pyshearlab.""" -import odl -import numpy as np -import pyshearlab from threading import Lock +import numpy as np + +import odl +import pyshearlab __all__ = ('PyShearlabOperator',) diff --git a/odl/contrib/pyshearlab/test/operator_test.py b/odl/contrib/pyshearlab/test/operator_test.py index 8824f2d5b15..81cbe0ec0dc 100644 --- a/odl/contrib/pyshearlab/test/operator_test.py +++ b/odl/contrib/pyshearlab/test/operator_test.py @@ -8,13 +8,13 @@ """Unit tests for the ODL-pyshearlab integration.""" -import pytest import numpy as np +import pytest + import odl import odl.contrib.pyshearlab from odl.util.testutils import all_almost_equal, simple_fixture - dtype = simple_fixture('dtype', ['float32', 'float64']) shape = simple_fixture('shape', [(64, 64), (128, 128)]) diff --git a/odl/contrib/solvers/examples/tomography_nonlocalmeans.py b/odl/contrib/solvers/examples/tomography_nonlocalmeans.py index 2d29ed5bbd6..c317c34def4 100644 --- a/odl/contrib/solvers/examples/tomography_nonlocalmeans.py +++ b/odl/contrib/solvers/examples/tomography_nonlocalmeans.py @@ -12,10 +12,10 @@ """ import numpy as np + import odl import odl.contrib.solvers - # Select what type of denoising to use. Options: 'TV', 'NLM' and 'TV_NLM' model = 'TV' diff --git a/odl/contrib/solvers/functional/nonlocalmeans_functionals.py b/odl/contrib/solvers/functional/nonlocalmeans_functionals.py index 8eded3076e9..76c8f4f4f2a 100644 --- a/odl/contrib/solvers/functional/nonlocalmeans_functionals.py +++ b/odl/contrib/solvers/functional/nonlocalmeans_functionals.py @@ -8,7 +8,8 @@ """Non Local Means functionals.""" -from __future__ import print_function, division, absolute_import +from __future__ import absolute_import, division, print_function + import numpy as np from odl.operator import Operator diff --git a/odl/contrib/tensorflow/examples/tensorflow_layer_matrix.py b/odl/contrib/tensorflow/examples/tensorflow_layer_matrix.py index a1dfb893a34..28118827709 100644 --- a/odl/contrib/tensorflow/examples/tensorflow_layer_matrix.py +++ b/odl/contrib/tensorflow/examples/tensorflow_layer_matrix.py @@ -9,11 +9,12 @@ """ from __future__ import print_function -import tensorflow as tf + import numpy as np import odl import odl.contrib.tensorflow +import tensorflow as tf sess = tf.InteractiveSession() diff --git a/odl/contrib/tensorflow/examples/tensorflow_layer_productspace.py b/odl/contrib/tensorflow/examples/tensorflow_layer_productspace.py index 38e035e8d8d..7172007de95 100644 --- a/odl/contrib/tensorflow/examples/tensorflow_layer_productspace.py +++ b/odl/contrib/tensorflow/examples/tensorflow_layer_productspace.py @@ -5,9 +5,10 @@ """ from __future__ import print_function -import tensorflow as tf + import odl import odl.contrib.tensorflow +import tensorflow as tf sess = tf.InteractiveSession() diff --git a/odl/contrib/tensorflow/examples/tensorflow_layer_ray_transform.py b/odl/contrib/tensorflow/examples/tensorflow_layer_ray_transform.py index e975b961ac4..1aee0bd6077 100644 --- a/odl/contrib/tensorflow/examples/tensorflow_layer_ray_transform.py +++ b/odl/contrib/tensorflow/examples/tensorflow_layer_ray_transform.py @@ -5,10 +5,12 @@ """ from __future__ import print_function -import tensorflow as tf + import numpy as np + import odl import odl.contrib.tensorflow +import tensorflow as tf sess = tf.InteractiveSession() diff --git a/odl/contrib/tensorflow/examples/tensorflow_operator_matrix.py b/odl/contrib/tensorflow/examples/tensorflow_operator_matrix.py index f99ebbfa17d..447cb23f966 100644 --- a/odl/contrib/tensorflow/examples/tensorflow_operator_matrix.py +++ b/odl/contrib/tensorflow/examples/tensorflow_operator_matrix.py @@ -5,10 +5,12 @@ """ from __future__ import print_function -import tensorflow as tf + import numpy as np + import odl import odl.contrib.tensorflow +import tensorflow as tf sess = tf.InteractiveSession() diff --git a/odl/contrib/tensorflow/examples/tensorflow_tomography.py b/odl/contrib/tensorflow/examples/tensorflow_tomography.py index b639888b67a..f0a19c16956 100644 --- a/odl/contrib/tensorflow/examples/tensorflow_tomography.py +++ b/odl/contrib/tensorflow/examples/tensorflow_tomography.py @@ -7,10 +7,11 @@ using a gradient descent method (ADAM). """ -import tensorflow as tf import numpy as np + import odl import odl.contrib.tensorflow +import tensorflow as tf sess = tf.InteractiveSession() diff --git a/odl/contrib/tensorflow/layer.py b/odl/contrib/tensorflow/layer.py index 34a14522349..89c18e3782b 100644 --- a/odl/contrib/tensorflow/layer.py +++ b/odl/contrib/tensorflow/layer.py @@ -8,14 +8,16 @@ """Utilities for converting ODL operators to tensorflow layers.""" -from __future__ import print_function, division, absolute_import +from __future__ import absolute_import, division, print_function + +import uuid + import numpy as np + import odl -import uuid import tensorflow as tf from tensorflow.python.framework import ops - __all__ = ('as_tensorflow_layer',) diff --git a/odl/contrib/tensorflow/operator.py b/odl/contrib/tensorflow/operator.py index 15ca3f567f7..fdde578f53d 100644 --- a/odl/contrib/tensorflow/operator.py +++ b/odl/contrib/tensorflow/operator.py @@ -8,12 +8,12 @@ """Utilities for converting ODL spaces to tensorflow layers.""" -from __future__ import print_function, division, absolute_import -import tensorflow as tf +from __future__ import absolute_import, division, print_function + import numpy as np import odl - +import tensorflow as tf __all__ = ('TensorflowOperator',) diff --git a/odl/contrib/tensorflow/space.py b/odl/contrib/tensorflow/space.py index ff152fadf04..3a5c88a9d9d 100644 --- a/odl/contrib/tensorflow/space.py +++ b/odl/contrib/tensorflow/space.py @@ -8,13 +8,12 @@ """Utilities for converting ODL spaces to tensorflow layers.""" -from __future__ import print_function, division, absolute_import -import tensorflow as tf +from __future__ import absolute_import, division, print_function +import tensorflow as tf +from odl.operator import Operator from odl.set import LinearSpace, RealNumbers from odl.set.space import LinearSpaceElement -from odl.operator import Operator - __all__ = ('TensorflowSpace', 'TensorflowSpaceOperator') diff --git a/odl/contrib/tensorflow/test/tensorflow_test.py b/odl/contrib/tensorflow/test/tensorflow_test.py index 5a1d839ec23..bc03c928c31 100644 --- a/odl/contrib/tensorflow/test/tensorflow_test.py +++ b/odl/contrib/tensorflow/test/tensorflow_test.py @@ -9,13 +9,15 @@ """Tests for tensorflow.""" from __future__ import division + from itertools import permutations -import pytest + import numpy as np -import tensorflow as tf +import pytest import odl import odl.contrib.tensorflow +import tensorflow as tf from odl.util import all_almost_equal diff --git a/odl/contrib/theano/examples/theano_layer_matrix.py b/odl/contrib/theano/examples/theano_layer_matrix.py index e89f0c26bce..4e6002e1275 100644 --- a/odl/contrib/theano/examples/theano_layer_matrix.py +++ b/odl/contrib/theano/examples/theano_layer_matrix.py @@ -9,11 +9,13 @@ """ from __future__ import print_function -import theano -import theano.tensor as T + import numpy as np + import odl import odl.contrib.theano +import theano +import theano.tensor as T # --- Wrap ODL operator as Theano operator --- # diff --git a/odl/contrib/theano/layer.py b/odl/contrib/theano/layer.py index 127ec06d909..21eed112363 100644 --- a/odl/contrib/theano/layer.py +++ b/odl/contrib/theano/layer.py @@ -8,15 +8,14 @@ """Utilities for converting ODL operators to Theano operators.""" -from __future__ import print_function, division, absolute_import -from future.utils import native +from __future__ import absolute_import, division, print_function -import theano import numpy as np +from future.utils import native +import theano from odl.solvers import Functional - __all__ = ('TheanoOperator',) diff --git a/odl/contrib/theano/test/theano_test.py b/odl/contrib/theano/test/theano_test.py index 3eeb73b7ac1..93ccc7b2f99 100644 --- a/odl/contrib/theano/test/theano_test.py +++ b/odl/contrib/theano/test/theano_test.py @@ -9,13 +9,14 @@ """Tests for Theano.""" from __future__ import division -import pytest + import numpy as np -import theano -import theano.tensor as T +import pytest import odl import odl.contrib.theano +import theano +import theano.tensor as T from odl.util import all_almost_equal diff --git a/odl/contrib/tomo/elekta.py b/odl/contrib/tomo/elekta.py index 587143f25a3..9736c00d7c0 100644 --- a/odl/contrib/tomo/elekta.py +++ b/odl/contrib/tomo/elekta.py @@ -9,8 +9,8 @@ """Tomography helpers for Elekta systems.""" import numpy as np -import odl +import odl __all__ = ('elekta_icon_geometry', 'elekta_icon_space', diff --git a/odl/contrib/tomo/examples/elekta_icon_algebraic_reconstruction.py b/odl/contrib/tomo/examples/elekta_icon_algebraic_reconstruction.py index af9eba9fd14..4a666667e9a 100644 --- a/odl/contrib/tomo/examples/elekta_icon_algebraic_reconstruction.py +++ b/odl/contrib/tomo/examples/elekta_icon_algebraic_reconstruction.py @@ -5,6 +5,7 @@ """ import numpy as np + import odl from odl.contrib import tomo diff --git a/odl/contrib/tomo/examples/elekta_xvi_algebraic_reconstruction.py b/odl/contrib/tomo/examples/elekta_xvi_algebraic_reconstruction.py index 2610953e6c2..334e0a02145 100644 --- a/odl/contrib/tomo/examples/elekta_xvi_algebraic_reconstruction.py +++ b/odl/contrib/tomo/examples/elekta_xvi_algebraic_reconstruction.py @@ -5,6 +5,7 @@ """ import numpy as np + import odl from odl.contrib import tomo diff --git a/odl/contrib/torch/examples/operator_autograd.py b/odl/contrib/torch/examples/operator_autograd.py index 255c0f46f91..d30a7079ccb 100644 --- a/odl/contrib/torch/examples/operator_autograd.py +++ b/odl/contrib/torch/examples/operator_autograd.py @@ -11,9 +11,11 @@ """ from __future__ import print_function + import numpy as np -import torch + import odl +import torch from odl.contrib import torch as odl_torch # --- Forward --- # diff --git a/odl/contrib/torch/examples/operator_module.py b/odl/contrib/torch/examples/operator_module.py index 769b85ef307..b4322d8a43f 100644 --- a/odl/contrib/torch/examples/operator_module.py +++ b/odl/contrib/torch/examples/operator_module.py @@ -11,11 +11,11 @@ """ import numpy as np + import odl import torch -from torch import autograd, nn from odl.contrib import torch as odl_torch - +from torch import autograd, nn # --- Forward --- # diff --git a/odl/contrib/torch/operator.py b/odl/contrib/torch/operator.py index b7ed3034713..5837c36a215 100644 --- a/odl/contrib/torch/operator.py +++ b/odl/contrib/torch/operator.py @@ -14,7 +14,9 @@ """ from __future__ import division + import numpy as np + import torch __all__ = ('OperatorAsAutogradFunction', 'OperatorAsModule') diff --git a/odl/contrib/torch/test/test_operator.py b/odl/contrib/torch/test/test_operator.py index b8a70e73a89..6903bb48af0 100644 --- a/odl/contrib/torch/test/test_operator.py +++ b/odl/contrib/torch/test/test_operator.py @@ -9,13 +9,12 @@ """Unit tests for the ODL-pytorch integration.""" import numpy as np -import torch -from torch import autograd, nn import odl +import torch from odl.contrib import torch as odl_torch from odl.util.testutils import all_almost_equal, simple_fixture - +from torch import autograd, nn dtype = simple_fixture('dtype', ['float32', 'float64']) use_cuda_params = [False]