Merge remote-tracking branch 'origin/NIFTy_4' into addUnits

.gitlab-ci.yml

@@ -17,10 +17,10 @@ test_min:
   stage: test
   script:
     - pip install --user .
-    - nosetests -x --with-coverage --cover-package=nifty4 --cover-branches
-    - OMP_NUM_THREADS=1 mpiexec --allow-run-as-root -n 4 nosetests -x --with-coverage --cover-package=nifty4 --cover-branches
+    - nosetests -q --with-coverage --cover-package=nifty4 --cover-branches
+    - OMP_NUM_THREADS=1 mpiexec --allow-run-as-root -n 4 nosetests -q
     - pip3 install --user .
-    - nosetests3 -x
-    - OMP_NUM_THREADS=1 mpiexec --allow-run-as-root -n 4 nosetests3 -x
+    - nosetests3 -q
+    - OMP_NUM_THREADS=1 mpiexec --allow-run-as-root -n 4 nosetests3 -q
     - >
-      coverage report | grep TOTAL | awk '{ print "TOTAL: "$6; }'
+      coverage report | grep TOTAL | awk '{ print "TOTAL: "$6; }' || true

ci/install_basics.sh

 apt-get install -y build-essential git autoconf libtool pkg-config libfftw3-dev openmpi-bin libopenmpi-dev \
-  python  python-pip  python-dev  python-nose  python-numpy  python-matplotlib  python-future  python-mpi4py \
-  python3 python3-pip python3-dev python3-nose python3-numpy python3-matplotlib python3-future python3-mpi4py
+  python  python-pip  python-dev  python-nose  python-numpy  python-matplotlib  python-future  python-mpi4py python-scipy \
+  python3 python3-pip python3-dev python3-nose python3-numpy python3-matplotlib python3-future python3-mpi4py python3-scipy

demos/critical_filtering.py

@@ -12,7 +12,7 @@ if __name__ == "__main__":
 
     # Define harmonic transformation and associated harmonic space
     h_space = s_space.get_default_codomain()
-    fft = ift.FFTOperator(h_space, s_space)
+    fft = ift.HarmonicTransformOperator(h_space, s_space)
 
     # Set up power space
     p_space = ift.PowerSpace(h_space,

demos/wiener_filter_via_curvature.py

@@ -2,6 +2,7 @@ import numpy as np
 import nifty4 as ift
 import numericalunits as nu
 
+
 if __name__ == "__main__":
     # In MPI mode, the random seed for numericalunits must be set by hand
     #nu.reset_units(43)
@@ -38,7 +39,7 @@ if __name__ == "__main__":
 
     signal_space = ift.RGSpace(shape, distances=L/N_pixels)
     harmonic_space = signal_space.get_default_codomain()
-    fft = ift.FFTOperator(harmonic_space, target=signal_space)
+    fft = ift.HarmonicTransformOperator(harmonic_space, target=signal_space)
     power_space = ift.PowerSpace(harmonic_space)
 
     # Creating the mock data
@@ -48,34 +49,27 @@ if __name__ == "__main__":
 
     mock_power = ift.PS_field(power_space, power_spectrum)
     mock_harmonic = ift.power_synthesize(mock_power, real_signal=True)
-    print mock_harmonic.val[0]/nu.K/(nu.m**dimensionality)
     mock_signal = fft(mock_harmonic)
-    print "msig",mock_signal.val[0:10]/nu.K
 
     sensitivity = (1./nu.m)**dimensionality/nu.K
-    R = ift.ResponseOperator(signal_space, sigma=(0.*response_sigma,),
+    R = ift.ResponseOperator(signal_space, sigma=(response_sigma,),
                              sensitivity=(sensitivity,))
     data_domain = R.target[0]
     R_harmonic = R*fft
 
     noise_amplitude = 1./signal_to_noise*field_sigma*sensitivity*((L/N_pixels)**dimensionality)
-    print noise_amplitude
+    print "noise amplitude:", noise_amplitude
     N = ift.DiagonalOperator(
         ift.Field.full(data_domain, noise_amplitude**2))
     noise = ift.Field.from_random(
         domain=data_domain, random_type='normal',
         std=noise_amplitude, mean=0)
-    data = R(mock_signal)
-    print data.val[5:10]
-    data += noise
-    print data.val[5:10]
+    data = R(mock_signal) + noise
      # Wiener filter
 
     j = R_harmonic.adjoint_times(N.inverse_times(data))
-    print "xx",j.val[0]*nu.K*(nu.m**dimensionality)
-    exit()
     ctrl = ift.GradientNormController(
-        verbose=True, tol_abs_gradnorm=1e-40/(nu.K*(nu.m**dimensionality)))
+        verbose=True, tol_abs_gradnorm=1e-5/(nu.K*(nu.m**dimensionality)))
     inverter = ift.ConjugateGradient(controller=ctrl)
     wiener_curvature = ift.library.WienerFilterCurvature(
         S=S, N=N, R=R_harmonic, inverter=inverter)
@@ -85,8 +79,10 @@ if __name__ == "__main__":
 
     sspace2 = ift.RGSpace(shape, distances=L/N_pixels/nu.m)
 
-    ift.plot(ift.Field(sspace2, mock_signal.val)/nu.K, name="mock_signal.png")
-    data = ift.dobj.to_global_data(data.val).reshape(sspace2.shape)
-    data = ift.Field(sspace2, val=ift.dobj.from_global_data(data))
-    ift.plot(ift.Field(sspace2, val=data), name="data.png")
-    ift.plot(ift.Field(sspace2, m_s.val)/nu.K, name="map.png")
+    ift.plot(ift.Field(sspace2, mock_signal.val)/nu.K, title="mock_signal.png")
+    #data = ift.dobj.to_global_data(data.val).reshape(sspace2.shape)
+    #data = ift.Field(sspace2, val=ift.dobj.from_global_data(data))
+    ift.plot(ift.Field(sspace2, val=R.adjoint_times(data).val), title="data.png")
+    print "msig",np.min(mock_signal.val)/nu.K, np.max(mock_signal.val)/nu.K
+    print "map",np.min(m_s.val)/nu.K, np.max(m_s.val)/nu.K
+    ift.plot(ift.Field(sspace2, m_s.val)/nu.K, title="map.png")

demos/wiener_filter_via_hamiltonian.py

@@ -11,7 +11,7 @@ if __name__ == "__main__":
 
     # Define associated harmonic space and harmonic transformation
     h_space = s_space.get_default_codomain()
-    fft = ift.FFTOperator(h_space, s_space)
+    fft = ift.HarmonicTransformOperator(h_space, s_space)
 
     # Setting up power space
     p_space = ift.PowerSpace(h_space)

docs/source/start.rst

@@ -116,7 +116,6 @@ typical examples for this category are the :py:class:`ScalingOperator`, which si
 
 Nifty4 allows simple and intuitive construction of combined operators.
 As an example, if :math:`A`, :math:`B` and :math:`C` are of type :py:class:`LinearOperator` and :math:`f_1` and :math:`f_2` are fields, writing::
-
     X = A*B.inverse*A.adjoint + C
     f2 = X(f1)
 

nifty4/__init__.py

@@ -19,6 +19,7 @@ from .operators.linear_operator import LinearOperator
 from .operators.endomorphic_operator import EndomorphicOperator
 from .operators.scaling_operator import ScalingOperator
 from .operators.diagonal_operator import DiagonalOperator
+from .operators.harmonic_transform_operator import HarmonicTransformOperator
 from .operators.fft_operator import FFTOperator
 from .operators.fft_smoothing_operator import FFTSmoothingOperator
 from .operators.direct_smoothing_operator import DirectSmoothingOperator
@@ -44,6 +45,7 @@ from .minimization.descent_minimizer import DescentMinimizer
 from .minimization.steepest_descent import SteepestDescent
 from .minimization.vl_bfgs import VL_BFGS
 from .minimization.relaxed_newton import RelaxedNewton
+from .minimization.scipy_minimizer import NewtonCG, L_BFGS_B
 from .minimization.energy import Energy
 from .minimization.quadratic_energy import QuadraticEnergy
 from .minimization.line_energy import LineEnergy

nifty4/data_objects/distributed_do.py

@@ -27,6 +27,10 @@ rank = _comm.Get_rank()
 master = (rank == 0)
 
 
+def is_numpy():
+    return False
+
+
 def mprint(*args):
     if master:
         print(*args)
@@ -259,6 +263,7 @@ class data_object(object):
     def fill(self, value):
         self._data.fill(value)
 
+
 def full(shape, fill_value, dtype=None, distaxis=0):
     return data_object(shape, np.full(local_shape(shape, distaxis),
                                       fill_value, dtype), distaxis)
@@ -346,7 +351,7 @@ def local_data(arr):
 
 def ibegin_from_shape(glob_shape, distaxis=0):
     res = [0] * len(glob_shape)
-    if distaxis<0:
+    if distaxis < 0:
         return res
     res[distaxis] = _shareRange(glob_shape[distaxis], ntask, rank)[0]
     return tuple(res)

nifty4/data_objects/numpy_do.py

@@ -30,6 +30,10 @@ rank = 0
 master = True
 
 
+def is_numpy():
+    return True
+
+
 def mprint(*args):
     print(*args)
 

nifty4/dobj.py

@@ -33,4 +33,4 @@ __all__ = ["ntask", "rank", "master", "local_shape", "data_object", "full",
            "log", "tanh", "sqrt", "from_object", "from_random",
            "local_data", "ibegin", "ibegin_from_shape", "np_allreduce_sum",
            "distaxis", "from_local_data", "from_global_data", "to_global_data",
-           "redistribute", "default_distaxis", "mprint"]
+           "redistribute", "default_distaxis", "mprint", "is_numpy"]

nifty4/minimization/scipy_minimizer.py

+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
+
+from __future__ import division
+from .minimizer import Minimizer
+from ..field import Field
+from .. import dobj
+
+
+class ScipyMinimizer(Minimizer):
+    """Scipy-based minimizer
+
+    Parameters
+    ----------
+    controller : IterationController
+        Object that decides when to terminate the minimization.
+    method     : str
+        The selected Scipy minimization method.
+    options    : dictionary
+        A set of custom options for the selected minimizer.
+    """
+
+    def __init__(self, controller, method, options, need_hessp):
+        super(ScipyMinimizer, self).__init__()
+        if not dobj.is_numpy():
+            raise NotImplementedError
+        self._controller = controller
+        self._method = method
+        self._options = options
+        self._need_hessp = need_hessp
+
+    def __call__(self, energy):
+        class _MinimizationDone(BaseException):
+            pass
+
+        class _MinHelper(object):
+            def __init__(self, controller, energy):
+                self._controller = controller
+                self._energy = energy
+                self._domain = energy.position.domain
+
+            def _update(self, x):
+                pos = Field(self._domain, x.reshape(self._domain.shape))
+                if (pos.val != self._energy.position.val).any():
+                    self._energy = self._energy.at(pos)
+                    status = self._controller.check(self._energy)
+                    if status != self._controller.CONTINUE:
+                        raise _MinimizationDone
+
+            def fun(self, x):
+                self._update(x)
+                return self._energy.value
+
+            def jac(self, x):
+                self._update(x)
+                return self._energy.gradient.val.reshape(-1)
+
+            def hessp(self, x, p):
+                self._update(x)
+                vec = Field(self._domain, p.reshape(self._domain.shape))
+                res = self._energy.curvature(vec)
+                return res.val.reshape(-1)
+
+        import scipy.optimize as opt
+        hlp = _MinHelper(self._controller, energy)
+        energy = None
+        status = self._controller.start(hlp._energy)
+        if status != self._controller.CONTINUE:
+            return hlp._energy, status
+        try:
+            if self._need_hessp:
+                opt.minimize(hlp.fun, hlp._energy.position.val.reshape(-1),
+                             method=self._method, jac=hlp.jac,
+                             hessp=hlp.hessp,
+                             options=self._options)
+            else:
+                opt.minimize(hlp.fun, hlp._energy.position.val.reshape(-1),
+                             method=self._method, jac=hlp.jac,
+                             options=self._options)
+        except _MinimizationDone:
+            status = self._controller.check(hlp._energy)
+            return hlp._energy, self._controller.check(hlp._energy)
+        return hlp._energy, self._controller.ERROR
+
+
+def NewtonCG(controller):
+    return ScipyMinimizer(controller, "Newton-CG",
+                          {"xtol": 1e-20, "maxiter": None}, True)
+
+
+def L_BFGS_B(controller, maxcor=10):
+    return ScipyMinimizer(controller, "L-BFGS-B",
+                          {"ftol": 1e-20, "gtol": 1e-20, "maxcor": maxcor},
+                          False)

