Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Neel Shah
NIFTy
Commits
87558763
Commit
87558763
authored
Jun 11, 2021
by
Martin Reinecke
Browse files
Merge branch 'isort' into 'NIFTy_7'
Apply isort to whole repository See merge request
ift/nifty!649
parents
92c9d1a6
e269754a
Changes
21
Hide whitespace changes
Inline
Side-by-side
demos/custom_nonlinearities.py
View file @
87558763
...
...
@@ -14,9 +14,10 @@
# Copyright(C) 2021 Max-Planck-Society
# Author: Philipp Arras
import
nifty7
as
ift
import
numpy
as
np
import
nifty7
as
ift
# In NIFTy, users can add hand-crafted point-wise nonlinearities that are then
# available for `Field`, `MultiField`, `Linearization` and `Operator`. This
# guide illustrates how this is done.
...
...
demos/parametric_variational_inference.py
View file @
87558763
...
...
@@ -29,9 +29,9 @@
###############################################################################
import
numpy
as
np
from
matplotlib
import
pyplot
as
plt
import
nifty7
as
ift
from
matplotlib
import
pyplot
as
plt
ift
.
random
.
push_sseq_from_seed
(
27
)
...
...
src/domains/lm_space.py
View file @
87558763
...
...
@@ -116,9 +116,11 @@ class LMSpace(StructuredDomain):
colatitude in radians, and return the kernel amplitude at that
colatitude.
"""
from
.gl_space
import
GLSpace
from
..operators.harmonic_operators
import
HarmonicTransformOperator
from
ducc0.misc
import
GL_thetas
from
..operators.harmonic_operators
import
HarmonicTransformOperator
from
.gl_space
import
GLSpace
# define azimuthally symmetric spaces for kernel transform
gl
=
GLSpace
(
self
.
lmax
+
1
,
1
)
lm0
=
gl
.
get_default_codomain
()
...
...
src/library/nft.py
View file @
87558763
...
...
@@ -59,7 +59,7 @@ class Gridder(LinearOperator):
self
.
_eps
=
float
(
eps
)
def
apply
(
self
,
x
,
mode
):
from
ducc0.wgridder
import
ms2
dirty
,
dirty
2ms
from
ducc0.wgridder
import
dirty
2ms
,
ms2
dirty
self
.
_check_input
(
x
,
mode
)
freq
=
np
.
array
([
speed_of_light
])
x
=
x
.
val
...
...
src/linearization.py
View file @
87558763
...
...
@@ -356,8 +356,8 @@ class Linearization(Operator):
The Jacobian has an empty input domain, i.e. its matrix representation
has 0 columns.
"""
from
.operators.simple_linear_operators
import
NullOperator
from
.multi_domain
import
MultiDomain
from
.operators.simple_linear_operators
import
NullOperator
return
Linearization
(
field
,
NullOperator
(
MultiDomain
.
make
({}),
field
.
domain
),
want_metric
=
want_metric
)
...
...
@@ -387,8 +387,8 @@ class Linearization(Operator):
-----
The Jacobian is square.
"""
from
.operators.scaling_operator
import
ScalingOperator
from
.operators.block_diagonal_operator
import
BlockDiagonalOperator
from
.operators.scaling_operator
import
ScalingOperator
if
len
(
constants
)
==
0
:
return
Linearization
.
make_var
(
field
,
want_metric
)
else
:
...
...
src/minimization/energy_adapter.py
View file @
87558763
...
...
@@ -18,12 +18,12 @@
import
numpy
as
np
from
..
import
random
from
..domain_tuple
import
DomainTuple
from
..linearization
import
Linearization
from
..minimization.energy
import
Energy
from
..utilities
import
myassert
,
allreduce_sum
from
..multi_domain
import
MultiDomain
from
..sugar
import
from_random
from
..
domain_tuple
import
DomainTuple
from
..
utilities
import
allreduce_sum
,
myassert
class
EnergyAdapter
(
Energy
):
...
...
src/minimization/kl_energies.py
View file @
87558763
...
...
@@ -16,28 +16,28 @@
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik.
import
numpy
as
np
from
functools
import
reduce
from
..
import
random
from
..
import
utilities
import
numpy
as
np
from
..
import
random
,
utilities
from
..domain_tuple
import
DomainTuple
from
..linearization
import
Linearization
from
..multi_field
import
MultiField
from
..operators.
inversion_enabler
import
InversionEnabl
er
from
..operators.
adder
import
Add
er
from
..operators.endomorphic_operator
import
EndomorphicOperator
from
..operators.energy_operators
import
StandardHamiltonian
,
GaussianEnergy
from
..operators.
sandwich_operator
import
SandwichOperato
r
from
..operators.energy_operators
import
GaussianEnergy
,
StandardHamiltonian
from
..operators.
inversion_enabler
import
InversionEnable
r
from
..operators.sampling_enabler
import
SamplingDtypeSetter
from
..operators.sandwich_operator
import
SandwichOperator
from
..operators.scaling_operator
import
ScalingOperator
from
.energy_adapter
import
EnergyAdapter
from
.quadratic_energy
import
QuadraticEnergy
from
..probing
import
approximation2endo
from
..sugar
import
makeOp
from
..operators.adder
import
Adder
from
..utilities
import
myassert
from
.descent_minimizers
import
ConjugateGradient
,
DescentMinimizer
from
.energy
import
Energy
from
.descent_minimizers
import
DescentMinimizer
,
ConjugateGradient
from
.energy_adapter
import
EnergyAdapter
from
.quadratic_energy
import
QuadraticEnergy
def
_get_lo_hi
(
comm
,
n_samples
):
...
...
@@ -48,9 +48,9 @@ def _get_lo_hi(comm, n_samples):
def
_modify_sample_domain
(
sample
,
domain
):
"""Takes only keys from sample which are also in domain and inserts zeros
for keys which are not in sample.domain."""
from
..multi_domain
import
MultiDomain
from
..field
import
Field
from
..domain_tuple
import
DomainTuple
from
..field
import
Field
from
..multi_domain
import
MultiDomain
from
..sugar
import
makeDomain
domain
=
makeDomain
(
domain
)
if
isinstance
(
domain
,
DomainTuple
)
and
isinstance
(
sample
,
Field
):
...
...
src/minimization/scipy_minimizer.py
View file @
87558763
...
...
@@ -155,7 +155,9 @@ class _ScipyCG(Minimizer):
self
.
_maxiter
=
maxiter
def
__call__
(
self
,
energy
,
preconditioner
=
None
):
from
scipy.sparse.linalg
import
LinearOperator
as
scipy_linop
,
cg
from
scipy.sparse.linalg
import
LinearOperator
as
scipy_linop
from
scipy.sparse.linalg
import
cg
from
.quadratic_energy
import
QuadraticEnergy
if
not
isinstance
(
energy
,
QuadraticEnergy
):
raise
ValueError
(
"need a quadratic energy for CG"
)
...
...
src/minimization/stochastic_minimizer.py
View file @
87558763
...
...
@@ -15,8 +15,8 @@
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik.
from
.minimizer
import
Minimizer
from
.energy
import
Energy
from
.minimizer
import
Minimizer
class
ADVIOptimizer
(
Minimizer
):
...
...
src/operators/energy_operators.py
View file @
87558763
...
...
@@ -25,13 +25,13 @@ from ..multi_domain import MultiDomain
from
..multi_field
import
MultiField
from
..sugar
import
makeDomain
,
makeOp
from
..utilities
import
myassert
from
.adder
import
Adder
from
.linear_operator
import
LinearOperator
from
.operator
import
Operator
from
.adder
import
Adder
from
.sampling_enabler
import
SamplingDtypeSetter
,
SamplingEnabler
from
.scaling_operator
import
ScalingOperator
from
.sandwich_operator
import
SandwichOperator
from
.simple_linear_operators
import
VdotOperator
,
FieldAdapter
from
.scaling_operator
import
ScalingOperator
from
.simple_linear_operators
import
FieldAdapter
,
VdotOperator
def
_check_sampling_dtype
(
domain
,
dtypes
):
...
...
src/operators/multifield2vector.py
View file @
87558763
...
...
@@ -17,9 +17,9 @@
import
numpy
as
np
from
..multi_domain
import
MultiDomain
from
..domain_tuple
import
DomainTuple
from
..domains.unstructured_domain
import
UnstructuredDomain
from
..multi_domain
import
MultiDomain
from
..sugar
import
makeField
from
.linear_operator
import
LinearOperator
...
...
src/operators/sum_operator.py
View file @
87558763
...
...
@@ -46,8 +46,8 @@ class SumOperator(LinearOperator):
@
staticmethod
def
simplify
(
ops
,
neg
):
from
.scaling_operator
import
ScalingOperator
from
.diagonal_operator
import
DiagonalOperator
from
.scaling_operator
import
ScalingOperator
# unpack SumOperators
opsnew
=
[]
...
...
src/plot.py
View file @
87558763
...
...
@@ -206,8 +206,8 @@ def _register_cmaps():
except
AttributeError
:
_register_cmaps
.
_cmaps_registered
=
True
from
matplotlib.colors
import
LinearSegmentedColormap
import
matplotlib.pyplot
as
plt
from
matplotlib.colors
import
LinearSegmentedColormap
planckcmap
=
{
'red'
:
((
0.
,
0.
,
0.
),
(.
4
,
0.
,
0.
),
(.
5
,
1.
,
1.
),
(.
7
,
1.
,
1.
),
(.
8
,
.
83
,
.
83
),
(.
9
,
.
67
,
.
67
),
(
1.
,
.
5
,
.
5
)),
...
...
src/sugar.py
View file @
87558763
...
...
@@ -32,8 +32,8 @@ from .operators.diagonal_operator import DiagonalOperator
from
.operators.distributors
import
PowerDistributor
from
.operators.operator
import
Operator
from
.operators.sampling_enabler
import
SamplingDtypeSetter
from
.operators.selection_operators
import
SliceOperator
from
.operators.scaling_operator
import
ScalingOperator
from
.operators.selection_operators
import
SliceOperator
from
.plot
import
Plot
__all__
=
[
'PS_field'
,
'power_analyze'
,
'create_power_operator'
,
...
...
@@ -473,10 +473,10 @@ def get_default_codomain(domainoid, space=None):
Optional index of the subdomain to be replaced by its default
codomain. `domain[space]` must be of class `RGSpace`.
"""
from
.domains.rg_space
import
RGSpace
from
.domains.hp_space
import
HPSpace
from
.domains.gl_space
import
GLSpace
from
.domains.hp_space
import
HPSpace
from
.domains.lm_space
import
LMSpace
from
.domains.rg_space
import
RGSpace
if
isinstance
(
domainoid
,
RGSpace
):
return
domainoid
.
get_default_codomain
()
if
not
isinstance
(
domainoid
,
DomainTuple
):
...
...
@@ -558,8 +558,8 @@ def calculate_position(operator, output):
from
.minimization.descent_minimizers
import
NewtonCG
from
.minimization.iteration_controllers
import
GradientNormController
from
.minimization.kl_energies
import
MetricGaussianKL
from
.operators.scaling_operator
import
ScalingOperator
from
.operators.energy_operators
import
GaussianEnergy
,
StandardHamiltonian
from
.operators.scaling_operator
import
ScalingOperator
if
not
isinstance
(
operator
,
Operator
):
raise
TypeError
if
output
.
domain
!=
operator
.
target
:
...
...
test/test_energy_gradients.py
View file @
87558763
...
...
@@ -15,10 +15,11 @@
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik.
import
nifty7
as
ift
import
numpy
as
np
import
pytest
import
nifty7
as
ift
from
.common
import
list2fixture
,
setup_function
,
teardown_function
spaces
=
[
ift
.
GLSpace
(
5
),
...
...
test/test_extra.py
View file @
87558763
...
...
@@ -14,15 +14,15 @@
# Copyright(C) 2021 Max-Planck-Society
# Author: Philipp Arras
from
time
import
time
import
numpy
as
np
import
pytest
import
nifty7
as
ift
from
time
import
time
from
.common
import
list2fixture
,
setup_function
,
teardown_function
pmp
=
pytest
.
mark
.
parametrize
...
...
test/test_operators/test_adjoint.py
View file @
87558763
...
...
@@ -15,10 +15,11 @@
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik.
import
nifty7
as
ift
import
numpy
as
np
import
pytest
import
nifty7
as
ift
from
..common
import
list2fixture
,
setup_function
,
teardown_function
_h_RG_spaces
=
[
ift
.
RGSpace
(
7
,
distances
=
0.2
,
harmonic
=
True
),
...
...
test/test_operators/test_diagonal_selector.py
View file @
87558763
...
...
@@ -15,12 +15,13 @@
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik.
import
nifty7
as
ift
import
numpy
as
np
import
pytest
from
nifty7.library.variational_models
import
DiagonalSelector
from
numpy.testing
import
assert_allclose
import
nifty7
as
ift
from
nifty7.library.variational_models
import
DiagonalSelector
from
..common
import
list2fixture
,
setup_function
,
teardown_function
pmp
=
pytest
.
mark
.
parametrize
...
...
test/test_operators/test_gaussian_entropy.py
View file @
87558763
...
...
@@ -15,12 +15,13 @@
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik.
import
nifty7
as
ift
import
numpy
as
np
import
pytest
from
nifty7.library.variational_models
import
GaussianEntropy
from
numpy.testing
import
assert_allclose
import
nifty7
as
ift
from
nifty7.library.variational_models
import
GaussianEntropy
from
..common
import
list2fixture
,
setup_function
,
teardown_function
pmp
=
pytest
.
mark
.
parametrize
...
...
test/test_operators/test_lower_triangular_inserter.py
View file @
87558763
...
...
@@ -15,12 +15,13 @@
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik.
import
nifty7
as
ift
import
numpy
as
np
import
pytest
from
nifty7.library.variational_models
import
LowerTriangularInserter
from
numpy.testing
import
assert_allclose
import
nifty7
as
ift
from
nifty7.library.variational_models
import
LowerTriangularInserter
from
..common
import
list2fixture
,
setup_function
,
teardown_function
pmp
=
pytest
.
mark
.
parametrize
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment