Skip to content

bug: fix mdd to run with cupy when twosided=True and add_negative=True #659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrava87 merged 1 commit into from
Apr 26, 2025
Merged

bug: fix mdd to run with cupy when twosided=True and add_negative=True #659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions pylops/waveeqprocessing/mdd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,17 +405,19 @@ def MDD(

# Add negative part to data and model
if twosided and add_negative:
G = np.concatenate((ncp.zeros((ns, nr, nt - 1)), G), axis=-1)
d = np.concatenate((np.squeeze(np.zeros((ns, nv, nt - 1))), d), axis=-1)
G = ncp.concatenate((ncp.zeros((ns, nr, nt - 1), dtype=G.dtype), G), axis=-1)
d = ncp.concatenate(
(ncp.squeeze(ncp.zeros((ns, nv, nt - 1), dtype=d.dtype)), d), axis=-1
)
# Bring kernel to frequency domain
Gfft = np.fft.rfft(G, nt2, axis=-1)
Gfft = ncp.fft.rfft(G, nt2, axis=-1)
Gfft = Gfft[..., :nfmax]

# Bring frequency/time to first dimension
Gfft = np.moveaxis(Gfft, -1, 0)
d = np.moveaxis(d, -1, 0)
Gfft = ncp.moveaxis(Gfft, -1, 0)
d = ncp.moveaxis(d, -1, 0)
if psf:
G = np.moveaxis(G, -1, 0)
G = ncp.moveaxis(G, -1, 0)

# Define MDC linear operator
MDCop = MDC(
Expand Down Expand Up @@ -455,12 +457,12 @@ def MDD(
# Adjoint
if adjoint:
madj = MDCop.H * d.ravel()
madj = np.squeeze(madj.reshape(nt2, nr, nv))
madj = np.moveaxis(madj, 0, -1)
madj = ncp.squeeze(madj.reshape(nt2, nr, nv))
madj = ncp.moveaxis(madj, 0, -1)
if psf:
psfadj = PSFop.H * G.ravel()
psfadj = np.squeeze(psfadj.reshape(nt2, nr, nr))
psfadj = np.moveaxis(psfadj, 0, -1)
psfadj = ncp.squeeze(psfadj.reshape(nt2, nr, nr))
psfadj = ncp.moveaxis(psfadj, 0, -1)

# Inverse
if twosided and causality_precond:
Expand All @@ -481,8 +483,8 @@ def MDD(
ncp.zeros(int(MDCop.shape[1]), dtype=MDCop.dtype),
**kwargs_solver
)[0]
minv = np.squeeze(minv.reshape(nt2, nr, nv))
minv = np.moveaxis(minv, 0, -1)
minv = ncp.squeeze(minv.reshape(nt2, nr, nv))
minv = ncp.moveaxis(minv, 0, -1)

if wav is not None:
wav1 = wav.copy()
Expand All @@ -500,8 +502,8 @@ def MDD(
ncp.zeros(int(PSFop.shape[1]), dtype=PSFop.dtype),
**kwargs_solver
)[0]
psfinv = np.squeeze(psfinv.reshape(nt2, nr, nr))
psfinv = np.moveaxis(psfinv, 0, -1)
psfinv = ncp.squeeze(psfinv.reshape(nt2, nr, nr))
psfinv = ncp.moveaxis(psfinv, 0, -1)
if wav is not None:
wav1 = wav.copy()
for _ in range(psfinv.ndim - 1):
Expand Down