nifty4/minimization/scipy_minimizer.py.bak

+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
+
+from __future__ import division
+from .minimizer import Minimizer
+from ..field import Field
+from .. import dobj
+
+
+class ScipyMinimizer(Minimizer):
+    """Scipy-based minimizer
+
+    Parameters
+    ----------
+    controller : IterationController
+        Object that decides when to terminate the minimization.
+    """
+
+    def __init__(self, controller, method="trust-ncg"):
+        super(ScipyMinimizer, self).__init__()
+        if not dobj.is_numpy():
+            raise NotImplementedError
+        self._controller = controller
+        self._method = method
+
+    def __call__(self, energy):
+        class _MinimizationDone:
+            pass
+
+        class _MinHelper(object):
+            def __init__(self, controller, energy):
+                self._controller = controller
+                self._energy = energy
+                self._domain = energy.position.domain
+
+            def _update(self, x):
+                pos = Field(self._domain, x.reshape(self._domain.shape))
+                if (pos.val != self._energy.position.val).any():
+                    self._energy = self._energy.at(pos)
+                    status = self._controller.check(self._energy)
+                    if status != self._controller.CONTINUE:
+                        raise _MinimizationDone
+
+            def fun(self, x):
+                self._update(x)
+                return self._energy.value
+
+            def jac(self, x):
+                self._update(x)
+                return self._energy.gradient.val.reshape(-1)
+
+            def hessp(self, x, p):
+                self._update(x)
+                vec = Field(self._domain, p.reshape(self._domain.shape))
+                res = self._energy.curvature(vec)
+                return res.val.reshape(-1)
+
+        import scipy.optimize as opt
+        status = self._controller.start(energy)
+        if status != self._controller.CONTINUE:
+            return energy, status
+        hlp = _MinHelper(self._controller, energy)
+        options = {'disp': False,
+                   'xtol': 1e-15,
+                   'eps': 1.4901161193847656e-08,
+                   'return_all': False,
+                   'maxiter': None}
+        options = {'disp': False,
+                   'ftol': 1e-15,
+                   'gtol': 1e-15,
+                   'eps': 1.4901161193847656e-08}
+        try:
+            opt.minimize(hlp.fun, energy.position.val.reshape(-1),
+                         method=self._method, jac=hlp.jac,
+                         hessp=hlp.hessp,
+                         options=options)
+        except _MinimizationDone:
+            energy = hlp._energy
+            status = self._controller.check(energy)
+            return energy, status
+        return hlp._energy, self._controller.ERROR

nifty4/operators/fft_operator.py

@@ -23,42 +23,22 @@ from .linear_operator import LinearOperator
 from .. import dobj
 from .. import utilities
 from ..field import Field
-from ..spaces.gl_space import GLSpace
 
 
 class FFTOperator(LinearOperator):
