Skip to content
Snippets Groups Projects
Commit ff11c38f authored by Philipp Arras's avatar Philipp Arras
Browse files

Merge branch 'nifty_sync' into 'master'

Adapt to new nifty8 interface

See merge request !30
parents 5baca2aa b6ec82ba
No related branches found
No related tags found
1 merge request!30Adapt to new nifty8 interface
Pipeline #113652 failed
...@@ -24,7 +24,7 @@ def getop(comm, typ): ...@@ -24,7 +24,7 @@ def getop(comm, typ):
ddom = ift.UnstructuredDomain(d[0].shape) ddom = ift.UnstructuredDomain(d[0].shape)
ops = [ ops = [
ift.GaussianEnergy( ift.GaussianEnergy(
ift.makeField(ddom, d[ii]), ift.makeOp(ift.makeField(ddom, invcov[ii])) ift.makeField(ddom, d[ii]), ift.makeOp(ift.makeField(ddom, invcov[ii]), sampling_dtype=d[ii].dtype)
) )
@ ift.DomainTupleFieldInserter(skydom, 0, (ii,)).adjoint @ ift.DomainTupleFieldInserter(skydom, 0, (ii,)).adjoint
for ii in range(nwork) for ii in range(nwork)
...@@ -39,7 +39,7 @@ def getop(comm, typ): ...@@ -39,7 +39,7 @@ def getop(comm, typ):
for ii in local_indices: for ii in local_indices:
ddom = ift.UnstructuredDomain(d[ii].shape) ddom = ift.UnstructuredDomain(d[ii].shape)
dd = ift.makeField(ddom, d[ii]) dd = ift.makeField(ddom, d[ii])
iicc = ift.makeOp(ift.makeField(ddom, invcov[ii])) iicc = ift.makeOp(ift.makeField(ddom, invcov[ii]), sampling_dtype=d[ii].dtype)
ee = ift.GaussianEnergy(dd, iicc) ee = ift.GaussianEnergy(dd, iicc)
if typ == 0: if typ == 0:
ee = ee @ ift.DomainTupleFieldInserter(skydom, 0, (ii,)).adjoint ee = ee @ ift.DomainTupleFieldInserter(skydom, 0, (ii,)).adjoint
...@@ -117,6 +117,7 @@ def test_mpi_adder(): ...@@ -117,6 +117,7 @@ def test_mpi_adder():
lin = ift.Linearization.make_var(ift.from_random(dom), True) lin = ift.Linearization.make_var(ift.from_random(dom), True)
samps_lh, samps_ham = [], [] samps_lh, samps_ham = [], []
for ii, (llhh, hh) in enumerate(zip(lhs_for_sampling, hams_for_sampling)): for ii, (llhh, hh) in enumerate(zip(lhs_for_sampling, hams_for_sampling)):
print(ii)
with ift.random.Context(42): with ift.random.Context(42):
samps_lh.append(llhh(lin).metric.draw_sample()) samps_lh.append(llhh(lin).metric.draw_sample())
with ift.random.Context(42): with ift.random.Context(42):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment