optimizing imports

Author: pancetta

pySDC/core/BaseTransfer.py

@@ -1,9 +1,10 @@
 import logging
-import scipy.sparse as sp
+
 import numpy as np
+import scipy.sparse as sp
 
-from pySDC.helpers.pysdc_helper import FrozenClass
 from pySDC.core.Errors import UnlockError
+from pySDC.helpers.pysdc_helper import FrozenClass
 
 
 # short helper class to add params as attributes

pySDC/core/Collocation.py

@@ -1,8 +1,9 @@
-from scipy.interpolate import BarycentricInterpolator
-from scipy.integrate import quad
-import numpy as np
 import logging
 
+import numpy as np
+from scipy.integrate import quad
+from scipy.interpolate import BarycentricInterpolator
+
 from pySDC.core.Errors import CollocationError
 
 

pySDC/core/Controller.py

@@ -1,10 +1,10 @@
+import logging
 import os
 import sys
-import logging
 
-from pySDC.helpers.pysdc_helper import FrozenClass
 from pySDC.core import Hooks as hookclass
 from pySDC.core.BaseTransfer import base_transfer
+from pySDC.helpers.pysdc_helper import FrozenClass
 
 
 # short helper class to add params as attributes

pySDC/core/Step.py

@@ -1,9 +1,9 @@
 import logging
 
 from pySDC.core import Level as levclass
-from pySDC.helpers.pysdc_helper import FrozenClass
 from pySDC.core.BaseTransfer import base_transfer
 from pySDC.core.Errors import ParameterError
+from pySDC.helpers.pysdc_helper import FrozenClass
 
 
 # short helper class to add params as attributes
@@ -86,10 +86,10 @@ def __generate_hierarchy(self, descr):
         """
 
         if 'dtype_u' in descr:
-            raise ParameterError('Deprecated parameter dtype_u, please remove from description dictionary and specify'
+            raise ParameterError('Deprecated parameter dtype_u, please remove from description dictionary and specify '
                                  'directly in the problem class')
         if 'dtype_f' in descr:
-            raise ParameterError('Deprecated parameter dtype_f, please remove from description dictionary and specify'
+            raise ParameterError('Deprecated parameter dtype_f, please remove from description dictionary and specify '
                                  'directly in the problem class')
 
         # assert the existence of all the keys we need to set up at least on level

pySDC/core/Sweeper.py

@@ -1,12 +1,12 @@
 import logging
+
 import numpy as np
 import scipy.linalg
 import scipy.optimize as opt
 
+from pySDC.core.Errors import ParameterError
 from pySDC.core.Level import level
 from pySDC.helpers.pysdc_helper import FrozenClass
-from pySDC.core.Errors import ParameterError
-
 from pySDC.implementations.collocation_classes.equidistant_right import EquidistantNoLeft
 from pySDC.implementations.collocation_classes.gauss_lobatto import CollGaussLobatto
 from pySDC.implementations.collocation_classes.gauss_radau_right import CollGaussRadau_Right

pySDC/helpers/plot_helper.py

@@ -2,8 +2,6 @@
 mpl.use('pgf')
 import matplotlib.pyplot as plt
 
-import numpy as np
-
 
 def figsize(textwidth, scale, ratio):
     fig_width_pt = textwidth                            # Get this from LaTeX using \the\textwidth

pySDC/implementations/controller_classes/controller_MPI.py

@@ -2,8 +2,8 @@
 from mpi4py import MPI
 
 from pySDC.core.Controller import controller
-from pySDC.core.Step import step
 from pySDC.core.Errors import ControllerError
+from pySDC.core.Step import step
 
 
 class controller_MPI(controller):

pySDC/implementations/controller_classes/controller_nonMPI.py

@@ -1,10 +1,11 @@
-import itertools
 import copy as cp
-import numpy as np
+import itertools
+
 import dill
+import numpy as np
 
-from pySDC.core.Controller import controller
 from pySDC.core import Step as stepclass
+from pySDC.core.Controller import controller
 from pySDC.core.Errors import ControllerError, CommunicationError
 
 

pySDC/implementations/datatype_classes/complex_mesh.py

@@ -1,6 +1,7 @@
-import numpy as np
 import copy as cp
 
+import numpy as np
+
 from pySDC.core.Errors import DataError
 
 

pySDC/implementations/datatype_classes/fenics_mesh.py

@@ -1,6 +1,7 @@
-from pySDC.core.Errors import DataError
 import dolfin as df
 
+from pySDC.core.Errors import DataError
+
 
 class fenics_mesh(object):
     """