5->6

docs/source/installation.rst

@@ -5,10 +5,10 @@ Installation
 In the following, we assume a Debian-based Linux distribution. For other
 distributions, the "apt" lines will need slight changes.
 
-NIFTy5 and its mandatory dependencies can be installed via::
+NIFTy6 and its mandatory dependencies can be installed via::
 
     sudo apt-get install git python3 python3-pip python3-dev
-    pip3 install --user git+https://gitlab.mpcdf.mpg.de/ift/nifty.git@NIFTy_5
+    pip3 install --user git+https://gitlab.mpcdf.mpg.de/ift/nifty.git@NIFTy_6
     pip3 install --user git+https://gitlab.mpcdf.mpg.de/mtr/pypocketfft
 
 Plotting support is added via::

docs/source/volume.rst

@@ -148,7 +148,7 @@ A visualisation of this can be seen in figure 2, which displays the MAP inferenc
 Implementation in NIFTy
 .......................
 
-.. currentmodule:: nifty5
+.. currentmodule:: nifty6
 
 Most codes in NIFTy will contain the description of a measurement process or,
 more generally, a log-likelihood.

nifty5/__init__.py

@@ -99,4 +99,4 @@ if _scheme == "Samples":
     from .minimization.metric_gaussian_kl_mpi import MetricGaussianKL_MPI
 
 # We deliberately don't set __all__ here, because we don't want people to do a
-# "from nifty5 import *"; that would swamp the global namespace.
+# "from nifty6 import *"; that would swamp the global namespace.

nifty5/domains/gl_space.py

@@ -24,7 +24,7 @@ class GLSpace(StructuredDomain):
     """Represents a 2-sphere with Gauss-Legendre pixelization.
 
     Its harmonic partner domain is the
-    :class:`~nifty5.domains.lm_space.LMSpace`.
+    :class:`~nifty6.domains.lm_space.LMSpace`.
 
     Parameters
     ----------

nifty5/domains/hp_space.py

@@ -24,7 +24,7 @@ class HPSpace(StructuredDomain):
     """Represents 2-sphere with HEALPix discretization.
 
     Its harmonic partner domain is the
-    :class:`~nifty5.domains.lm_space.LMSpace`.
+    :class:`~nifty6.domains.lm_space.LMSpace`.
 
     Parameters
     ----------

nifty5/domains/lm_space.py

@@ -24,8 +24,8 @@ from .structured_domain import StructuredDomain
 class LMSpace(StructuredDomain):
     """Represents a set of spherical harmonic coefficients.
 
-    Its harmonic partner spaces are :class:`~nifty5.domains.hp_space.HPSpace`
-    and :class:`~nifty5.domains.gl_space.GLSpace`.
+    Its harmonic partner spaces are :class:`~nifty6.domains.hp_space.HPSpace`
+    and :class:`~nifty6.domains.gl_space.GLSpace`.
 
     Parameters
     ----------
@@ -152,7 +152,7 @@ class LMSpace(StructuredDomain):
         return self._mmax
 
     def get_default_codomain(self):
-        """Returns a :class:`~nifty5.domains.gl_space.GLSpace` object, which is
+        """Returns a :class:`~nifty6.domains.gl_space.GLSpace` object, which is
         capable of storing an accurate representation of data residing on
         `self`.
 

nifty5/domains/unstructured_domain.py

@@ -20,7 +20,7 @@ from .domain import Domain
 
 
 class UnstructuredDomain(Domain):
-    """A :class:`~nifty5.domains.domain.Domain` subclass for spaces with no
+    """A :class:`~nifty6.domains.domain.Domain` subclass for spaces with no
     associated geometry.
 
     Typically used for data spaces.

nifty5/field.py

@@ -595,10 +595,10 @@ class Field(object):
         return sqrt(self.var(spaces))
 
     def __repr__(self):
-        return "<nifty5.Field>"
+        return "<nifty6.Field>"
 
     def __str__(self):
-        return "nifty5.Field instance\n- domain      = " + \
+        return "nifty6.Field instance\n- domain      = " + \
                self._domain.__str__() + \
                "\n- val         = " + repr(self._val)
 

nifty5/logger.py

@@ -19,7 +19,7 @@
 def _logger_init():
     import logging
     from . import dobj
-    res = logging.getLogger('NIFTy5')
+    res = logging.getLogger('NIFTy6')
     res.setLevel(logging.DEBUG)
     res.propagate = False
     if dobj.rank == 0:

nifty5/minimization/conjugate_gradient.py

@@ -27,7 +27,7 @@ class ConjugateGradient(Minimizer):
 
     Parameters
     ----------
-    controller : :py:class:`nifty5.IterationController`
+    controller : :py:class:`nifty6.IterationController`
         Object that decides when to terminate the minimization.
     nreset : int
         every `nreset` CG steps the residual will be recomputed accurately

setup.py

@@ -23,20 +23,20 @@ def write_version():
     p = subprocess.Popen(["git", "describe", "--dirty", "--tags", "--always"],
                          stdout=subprocess.PIPE)
     res = p.communicate()[0].strip().decode('utf-8')
-    with open("nifty5/git_version.py", "w") as file:
+    with open("nifty6/git_version.py", "w") as file:
         file.write('gitversion = "{}"\n'.format(res))
 
 
 write_version()
-exec(open('nifty5/version.py').read())
+exec(open('nifty6/version.py').read())
 
-setup(name="nifty5",
+setup(name="nifty6",
       version=__version__,
       author="Theo Steininger, Martin Reinecke",
       author_email="martin@mpa-garching.mpg.de",
       description="Numerical Information Field Theory",
       url="http://www.mpa-garching.mpg.de/ift/nifty/",
-      packages=find_packages(include=["nifty5", "nifty5.*"]),
+      packages=find_packages(include=["nifty6", "nifty6.*"]),
       zip_safe=True,
       license="GPLv3",
       setup_requires=['scipy'],

test/test_energy_gradients.py

@@ -18,7 +18,7 @@
 import numpy as np
 import pytest
 
-import nifty5 as ift
+import nifty6 as ift
 from itertools import product
 
 # Currently it is not possible to parametrize fixtures. But this will

test/test_field.py

@@ -19,7 +19,7 @@ import numpy as np
 import pytest
 from numpy.testing import assert_allclose, assert_equal, assert_raises
 
-import nifty5 as ift
+import nifty6 as ift
 
 pmp = pytest.mark.parametrize
 SPACES = [ift.RGSpace((4,)), ift.RGSpace((5))]

test/test_gaussian_energy.py

@@ -18,7 +18,7 @@
 import numpy as np
 import pytest
 
-import nifty5 as ift
+import nifty6 as ift
 
 
 def _flat_PS(k):

test/test_kl.py

@@ -17,7 +17,7 @@
 
 import numpy as np
 
-import nifty5 as ift
+import nifty6 as ift
 from numpy.testing import assert_, assert_allclose
 import pytest
 

test/test_linearization.py

@@ -19,7 +19,7 @@ import numpy as np
 import pytest
 from numpy.testing import assert_, assert_allclose
 
-import nifty5 as ift
+import nifty6 as ift
 
 pmp = pytest.mark.parametrize
 

test/test_minimizers.py

@@ -21,7 +21,7 @@ import numpy as np
 import pytest
 from numpy.testing import assert_allclose, assert_equal
 
-import nifty5 as ift
+import nifty6 as ift
 
 pmp = pytest.mark.parametrize
 IC = ift.GradientNormController(tol_abs_gradnorm=1e-5, iteration_limit=1000)

test/test_multi_field.py

@@ -18,7 +18,7 @@
 import numpy as np
 from numpy.testing import assert_allclose, assert_equal
 
-import nifty5 as ift
+import nifty6 as ift
 
 dom = ift.makeDomain({"d1": ift.RGSpace(10)})
 

test/test_operators/test_adjoint.py

@@ -18,7 +18,7 @@
 import numpy as np
 import pytest
 
-import nifty5 as ift
+import nifty6 as ift
 
 from ..common import list2fixture
 

test/test_operators/test_composed_operator.py

@@ -17,7 +17,7 @@
 
 from numpy.testing import assert_allclose, assert_equal
 
-import nifty5 as ift
+import nifty6 as ift
 
 from ..common import list2fixture