merge master

nifty/energies/energy.py

@@ -16,8 +16,8 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
-from nifty.nifty_meta import NiftyMeta
-from nifty.energies.memoization import memo
+from ..nifty_meta import NiftyMeta
+from .memoization import memo
 
 from keepers import Loggable
 from future.utils import with_metaclass

nifty/energies/quadratic_energy.py

-from nifty.energies.energy import Energy
-from nifty.energies.memoization import memo
+from .energy import Energy
+from .memoization import memo
 
 
 class QuadraticEnergy(Energy):

nifty/field.py

@@ -1123,7 +1123,7 @@ class Field(Loggable, Versionable, object):
         else:
             # create a diagonal operator which is capable of taking care of the
             # axes-matching
-            from nifty.operators.diagonal_operator import DiagonalOperator
+            from .operators.diagonal_operator import DiagonalOperator
             diagonal = y.val.conjugate()
             diagonalOperator = DiagonalOperator(domain=y.domain,
                                                 diagonal=diagonal,

nifty/field_types/field_type.py

@@ -16,7 +16,7 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
-from nifty.domain_object import DomainObject
+from ..domain_object import DomainObject
 
 
 class FieldType(DomainObject):

nifty/library/critical_filter/critical_power_curvature.py

-from nifty.operators.endomorphic_operator import EndomorphicOperator
-from nifty.operators.invertible_operator_mixin import InvertibleOperatorMixin
-from nifty.operators.diagonal_operator import DiagonalOperator
+from ...operators.endomorphic_operator import EndomorphicOperator
+from ...operators.invertible_operator_mixin import InvertibleOperatorMixin
+from ...operators.diagonal_operator import DiagonalOperator
 
 
 class CriticalPowerCurvature(InvertibleOperatorMixin, EndomorphicOperator):

nifty/library/critical_filter/critical_power_energy.py

+from ...energies.energy import Energy
+from ...operators.smoothness_operator import SmoothnessOperator
+from . import CriticalPowerCurvature
+from ...energies.memoization import memo
 
-from nifty.energies.energy import Energy
-from nifty.operators.smoothness_operator import SmoothnessOperator
-from nifty.library.critical_filter import CriticalPowerCurvature
-from nifty.energies.memoization import memo
-
-from nifty.sugar import generate_posterior_sample
-from nifty import Field, exp
+from ...sugar import generate_posterior_sample
+from ... import Field, exp
 
 
 class CriticalPowerEnergy(Energy):

nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_curvature.py

-from nifty.operators import EndomorphicOperator,\
+from ...operators import EndomorphicOperator,\
                             InvertibleOperatorMixin
-from nifty.energies.memoization import memo
-from nifty.basic_arithmetics import clipped_exp
-from nifty.sugar import create_composed_fft_operator
+from ...energies.memoization import memo
+from ...basic_arithmetics import clipped_exp
+from ...sugar import create_composed_fft_operator
 
 
 class LogNormalWienerFilterCurvature(InvertibleOperatorMixin,

nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py

-from nifty.energies.energy import Energy
-from nifty.energies.memoization import memo
-from nifty.library.log_normal_wiener_filter import \
-    LogNormalWienerFilterCurvature
-from nifty.sugar import create_composed_fft_operator
+from ...energies.energy import Energy
+from ...energies.memoization import memo
+from . import LogNormalWienerFilterCurvature
+from ...sugar import create_composed_fft_operator
 
 
 class LogNormalWienerFilterEnergy(Energy):

nifty/library/wiener_filter/wiener_filter_curvature.py

-from nifty.operators import EndomorphicOperator,\
-                            InvertibleOperatorMixin
+from ...operators import EndomorphicOperator,\
+                         InvertibleOperatorMixin
 
 
 class WienerFilterCurvature(InvertibleOperatorMixin, EndomorphicOperator):

nifty/library/wiener_filter/wiener_filter_energy.py

-from nifty.energies.energy import Energy
-from nifty.energies.memoization import memo
-from nifty.library.wiener_filter import WienerFilterCurvature
+from ...energies.energy import Energy
+from ...energies.memoization import memo
+from . import WienerFilterCurvature
 
 
 class WienerFilterEnergy(Energy):

nifty/minimization/iteration_controller.py

@@ -18,7 +18,7 @@
 
 from builtins import range
 import abc
-from nifty.nifty_meta import NiftyMeta
+from ..nifty_meta import NiftyMeta
 
 import numpy as np
 

nifty/minimization/line_searching/line_search.py

@@ -20,7 +20,7 @@ import abc
 
 from keepers import Loggable
 
-from nifty import LineEnergy
+from ...energies import LineEnergy
 from future.utils import with_metaclass
 
 

nifty/minimization/minimizer.py

@@ -17,7 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 import abc
-from nifty.nifty_meta import NiftyMeta
+from ..nifty_meta import NiftyMeta
 
 import numpy as np
 

nifty/nifty_utilities.py

@@ -96,7 +96,7 @@ def cast_axis_to_tuple(axis, length=None):
 
 
 def parse_domain(domain):
-    from nifty.domain_object import DomainObject
+    from .domain_object import DomainObject
     if domain is None:
         domain = ()
     elif isinstance(domain, DomainObject):

nifty/operators/invertible_operator_mixin/invertible_operator_mixin.py

@@ -17,10 +17,9 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from builtins import object
-from nifty.minimization import ConjugateGradient
-
-from nifty.field import Field
-from nifty.energies import QuadraticEnergy
+from ...energies import QuadraticEnergy
+from ...minimization import ConjugateGradient
+from ...field import Field
 
 
 class InvertibleOperatorMixin(object):

nifty/operators/laplace_operator/laplace_operator.py

@@ -17,11 +17,11 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 import numpy as np
-from nifty.field import Field
-from nifty.spaces.power_space import PowerSpace
-from nifty.operators.endomorphic_operator import EndomorphicOperator
-from nifty import sqrt
-import nifty.nifty_utilities as utilities
+from ...field import Field
+from ...spaces.power_space import PowerSpace
+from ..endomorphic_operator import EndomorphicOperator
+from ... import sqrt
+from ... import nifty_utilities as utilities
 
 
 class LaplaceOperator(EndomorphicOperator):

nifty/operators/linear_operator/linear_operator.py

@@ -18,11 +18,11 @@
 
 from builtins import str
 import abc
-from nifty.nifty_meta import NiftyMeta
+from ...nifty_meta import NiftyMeta
 
 from keepers import Loggable
-from nifty.field import Field
-import nifty.nifty_utilities as utilities
+from ...field import Field
+from ... import nifty_utilities as utilities
 from future.utils import with_metaclass
 
 

nifty/operators/projection_operator/projection_operator.py

@@ -19,9 +19,8 @@
 from builtins import range
 import numpy as np
 
-from nifty.field import Field
-
-from nifty.operators.endomorphic_operator import EndomorphicOperator
+from ...field import Field
+from ..endomorphic_operator import EndomorphicOperator
 
 
 class ProjectionOperator(EndomorphicOperator):

nifty/operators/response_operator/response_operator.py

 from builtins import range
 import numpy as np
-from nifty import Field,\
-                  FieldArray
-from nifty.operators.linear_operator import LinearOperator
-from nifty.operators.smoothing_operator import SmoothingOperator
-from nifty.operators.composed_operator import ComposedOperator
-from nifty.operators.diagonal_operator import DiagonalOperator
+from ... import Field,\
+                FieldArray
+from ..linear_operator import LinearOperator
+from ..smoothing_operator import SmoothingOperator
+from ..composed_operator import ComposedOperator
+from ..diagonal_operator import DiagonalOperator
 
 
 class ResponseOperator(LinearOperator):

nifty/operators/smoothness_operator/smoothness_operator.py

-
-from nifty.spaces.power_space import PowerSpace
-from nifty.operators.endomorphic_operator import EndomorphicOperator
-from nifty.operators.laplace_operator import LaplaceOperator
+from ...spaces.power_space import PowerSpace
+from ..endomorphic_operator import EndomorphicOperator
+from ..laplace_operator import LaplaceOperator
 
 
 class SmoothnessOperator(EndomorphicOperator):