-    """Transforms between a pair of position and harmonic domains.
-
-    Built-in domain pairs are
-
-      - a harmonic and a non-harmonic RGSpace (with matching distances)
-      - a HPSpace and a LMSpace
-      - a GLSpace and a LMSpace
-
-    Within a domain pair, both orderings are possible.
-
-    For RGSpaces, the operator provides the full set of operations.
-    For the sphere-related domains, it only supports the transform from
-    harmonic to position space and its adjoint; if the operator domain is
-    harmonic, this will be times() and adjoint_times(), otherwise
-    inverse_times() and adjoint_inverse_times()
+    """Transforms between a pair of position and harmonic RGSpaces.
 
     Parameters
     ----------
-    domain: Space or single-element tuple of Spaces
+    domain: Space, tuple of Spaces or DomainObject
         The domain of the data that is input by "times" and output by
         "adjoint_times".
+    target: Space
+        The target space of the transform operation.
+        If omitted, a space will be chosen automatically.
     space: the index of the space on which the operator should act
-        If None, it is set to 0 if domain contains exactly one space
-    target: Space or single-element tuple of Spaces (optional)
-        The domain of the data that is output by "times" and input by
-        "adjoint_times".
-        If omitted, a co-domain will be chosen automatically.
-        Whenever "domain" is an RGSpace, the codomain (and its parameters) are
-        uniquely determined.
-        For GLSpace, HPSpace, and LMSpace, a sensible (but not unique)
-        co-domain is chosen that should work satisfactorily in most situations,
-        but for full control, the user should explicitly specify a codomain.
+        If None, it is set to 0 if domain contains exactly one space.
+        domain[space] must be an RGSpace.
     """
 
     def __init__(self, domain, target=None, space=None):
@@ -69,6 +49,8 @@ class FFTOperator(LinearOperator):
         self._space = utilities.infer_space(self._domain, space)
 
         adom = self._domain[self._space]
+        if not isinstance(adom, RGSpace):
+            raise TypeError("FFTOperator only works on RGSpaces")
         if target is None:
             target = adom.get_default_codomain()
 
@@ -78,47 +60,18 @@ class FFTOperator(LinearOperator):
         adom.check_codomain(target)
         target.check_codomain(adom)
 
-        if isinstance(adom, RGSpace):
-            self._applyfunc = self._apply_cartesian
-            self._capability = self._all_ops
-            import pyfftw
-            pyfftw.interfaces.cache.enable()
-        else:
-            from pyHealpix import sharpjob_d
-            self._applyfunc = self._apply_spherical
-            hspc = adom if adom.harmonic else target
-            pspc = target if adom.harmonic else adom
-            self.lmax = hspc.lmax
-            self.mmax = hspc.mmax
-            self.sjob = sharpjob_d()
-            self.sjob.set_triangular_alm_info(self.lmax, self.mmax)
-            if isinstance(pspc, GLSpace):
-                self.sjob.set_Gauss_geometry(pspc.nlat, pspc.nlon)
-            else:
-                self.sjob.set_Healpix_geometry(pspc.nside)
-            if adom.harmonic:
-                self._capability = self.TIMES | self.ADJOINT_TIMES
-            else:
-                self._capability = (self.INVERSE_TIMES |
-                                    self.INVERSE_ADJOINT_TIMES)
+        import pyfftw
+        pyfftw.interfaces.cache.enable()
 
     def apply(self, x, mode):
         self._check_input(x, mode)
         if np.issubdtype(x.dtype, np.complexfloating):
-            return (self._applyfunc(x.real, mode) +
-                    1j*self._applyfunc(x.imag, mode))
+            return (self._apply_cartesian(x.real, mode) +
+                    1j*self._apply_cartesian(x.imag, mode))
         else:
-            return self._applyfunc(x, mode)
+            return self._apply_cartesian(x, mode)
 
     def _apply_cartesian(self, x, mode):
-        """
-        RG -> RG transform method.
-
-        Parameters
-        ----------
-        x : Field
-            The field to be transformed
-        """
         from pyfftw.interfaces.numpy_fft import fftn
         axes = x.domain.axes[self._space]