From 91f480e9efdd8cba27607aea3ce6cf8346b122a6 Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Tue, 26 Nov 2019 19:55:59 +0100
Subject: [PATCH] 5->6
---
.gitlab-ci.yml | 4 +-
README.md | 14 +++---
demos/Wiener_Filter.ipynb | 2 +-
demos/bench_gridder.py | 2 +-
demos/bernoulli_demo.py | 2 +-
demos/find_amplitude_parameters.py | 2 +-
demos/getting_started_1.py | 2 +-
demos/getting_started_2.py | 2 +-
demos/getting_started_3.py | 2 +-
demos/getting_started_mf.py | 2 +-
demos/misc/convolution.py | 2 +-
demos/multi_amplitudes_consistency.py | 2 +-
demos/newamplitudes.py | 2 +-
demos/polynomial_fit.py | 2 +-
docs/generate.sh | 2 +-
docs/source/citations.rst | 6 +--
docs/source/code.rst | 44 +++++++++----------
docs/source/conf.py | 8 ++--
docs/source/ift.rst | 4 +-
docs/source/index.rst | 2 +-
docs/source/installation.rst | 4 +-
docs/source/volume.rst | 2 +-
nifty5/__init__.py | 2 +-
nifty5/domains/gl_space.py | 2 +-
nifty5/domains/hp_space.py | 2 +-
nifty5/domains/lm_space.py | 6 +--
nifty5/domains/unstructured_domain.py | 2 +-
nifty5/field.py | 4 +-
nifty5/logger.py | 2 +-
nifty5/minimization/conjugate_gradient.py | 2 +-
setup.py | 8 ++--
test/test_energy_gradients.py | 2 +-
test/test_field.py | 2 +-
test/test_gaussian_energy.py | 2 +-
test/test_kl.py | 2 +-
test/test_linearization.py | 2 +-
test/test_minimizers.py | 2 +-
test/test_multi_field.py | 2 +-
test/test_operators/test_adjoint.py | 2 +-
test/test_operators/test_composed_operator.py | 2 +-
.../test_convolution_operators.py | 2 +-
test/test_operators/test_correlated_fields.py | 2 +-
test/test_operators/test_diagonal_operator.py | 2 +-
test/test_operators/test_fft_operator.py | 2 +-
.../test_harmonic_transform_operator.py | 2 +-
test/test_operators/test_jacobian.py | 2 +-
test/test_operators/test_nft.py | 2 +-
test/test_operators/test_regridding.py | 2 +-
test/test_operators/test_representation.py | 2 +-
test/test_operators/test_simplification.py | 4 +-
.../test_operators/test_smoothing_operator.py | 2 +-
test/test_operators/test_value_inserter.py | 2 +-
test/test_plot.py | 2 +-
test/test_spaces/test_gl_space.py | 2 +-
test/test_spaces/test_hp_space.py | 2 +-
test/test_spaces/test_interface.py | 2 +-
test/test_spaces/test_lm_space.py | 2 +-
test/test_spaces/test_power_space.py | 2 +-
test/test_spaces/test_rg_space.py | 2 +-
test/test_sugar.py | 2 +-
60 files changed, 102 insertions(+), 102 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abd5aed08..6dc1f58eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,7 @@ build_docker_from_cache:
test_serial:
stage: test
script:
- - pytest-3 -q --cov=nifty5 test
+ - pytest-3 -q --cov=nifty6 test
- >
python3 -m coverage report --omit "*plot*,*distributed_do*" | tee coverage.txt
- >
@@ -59,7 +59,7 @@ pages:
paths:
- public
only:
- - NIFTy_5
+ - NIFTy_6
before_script:
diff --git a/README.md b/README.md
index 42bfc14db..01cb26fff 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
NIFTy - Numerical Information Field Theory
==========================================
-[](https://gitlab.mpcdf.mpg.de/ift/NIFTy/commits/NIFTy_5)
-[](https://gitlab.mpcdf.mpg.de/ift/NIFTy/commits/NIFTy_5)
+[](https://gitlab.mpcdf.mpg.de/ift/NIFTy/commits/NIFTy_6)
+[](https://gitlab.mpcdf.mpg.de/ift/NIFTy/commits/NIFTy_6)
**NIFTy** project homepage:
[http://ift.pages.mpcdf.de/nifty](http://ift.pages.mpcdf.de/nifty)
@@ -59,8 +59,8 @@ Optional dependencies:
### Sources
-The current version of Nifty5 can be obtained by cloning the repository and
-switching to the NIFTy_5 branch:
+The current version of NIFTy6 can be obtained by cloning the repository and
+switching to the NIFTy_6 branch:
git clone https://gitlab.mpcdf.mpg.de/ift/nifty.git
@@ -69,10 +69,10 @@ switching to the NIFTy_5 branch:
In the following, we assume a Debian-based 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:
@@ -100,7 +100,7 @@ To run the tests, additional packages are required:
Afterwards the tests (including a coverage report) can be run using the
following command in the repository root:
- pytest-3 --cov=nifty5 test
+ pytest-3 --cov=nifty6 test
### First Steps
diff --git a/demos/Wiener_Filter.ipynb b/demos/Wiener_Filter.ipynb
index 8b6969725..0b6da7af6 100644
--- a/demos/Wiener_Filter.ipynb
+++ b/demos/Wiener_Filter.ipynb
@@ -141,7 +141,7 @@
"source": [
"import numpy as np\n",
"np.random.seed(40)\n",
- "import nifty5 as ift\n",
+ "import nifty6 as ift\n",
"import matplotlib.pyplot as plt\n",
"%matplotlib inline"
]
diff --git a/demos/bench_gridder.py b/demos/bench_gridder.py
index 48ae4f3b1..a35ef0268 100644
--- a/demos/bench_gridder.py
+++ b/demos/bench_gridder.py
@@ -3,7 +3,7 @@ from time import time
import matplotlib.pyplot as plt
import numpy as np
-import nifty5 as ift
+import nifty6 as ift
np.random.seed(40)
diff --git a/demos/bernoulli_demo.py b/demos/bernoulli_demo.py
index 77c4f975e..04c0ef266 100644
--- a/demos/bernoulli_demo.py
+++ b/demos/bernoulli_demo.py
@@ -24,7 +24,7 @@
import numpy as np
-import nifty5 as ift
+import nifty6 as ift
if __name__ == '__main__':
np.random.seed(41)
diff --git a/demos/find_amplitude_parameters.py b/demos/find_amplitude_parameters.py
index 1d7c76b8f..9a568130a 100644
--- a/demos/find_amplitude_parameters.py
+++ b/demos/find_amplitude_parameters.py
@@ -18,7 +18,7 @@
import numpy as np
-import nifty5 as ift
+import nifty6 as ift
import matplotlib.pyplot as plt
diff --git a/demos/getting_started_1.py b/demos/getting_started_1.py
index 3cd0e0e4b..3fb17ddcb 100644
--- a/demos/getting_started_1.py
+++ b/demos/getting_started_1.py
@@ -25,7 +25,7 @@ import sys
import numpy as np
-import nifty5 as ift
+import nifty6 as ift
def make_checkerboard_mask(position_space):
diff --git a/demos/getting_started_2.py b/demos/getting_started_2.py
index 18c8f025a..625042588 100644
--- a/demos/getting_started_2.py
+++ b/demos/getting_started_2.py
@@ -25,7 +25,7 @@ import sys
import numpy as np
-import nifty5 as ift
+import nifty6 as ift
def exposure_2d():
diff --git a/demos/getting_started_3.py b/demos/getting_started_3.py
index 5f0525207..2032c6b8c 100644
--- a/demos/getting_started_3.py
+++ b/demos/getting_started_3.py
@@ -29,7 +29,7 @@ import sys
import numpy as np
-import nifty5 as ift
+import nifty6 as ift
def random_los(n_los):
diff --git a/demos/getting_started_mf.py b/demos/getting_started_mf.py
index 0a6232da3..4492a0c86 100644
--- a/demos/getting_started_mf.py
+++ b/demos/getting_started_mf.py
@@ -29,7 +29,7 @@ import sys
import numpy as np
-import nifty5 as ift
+import nifty6 as ift
class SingleDomain(ift.LinearOperator):
diff --git a/demos/misc/convolution.py b/demos/misc/convolution.py
index 7d057775c..77498ecb5 100644
--- a/demos/misc/convolution.py
+++ b/demos/misc/convolution.py
@@ -1,5 +1,5 @@
import numpy as np
-import nifty5 as ift
+import nifty6 as ift
def convtest(test_signal, delta, func):
diff --git a/demos/multi_amplitudes_consistency.py b/demos/multi_amplitudes_consistency.py
index db128551e..ef8c24c9e 100644
--- a/demos/multi_amplitudes_consistency.py
+++ b/demos/multi_amplitudes_consistency.py
@@ -1,4 +1,4 @@
-import nifty5 as ift
+import nifty6 as ift
import numpy as np
diff --git a/demos/newamplitudes.py b/demos/newamplitudes.py
index 9c236490f..ad6ffb014 100644
--- a/demos/newamplitudes.py
+++ b/demos/newamplitudes.py
@@ -1,4 +1,4 @@
-import nifty5 as ift
+import nifty6 as ift
import numpy as np
np.random.seed(42)
diff --git a/demos/polynomial_fit.py b/demos/polynomial_fit.py
index cf5f776d8..93d04797f 100644
--- a/demos/polynomial_fit.py
+++ b/demos/polynomial_fit.py
@@ -18,7 +18,7 @@
import matplotlib.pyplot as plt
import numpy as np
-import nifty5 as ift
+import nifty6 as ift
np.random.seed(12)
diff --git a/docs/generate.sh b/docs/generate.sh
index 4dd659fc2..73828a382 100755
--- a/docs/generate.sh
+++ b/docs/generate.sh
@@ -1,3 +1,3 @@
rm -rf docs/build docs/source/mod
-sphinx-apidoc -e -o docs/source/mod nifty5
+sphinx-apidoc -e -o docs/source/mod nifty6
sphinx-build -b html docs/source/ docs/build/
diff --git a/docs/source/citations.rst b/docs/source/citations.rst
index b9c864a25..fba4b6535 100644
--- a/docs/source/citations.rst
+++ b/docs/source/citations.rst
@@ -2,8 +2,8 @@ NIFTy-related publications
==========================
::
- @article{asclnifty5,
- title={NIFTy5: Numerical Information Field Theory v5},
+ @article{asclnifty6,
+ title={NIFTy6: Numerical Information Field Theory v5},
author={Arras, Philipp and Baltac, Mihai and Ensslin, Torsten A and Frank, Philipp and Hutschenreuter, Sebastian and Knollmueller, Jakob and Leike, Reimar and Newrzella, Max-Niklas and Platz, Lukas and Reinecke, Martin and others},
journal={Astrophysics Source Code Library},
year={2019}
@@ -13,7 +13,7 @@ NIFTy-related publications
author = {{Martin Reinecke, Theo Steininger, Marco Selig}},
title = {NIFTy -- Numerical Information Field TheorY},
url = {https://gitlab.mpcdf.mpg.de/ift/NIFTy},
- version = {nifty5},
+ version = {nifty6},
date = {2018-04-05},
}
diff --git a/docs/source/code.rst b/docs/source/code.rst
index bb1439761..ea0895090 100644
--- a/docs/source/code.rst
+++ b/docs/source/code.rst
@@ -36,9 +36,9 @@ Domains
Abstract base class
-------------------
-.. currentmodule:: nifty5.domains.domain
+.. currentmodule:: nifty6.domains.domain
-One of the fundamental building blocks of the NIFTy5 framework is the *domain*.
+One of the fundamental building blocks of the NIFTy6 framework is the *domain*.
Its required capabilities are expressed by the abstract :py:class:`Domain` class.
A domain must be able to answer the following queries:
@@ -52,7 +52,7 @@ A domain must be able to answer the following queries:
Unstructured domains
--------------------
-.. currentmodule:: nifty5.domains.unstructured_domain
+.. currentmodule:: nifty6.domains.unstructured_domain
Domains can be either *structured* (i.e. there is geometrical information
associated with them, like position in space and volume factors),
@@ -65,7 +65,7 @@ Unstructured domains can be described by instances of NIFTy's
Structured domains
------------------
-.. currentmodule:: nifty5.domains.structured_domain
+.. currentmodule:: nifty6.domains.structured_domain
In contrast to unstructured domains, these domains have an assigned geometry.
NIFTy requires them to provide the volume elements of their grid cells.
@@ -86,7 +86,7 @@ The additional methods are specified in the abstract class
NIFTy comes with several concrete subclasses of :class:`StructuredDomain`:
-.. currentmodule:: nifty5.domains
+.. currentmodule:: nifty6.domains
- :class:`~rg_space.RGSpace` represents a regular Cartesian grid with an arbitrary
number of dimensions, which is supposed to be periodic in each dimension.
@@ -123,7 +123,7 @@ Some examples are:
(on a harmonic domain) and a few inferred model parameters (e.g. on an
unstructured grid).
-.. currentmodule:: nifty5
+.. currentmodule:: nifty6
Consequently, NIFTy defines a class called :class:`~domain_tuple.DomainTuple`
holding a sequence of :class:`~domains.domain.Domain` objects. The full domain is
@@ -228,7 +228,7 @@ Advanced operators
NIFTy provides a library of commonly employed operators which can be used for
specific inference problems. Currently these are:
-.. currentmodule:: nifty5.library
+.. currentmodule:: nifty6.library
- :class:`~smooth_linear_amplitude.SLAmplitude`, which returns a smooth power spectrum.
- :class:`~inverse_gamma_operator.InverseGammaOperator`, which models point sources which are
@@ -240,9 +240,9 @@ specific inference problems. Currently these are:
Linear Operators
================
-.. currentmodule:: nifty5.operators
+.. currentmodule:: nifty6.operators
-A linear operator (represented by NIFTy5's abstract
+A linear operator (represented by NIFTy6's abstract
:class:`~linear_operator.LinearOperator` class) is derived from
:class:`~operator.Operator` and can be interpreted as an (implicitly defined)
matrix. Since its operation is linear, it can provide some additional
@@ -282,7 +282,7 @@ This functionality is provided by NIFTy's
:class:`~inversion_enabler.InversionEnabler` class, which is itself a linear
operator.
-.. currentmodule:: nifty5.operators.operator
+.. currentmodule:: nifty6.operators.operator
Direct multiplication and adjoint inverse multiplication transform a field
defined on the operator's :attr:`~Operator.domain` to one defined on the
@@ -290,7 +290,7 @@ operator's :attr:`~Operator.target`, whereas adjoint multiplication and inverse
multiplication transform from :attr:`~Operator.target` to
:attr:`~Operator.domain`.
-.. currentmodule:: nifty5.operators
+.. currentmodule:: nifty6.operators
Operators with identical domain and target can be derived from
:class:`~endomorphic_operator.EndomorphicOperator`. Typical examples for this
@@ -299,7 +299,7 @@ multiplies its input by a scalar value, and
:class:`~diagonal_operator.DiagonalOperator`, which multiplies every value of
its input field with potentially different values.
-.. currentmodule:: nifty5
+.. currentmodule:: nifty6
Further operator classes provided by NIFTy are
@@ -317,7 +317,7 @@ Further operator classes provided by NIFTy are
Syntactic sugar
---------------
-Nifty5 allows simple and intuitive construction of altered and combined
+NIFTy allows simple and intuitive construction of altered and combined
operators.
As an example, if ``A``, ``B`` and ``C`` are of type :class:`~operators.linear_operator.LinearOperator`
and ``f1`` and ``f2`` are of type :class:`~field.Field`, writing::
@@ -325,7 +325,7 @@ and ``f1`` and ``f2`` are of type :class:`~field.Field`, writing::
X = A(B.inverse(A.adjoint)) + C
f2 = X(f1)
-.. currentmodule:: nifty5.operators.linear_operator
+.. currentmodule:: nifty6.operators.linear_operator
will perform the operation suggested intuitively by the notation, checking
domain compatibility while building the composed operator.
@@ -349,12 +349,12 @@ Minimization
Most problems in IFT are solved by (possibly nested) minimizations of
high-dimensional functions, which are often nonlinear.
-.. currentmodule:: nifty5.minimization
+.. currentmodule:: nifty6.minimization
Energy functionals
------------------
-In NIFTy5 such functions are represented by objects of type
+In NIFTy6 such functions are represented by objects of type
:class:`~energy.Energy`. These hold the prescription how to calculate the
function's :attr:`~energy.Energy.value`, :attr:`~energy.Energy.gradient` and
(optionally) :attr:`~energy.Energy.metric` at any given
@@ -362,11 +362,11 @@ function's :attr:`~energy.Energy.value`, :attr:`~energy.Energy.gradient` and
floating-point scalars, gradients have the form of fields defined on the energy's
position domain, and metrics are represented by linear operator objects.
-.. currentmodule:: nifty5
+.. currentmodule:: nifty6
Energies are classes that typically have to be provided by the user when
tackling new IFT problems. An example of concrete energy classes delivered with
-NIFTy5 is :class:`~minimization.quadratic_energy.QuadraticEnergy` (with
+NIFTy6 is :class:`~minimization.quadratic_energy.QuadraticEnergy` (with
position-independent metric, mainly used with conjugate gradient minimization).
For MGVI, NIFTy provides the :class:`~energy.Energy` subclass
@@ -394,14 +394,14 @@ functional for MGVI and minimize it.
Iteration control
-----------------
-.. currentmodule:: nifty5.minimization.iteration_controllers
+.. currentmodule:: nifty6.minimization.iteration_controllers
Iterative minimization of an energy requires some means of
checking the quality of the current solution estimate and stopping once
it is sufficiently accurate. In case of numerical problems, the iteration needs
to be terminated as well, returning a suitable error description.
-In NIFTy5, this functionality is encapsulated in the abstract
+In NIFTy6, this functionality is encapsulated in the abstract
:class:`IterationController` class, which is provided with the initial energy
object before starting the minimization, and is updated with the improved
energy after every iteration. Based on this information, it can either continue
@@ -418,7 +418,7 @@ in NIFTy can be found below, but users have complete freedom to implement custom
Minimization algorithms
-----------------------
-.. currentmodule:: nifty5.minimization
+.. currentmodule:: nifty6.minimization
All minimization algorithms in NIFTy inherit from the abstract
:class:`~minimizer.Minimizer` class, which presents a minimalistic interface
@@ -459,7 +459,7 @@ available under the names :class:`~scipy_minimizer.ScipyCG` and
Application to operator inversion
---------------------------------
-.. currentmodule:: nifty5
+.. currentmodule:: nifty6
The machinery presented here cannot only be used for minimizing functionals
derived from IFT, but also for the numerical inversion of linear operators, if
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 0c5b91200..1a0af1502 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -1,4 +1,4 @@
-import nifty5
+import nifty6
extensions = [
'sphinx.ext.napoleon', # Support for NumPy and Google style docstrings
@@ -15,11 +15,11 @@ napoleon_use_admonition_for_examples = True
napoleon_use_admonition_for_references = True
napoleon_include_special_with_doc = True
-project = u'NIFTy5'
+project = u'NIFTy6'
copyright = u'2013-2019, Max-Planck-Society'
author = u'Martin Reinecke'
-release = nifty5.version.__version__
+release = nifty6.version.__version__
version = release[:-2]
language = None
@@ -30,5 +30,5 @@ html_theme = "sphinx_rtd_theme"
html_logo = 'nifty_logo_black.png'
exclude_patterns = [
- 'mod/modules.rst', 'mod/nifty5.git_version.rst', 'mod/nifty5.logger.rst'
+ 'mod/modules.rst', 'mod/nifty6.git_version.rst', 'mod/nifty6.logger.rst'
]
diff --git a/docs/source/ift.rst b/docs/source/ift.rst
index 3b297d1ee..d3dbd6649 100644
--- a/docs/source/ift.rst
+++ b/docs/source/ift.rst
@@ -174,7 +174,7 @@ It only requires minimizing the information Hamiltonian, e.g. by a gradient desc
\frac{\partial \mathcal{H}(d,\xi)}{\partial \xi} = 0.
-NIFTy5 automatically calculates the necessary gradient from a generative model of the signal and the data and uses this to minimize the Hamiltonian.
+NIFTy6 automatically calculates the necessary gradient from a generative model of the signal and the data and uses this to minimize the Hamiltonian.
However, MAP often provides unsatisfactory results in cases of deep hirachical Bayesian networks.
The reason for this is that MAP ignores the volume factors in parameter space, which are not to be neglected in deciding whether a solution is reasonable or not.
@@ -224,7 +224,7 @@ Thus, only the gradient of the KL is needed with respect to this, which can be e
We stochastically estimate the KL-divergence and gradients with a set of samples drawn from the approximate posterior distribution.
The particular structure of the covariance allows us to draw independent samples solving a certain system of equations.
-This KL-divergence for MGVI is implemented in the class :class:`~minimization.metric_gaussian_kl.MetricGaussianKL` within NIFTy5.
+This KL-divergence for MGVI is implemented in the class :class:`~minimization.metric_gaussian_kl.MetricGaussianKL` within NIFTy6.
The demo `getting_started_3.py` for example not only infers a field this way, but also the power spectrum of the process that has generated the field.
diff --git a/docs/source/index.rst b/docs/source/index.rst
index dcda398fe..bf6ae6325 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -31,4 +31,4 @@ Contents
installation
code
citations
- Package Documentation <mod/nifty5>
+ Package Documentation <mod/nifty6>
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
index 38173a6c4..d8f9cca50 100644
--- a/docs/source/installation.rst
+++ b/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::
diff --git a/docs/source/volume.rst b/docs/source/volume.rst
index 89dc9419d..2b1318f09 100644
--- a/docs/source/volume.rst
+++ b/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.
diff --git a/nifty5/__init__.py b/nifty5/__init__.py
index e7989472f..1ddfd7966 100644
--- a/nifty5/__init__.py
+++ b/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.
diff --git a/nifty5/domains/gl_space.py b/nifty5/domains/gl_space.py
index 85a0dba99..8172af351 100644
--- a/nifty5/domains/gl_space.py
+++ b/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
----------
diff --git a/nifty5/domains/hp_space.py b/nifty5/domains/hp_space.py
index 605864733..a07a4e5c8 100644
--- a/nifty5/domains/hp_space.py
+++ b/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
----------
diff --git a/nifty5/domains/lm_space.py b/nifty5/domains/lm_space.py
index 5e0f30ffb..081106ee4 100644
--- a/nifty5/domains/lm_space.py
+++ b/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`.
diff --git a/nifty5/domains/unstructured_domain.py b/nifty5/domains/unstructured_domain.py
index a39127fba..60029938f 100644
--- a/nifty5/domains/unstructured_domain.py
+++ b/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.
diff --git a/nifty5/field.py b/nifty5/field.py
index fb02b781f..e7572c03f 100644
--- a/nifty5/field.py
+++ b/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)
diff --git a/nifty5/logger.py b/nifty5/logger.py
index 462141f2e..29ba83215 100644
--- a/nifty5/logger.py
+++ b/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:
diff --git a/nifty5/minimization/conjugate_gradient.py b/nifty5/minimization/conjugate_gradient.py
index 0dbc89a24..9028f38ab 100644
--- a/nifty5/minimization/conjugate_gradient.py
+++ b/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
diff --git a/setup.py b/setup.py
index 455e18d7c..667879bc1 100644
--- a/setup.py
+++ b/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'],
diff --git a/test/test_energy_gradients.py b/test/test_energy_gradients.py
index 0e6a9371f..1a2910547 100644
--- a/test/test_energy_gradients.py
+++ b/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
diff --git a/test/test_field.py b/test/test_field.py
index a39d214da..ac0fe753b 100644
--- a/test/test_field.py
+++ b/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))]
diff --git a/test/test_gaussian_energy.py b/test/test_gaussian_energy.py
index e77604ed3..c802187eb 100644
--- a/test/test_gaussian_energy.py
+++ b/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):
diff --git a/test/test_kl.py b/test/test_kl.py
index 79428c5b5..965ce10c5 100644
--- a/test/test_kl.py
+++ b/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
diff --git a/test/test_linearization.py b/test/test_linearization.py
index 8ca7eeafd..bcf7a4a26 100644
--- a/test/test_linearization.py
+++ b/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
diff --git a/test/test_minimizers.py b/test/test_minimizers.py
index 6d98335ee..d6ecd3aca 100644
--- a/test/test_minimizers.py
+++ b/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)
diff --git a/test/test_multi_field.py b/test/test_multi_field.py
index 2ed61ee29..fe27c5f75 100644
--- a/test/test_multi_field.py
+++ b/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)})
diff --git a/test/test_operators/test_adjoint.py b/test/test_operators/test_adjoint.py
index 3cfddd04d..9586edc9d 100644
--- a/test/test_operators/test_adjoint.py
+++ b/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
diff --git a/test/test_operators/test_composed_operator.py b/test/test_operators/test_composed_operator.py
index c89ca7bfb..aa710d429 100644
--- a/test/test_operators/test_composed_operator.py
+++ b/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
diff --git a/test/test_operators/test_convolution_operators.py b/test/test_operators/test_convolution_operators.py
index 78412cbc5..d61baf69c 100644
--- a/test/test_operators/test_convolution_operators.py
+++ b/test/test_operators/test_convolution_operators.py
@@ -17,7 +17,7 @@
from numpy.testing import assert_allclose
-import nifty5 as ift
+import nifty6 as ift
import numpy as np
from ..common import list2fixture
diff --git a/test/test_operators/test_correlated_fields.py b/test/test_operators/test_correlated_fields.py
index fc761fb69..c28425950 100644
--- a/test/test_operators/test_correlated_fields.py
+++ b/test/test_operators/test_correlated_fields.py
@@ -19,7 +19,7 @@ import pytest
from numpy.testing import assert_allclose
from numpy.random import seed
-import nifty5 as ift
+import nifty6 as ift
@pytest.mark.parametrize('sspace', [
diff --git a/test/test_operators/test_diagonal_operator.py b/test/test_operators/test_diagonal_operator.py
index 52f104f85..0ff501949 100644
--- a/test/test_operators/test_diagonal_operator.py
+++ b/test/test_operators/test_diagonal_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
diff --git a/test/test_operators/test_fft_operator.py b/test/test_operators/test_fft_operator.py
index 5cb78424f..3f9c178ea 100644
--- a/test/test_operators/test_fft_operator.py
+++ b/test/test_operators/test_fft_operator.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
from ..common import list2fixture
diff --git a/test/test_operators/test_harmonic_transform_operator.py b/test/test_operators/test_harmonic_transform_operator.py
index 94aab8f53..c275750da 100644
--- a/test/test_operators/test_harmonic_transform_operator.py
+++ b/test/test_operators/test_harmonic_transform_operator.py
@@ -19,7 +19,7 @@ import numpy as np
import pytest
from numpy.testing import assert_allclose
-import nifty5 as ift
+import nifty6 as ift
from ..common import list2fixture
diff --git a/test/test_operators/test_jacobian.py b/test/test_operators/test_jacobian.py
index 1de2ac4df..48a9feb21 100644
--- a/test/test_operators/test_jacobian.py
+++ b/test/test_operators/test_jacobian.py
@@ -18,7 +18,7 @@
import numpy as np
import pytest
-import nifty5 as ift
+import nifty6 as ift
from ..common import list2fixture
diff --git a/test/test_operators/test_nft.py b/test/test_operators/test_nft.py
index 78506bb43..a9ff43222 100644
--- a/test/test_operators/test_nft.py
+++ b/test/test_operators/test_nft.py
@@ -19,7 +19,7 @@ import numpy as np
import pytest
from numpy.testing import assert_
-import nifty5 as ift
+import nifty6 as ift
np.random.seed(40)
diff --git a/test/test_operators/test_regridding.py b/test/test_operators/test_regridding.py
index 9f804a622..d786f9731 100644
--- a/test/test_operators/test_regridding.py
+++ b/test/test_operators/test_regridding.py
@@ -17,7 +17,7 @@
from numpy.testing import assert_allclose
-import nifty5 as ift
+import nifty6 as ift
from ..common import list2fixture
diff --git a/test/test_operators/test_representation.py b/test/test_operators/test_representation.py
index 3bb2d8935..453bbb82e 100644
--- a/test/test_operators/test_representation.py
+++ b/test/test_operators/test_representation.py
@@ -18,7 +18,7 @@
import numpy as np
import pytest
-import nifty5 as ift
+import nifty6 as ift
from ..common import list2fixture
diff --git a/test/test_operators/test_simplification.py b/test/test_operators/test_simplification.py
index 36705bb12..e8732b0a6 100644
--- a/test/test_operators/test_simplification.py
+++ b/test/test_operators/test_simplification.py
@@ -17,11 +17,11 @@
from numpy.testing import assert_allclose, assert_equal
-import nifty5 as ift
+import nifty6 as ift
def test_simplification():
- from nifty5.operators.operator import _ConstantOperator
+ from nifty6.operators.operator import _ConstantOperator
f1 = ift.Field.full(ift.RGSpace(10), 2.)
op = ift.FFTOperator(f1.domain)
_, op2 = op.simplify_for_constant_input(f1)
diff --git a/test/test_operators/test_smoothing_operator.py b/test/test_operators/test_smoothing_operator.py
index 73c7adfdb..493a515b1 100644
--- a/test/test_operators/test_smoothing_operator.py
+++ b/test/test_operators/test_smoothing_operator.py
@@ -19,7 +19,7 @@ import numpy as np
import pytest
from numpy.testing import assert_allclose
-import nifty5 as ift
+import nifty6 as ift
from ..common import list2fixture
diff --git a/test/test_operators/test_value_inserter.py b/test/test_operators/test_value_inserter.py
index 942eb3f0f..e5259e1bb 100644
--- a/test/test_operators/test_value_inserter.py
+++ b/test/test_operators/test_value_inserter.py
@@ -19,7 +19,7 @@ import numpy as np
import pytest
from numpy.testing import assert_
-import nifty5 as ift
+import nifty6 as ift
@pytest.mark.parametrize('sp', [
diff --git a/test/test_plot.py b/test/test_plot.py
index f93d176d7..909ca1f20 100644
--- a/test/test_plot.py
+++ b/test/test_plot.py
@@ -17,7 +17,7 @@
import numpy as np
-import nifty5 as ift
+import nifty6 as ift
def test_plots():
diff --git a/test/test_spaces/test_gl_space.py b/test/test_spaces/test_gl_space.py
index ab35c5d4f..76a07cad1 100644
--- a/test/test_spaces/test_gl_space.py
+++ b/test/test_spaces/test_gl_space.py
@@ -22,7 +22,7 @@ import pytest
from numpy.testing import (assert_, assert_almost_equal, assert_equal,
assert_raises)
-from nifty5 import GLSpace
+from nifty6 import GLSpace
pmp = pytest.mark.parametrize
diff --git a/test/test_spaces/test_hp_space.py b/test/test_spaces/test_hp_space.py
index 9da92be51..f0b4f5d17 100644
--- a/test/test_spaces/test_hp_space.py
+++ b/test/test_spaces/test_hp_space.py
@@ -20,7 +20,7 @@ import pytest
from numpy.testing import (assert_, assert_almost_equal, assert_equal,
assert_raises)
-from nifty5 import HPSpace
+from nifty6 import HPSpace
pmp = pytest.mark.parametrize
# [nside, expected]
diff --git a/test/test_spaces/test_interface.py b/test/test_spaces/test_interface.py
index 9ce9129e7..71fc6c23a 100644
--- a/test/test_spaces/test_interface.py
+++ b/test/test_spaces/test_interface.py
@@ -20,7 +20,7 @@ from types import LambdaType
import pytest
from numpy.testing import assert_
-import nifty5 as ift
+import nifty6 as ift
pmp = pytest.mark.parametrize
diff --git a/test/test_spaces/test_lm_space.py b/test/test_spaces/test_lm_space.py
index 6ab8b4bf6..94a47c553 100644
--- a/test/test_spaces/test_lm_space.py
+++ b/test/test_spaces/test_lm_space.py
@@ -19,7 +19,7 @@ import numpy as np
import pytest
from numpy.testing import assert_, assert_allclose, assert_equal, assert_raises
-import nifty5 as ift
+import nifty6 as ift
pmp = pytest.mark.parametrize
# [lmax, expected]
diff --git a/test/test_spaces/test_power_space.py b/test/test_spaces/test_power_space.py
index f9a355324..39564ecbb 100644
--- a/test/test_spaces/test_power_space.py
+++ b/test/test_spaces/test_power_space.py
@@ -21,7 +21,7 @@ import numpy as np
import pytest
from numpy.testing import assert_, assert_allclose, assert_equal, assert_raises
-import nifty5 as ift
+import nifty6 as ift
pmp = pytest.mark.parametrize
diff --git a/test/test_spaces/test_rg_space.py b/test/test_spaces/test_rg_space.py
index 5a73485fd..fdf23053a 100644
--- a/test/test_spaces/test_rg_space.py
+++ b/test/test_spaces/test_rg_space.py
@@ -19,7 +19,7 @@ import numpy as np
import pytest
from numpy.testing import assert_, assert_allclose, assert_equal
-import nifty5 as ift
+import nifty6 as ift
pmp = pytest.mark.parametrize
# [shape, distances, harmonic, expected]
diff --git a/test/test_sugar.py b/test/test_sugar.py
index e354723b1..1264cbbd8 100644
--- a/test/test_sugar.py
+++ b/test/test_sugar.py
@@ -18,7 +18,7 @@
import numpy as np
from numpy.testing import assert_equal
-import nifty5 as ift
+import nifty6 as ift
def test_get_signal_variance():
--
GitLab