Merge pull request #5 from mrava87/master

Changes required by 3D implementation of Marchenko application

Author: mrava87

pylops_distributed/optimization/cg.py

@@ -101,8 +101,7 @@ def cgls(A, y, x=None, niter=10, damp=0., tol=1e-4,
     tol : :obj:`float`, optional
         Tolerance on residual norm
     compute : :obj:`tuple`, optional
-        Dask client. If provided when ``compute=None`` each iteration
-        is persisted. This is the preferred method.
+        Compute intermediate results at the end of every iteration
     client : :obj:`dask.distributed.client.Client`, optional
         Dask client. If provided when ``compute=None`` each iteration
         is persisted. This is the preferred method to avoid repeating

pylops_distributed/signalprocessing/Fredholm1.py

@@ -64,7 +64,7 @@ def __init__(self, G, nz=1, saveGt=True, compute=(False, False),
         self.shape = (self.nsl * self.nx * self.nz,
                       self.nsl * self.ny * self.nz)
         if saveGt:
-            self.GT = G.transpose((0, 2, 1)).conj().persist()
+            self.GT = (G.transpose((0, 2, 1)).conj()).persist()
         else:
             # choose what to transpose if Gt is not saved
             self.transposeG = True if self.G.size < self.shape[0] else False

pylops_distributed/waveeqprocessing/marchenko.py

@@ -371,7 +371,7 @@ def apply_multiplepoints(self, trav, dist=None, G0=None, nfft=None,
 
         fd_plus = np.concatenate((np.flip(G0, axis=-1).transpose(2, 0, 1),
                                   np.zeros((self.nt - 1, self.nr, nvs))))
-        fd_plus = da.from_array(fd_plus)
+        fd_plus = da.from_array(fd_plus).rechunk(fd_plus.shape)
 
         # Run standard redatuming as benchmark
         if rtm:

pylops_distributed/waveeqprocessing/mdd.py

@@ -62,10 +62,12 @@ def MDC(G, nt, nv, dt=1., dr=1., twosided=True,
                 _FFT=FFT, _Fredholm1=Fredholm1,
                 args_Fredholm1={'chunks': ((G.chunks[0], G.shape[2], nv),
                                            (G.chunks[0], G.shape[1], nv))},
-                args_FFT={'chunks': (None, (nt, G.shape[2], nv)),
+                args_FFT={'chunks': ((nt, G.shape[2], nv),
+                                     (nt, G.shape[2], nv)),
                           'todask':(todask[0], False),
                           'compute': (False, compute[1])},
-                args_FFT1={'chunks': (None, (nt, G.shape[1], nv)),
+                args_FFT1={'chunks': ((nt, G.shape[1], nv),
+                                      (nt, G.shape[1], nv)),
                            'todask': (todask[1], False),
                            'compute':(compute[0], False)})