Commit 781be410 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

Merge branch 'NIFTy_6' into timing_helpers

parents 9587d27e af021fd3
Pipeline #64514 passed with stages
in 9 minutes and 52 seconds
......@@ -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::
......
......@@ -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.
......
......@@ -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.
......@@ -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
----------
......
......@@ -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
----------
......
......@@ -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`.
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment