Skip to content

Commit abc0982

Browse files
prisaeprisae
committed
Adjust dottest(tol) to dottest(rtol)
1 parent d12bd2b commit abc0982

File tree

9 files changed

+108
-108
lines changed

9 files changed

+108
-108
lines changed

‎examples/plot_nmo.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ def _rmatvec(self, y):
296296
# and adjoint transforms truly are adjoints of each other.
297297

298298
NMOOp = NMO(t, x, vel_t)
299-
dottest(NMOOp, *NMOOp.shape, tol=1e-4)
299+
dottest(NMOOp, *NMOOp.shape, rtol=1e-4)
300300

301301
###############################################################################
302302
# NMO using :py:class:`pylops.Spread`
@@ -370,7 +370,7 @@ def create_tables(taxis, haxis, vels_rms):
370370
dtable=nmo_dtable, # Table of weights for linear interpolation
371371
engine="numba", # numba or numpy
372372
).H # To perform NMO *correction*, we need the adjoint
373-
dottest(SpreadNMO, *SpreadNMO.shape, tol=1e-4)
373+
dottest(SpreadNMO, *SpreadNMO.shape, rtol=1e-4)
374374

375375
###############################################################################
376376
# We see it passes the dot test, but are the results right? Let's find out.

‎pytests/test_derivative.py‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def test_FirstDerivative_centered(par):
9797
D1op = FirstDerivative(
9898
par["nx"], sampling=par["dx"], edge=par["edge"], dtype="float32"
9999
)
100-
assert dottest(D1op, par["nx"], par["nx"], tol=1e-3)
100+
assert dottest(D1op, par["nx"], par["nx"], rtol=1e-3)
101101

102102
x = (par["dx"] * np.arange(par["nx"])) ** 2
103103
yana = 2 * par["dx"] * np.arange(par["nx"])
@@ -113,7 +113,7 @@ def test_FirstDerivative_centered(par):
113113
edge=par["edge"],
114114
dtype="float32",
115115
)
116-
assert dottest(D1op, par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
116+
assert dottest(D1op, par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
117117

118118
x = np.outer((par["dy"] * np.arange(par["ny"])) ** 2, np.ones(par["nx"]))
119119
yana = np.outer(2 * par["dy"] * np.arange(par["ny"]), np.ones(par["nx"]))
@@ -130,7 +130,7 @@ def test_FirstDerivative_centered(par):
130130
edge=par["edge"],
131131
dtype="float32",
132132
)
133-
assert dottest(D1op, par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
133+
assert dottest(D1op, par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
134134

135135
x = np.outer((par["dy"] * np.arange(par["ny"])) ** 2, np.ones(par["nx"]))
136136
yana = np.zeros((par["ny"], par["nx"]))
@@ -151,7 +151,7 @@ def test_FirstDerivative_centered(par):
151151
D1op,
152152
par["nz"] * par["ny"] * par["nx"],
153153
par["nz"] * par["ny"] * par["nx"],
154-
tol=1e-3,
154+
rtol=1e-3,
155155
)
156156

157157
x = np.outer(
@@ -177,7 +177,7 @@ def test_FirstDerivative_centered(par):
177177
D1op,
178178
par["nz"] * par["ny"] * par["nx"],
179179
par["nz"] * par["ny"] * par["nx"],
180-
tol=1e-3,
180+
rtol=1e-3,
181181
)
182182

183183
x = np.outer(
@@ -201,7 +201,7 @@ def test_FirstDerivative_centered(par):
201201
D1op,
202202
par["nz"] * par["ny"] * par["nx"],
203203
par["nz"] * par["ny"] * par["nx"],
204-
tol=1e-3,
204+
rtol=1e-3,
205205
)
206206

207207
yana = np.zeros((par["nz"], par["ny"], par["nx"]))
@@ -223,7 +223,7 @@ def test_FirstDerivative_forwaback(par):
223223
D1op = FirstDerivative(
224224
par["nx"], sampling=par["dx"], edge=par["edge"], kind=kind, dtype="float32"
225225
)
226-
assert dottest(D1op, par["nx"], par["nx"], tol=1e-3)
226+
assert dottest(D1op, par["nx"], par["nx"], rtol=1e-3)
227227

228228
# 2d - derivative on 1st direction
229229
D1op = FirstDerivative(
@@ -235,7 +235,7 @@ def test_FirstDerivative_forwaback(par):
235235
kind=kind,
236236
dtype="float32",
237237
)
238-
assert dottest(D1op, par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
238+
assert dottest(D1op, par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
239239

240240
# 2d - derivative on 2nd direction
241241
D1op = FirstDerivative(
@@ -247,7 +247,7 @@ def test_FirstDerivative_forwaback(par):
247247
kind=kind,
248248
dtype="float32",
249249
)
250-
assert dottest(D1op, par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
250+
assert dottest(D1op, par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
251251

252252
# 3d - derivative on 1st direction
253253
D1op = FirstDerivative(
@@ -263,7 +263,7 @@ def test_FirstDerivative_forwaback(par):
263263
D1op,
264264
par["nz"] * par["ny"] * par["nx"],
265265
par["nz"] * par["ny"] * par["nx"],
266-
tol=1e-3,
266+
rtol=1e-3,
267267
)
268268

269269
# 3d - derivative on 2nd direction
@@ -280,7 +280,7 @@ def test_FirstDerivative_forwaback(par):
280280
D1op,
281281
par["nz"] * par["ny"] * par["nx"],
282282
par["nz"] * par["ny"] * par["nx"],
283-
tol=1e-3,
283+
rtol=1e-3,
284284
)
285285

286286
# 3d - derivative on 3rd direction
@@ -297,7 +297,7 @@ def test_FirstDerivative_forwaback(par):
297297
D1op,
298298
par["nz"] * par["ny"] * par["nx"],
299299
par["nz"] * par["ny"] * par["nx"],
300-
tol=1e-3,
300+
rtol=1e-3,
301301
)
302302

303303

@@ -321,7 +321,7 @@ def test_SecondDerivative_centered(par):
321321
D2op = SecondDerivative(
322322
par["nx"], sampling=par["dx"], edge=par["edge"], dtype="float32"
323323
)
324-
assert dottest(D2op, par["nx"], par["nx"], tol=1e-3)
324+
assert dottest(D2op, par["nx"], par["nx"], rtol=1e-3)
325325

326326
# polynomial f(x) = x^3, f''(x) = 6x
327327
f = x ** 3
@@ -339,7 +339,7 @@ def test_SecondDerivative_centered(par):
339339
dtype="float32",
340340
)
341341

342-
assert dottest(D2op, par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
342+
assert dottest(D2op, par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
343343

344344
# polynomial f(x,y) = y^3, f_{yy}(x,y) = 6y
345345
f = yy ** 3
@@ -358,7 +358,7 @@ def test_SecondDerivative_centered(par):
358358
dtype="float32",
359359
)
360360

361-
assert dottest(D2op, par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
361+
assert dottest(D2op, par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
362362

363363
# polynomial f(x,y) = x^3, f_{xx}(x,y) = 6x
364364
f = xx ** 3
@@ -381,7 +381,7 @@ def test_SecondDerivative_centered(par):
381381
D2op,
382382
par["nz"] * par["ny"] * par["nx"],
383383
par["nz"] * par["ny"] * par["nx"],
384-
tol=1e-3,
384+
rtol=1e-3,
385385
)
386386

387387
# polynomial f(x,y,z) = y^3, f_{yy}(x,y,z) = 6y
@@ -406,7 +406,7 @@ def test_SecondDerivative_centered(par):
406406
D2op,
407407
par["nz"] * par["ny"] * par["nx"],
408408
par["nz"] * par["ny"] * par["nx"],
409-
tol=1e-3,
409+
rtol=1e-3,
410410
)
411411

412412
# polynomial f(x,y,z) = x^3, f_{xx}(x,y,z) = 6x
@@ -431,7 +431,7 @@ def test_SecondDerivative_centered(par):
431431
D2op,
432432
par["nz"] * par["ny"] * par["nx"],
433433
par["ny"] * par["nx"] * par["nz"],
434-
tol=1e-3,
434+
rtol=1e-3,
435435
)
436436

437437
# polynomial f(x,y,z) = z^3, f_{zz}(x,y,z) = 6z
@@ -461,7 +461,7 @@ def test_SecondDerivative_forward(par):
461461
D2op = SecondDerivative(
462462
par["nx"], sampling=par["dx"], edge=par["edge"], kind="forward", dtype="float32"
463463
)
464-
assert dottest(D2op, par["nx"], par["nx"], tol=1e-3)
464+
assert dottest(D2op, par["nx"], par["nx"], rtol=1e-3)
465465

466466
# 2d - derivative on 1st direction
467467
D2op = SecondDerivative(
@@ -474,7 +474,7 @@ def test_SecondDerivative_forward(par):
474474
dtype="float32",
475475
)
476476

477-
assert dottest(D2op, par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
477+
assert dottest(D2op, par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
478478

479479
# 2d - derivative on 2nd direction
480480
D2op = SecondDerivative(
@@ -487,7 +487,7 @@ def test_SecondDerivative_forward(par):
487487
dtype="float32",
488488
)
489489

490-
assert dottest(D2op, par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
490+
assert dottest(D2op, par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
491491

492492
# 3d - derivative on 1st direction
493493
D2op = SecondDerivative(
@@ -504,7 +504,7 @@ def test_SecondDerivative_forward(par):
504504
D2op,
505505
par["nz"] * par["ny"] * par["nx"],
506506
par["nz"] * par["ny"] * par["nx"],
507-
tol=1e-3,
507+
rtol=1e-3,
508508
)
509509

510510
# 3d - derivative on 2nd direction
@@ -522,7 +522,7 @@ def test_SecondDerivative_forward(par):
522522
D2op,
523523
par["nz"] * par["ny"] * par["nx"],
524524
par["nz"] * par["ny"] * par["nx"],
525-
tol=1e-3,
525+
rtol=1e-3,
526526
)
527527

528528
# 3d - derivative on 3rd direction
@@ -540,7 +540,7 @@ def test_SecondDerivative_forward(par):
540540
D2op,
541541
par["nz"] * par["ny"] * par["nx"],
542542
par["ny"] * par["nx"] * par["nz"],
543-
tol=1e-3,
543+
rtol=1e-3,
544544
)
545545

546546

@@ -558,7 +558,7 @@ def test_Laplacian(par):
558558
edge=par["edge"],
559559
dtype="float32",
560560
)
561-
assert dottest(Dlapop, par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
561+
assert dottest(Dlapop, par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
562562

563563
# 2d - asymmetrical
564564
Dlapop = Laplacian(
@@ -569,7 +569,7 @@ def test_Laplacian(par):
569569
edge=par["edge"],
570570
dtype="float32",
571571
)
572-
assert dottest(Dlapop, par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
572+
assert dottest(Dlapop, par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
573573

574574
# 3d - symmetrical on 1st and 2nd direction
575575
Dlapop = Laplacian(
@@ -584,7 +584,7 @@ def test_Laplacian(par):
584584
Dlapop,
585585
par["nz"] * par["ny"] * par["nx"],
586586
par["nz"] * par["ny"] * par["nx"],
587-
tol=1e-3,
587+
rtol=1e-3,
588588
)
589589

590590
# 3d - symmetrical on 1st and 2nd direction
@@ -600,7 +600,7 @@ def test_Laplacian(par):
600600
Dlapop,
601601
par["nz"] * par["ny"] * par["nx"],
602602
par["nz"] * par["ny"] * par["nx"],
603-
tol=1e-3,
603+
rtol=1e-3,
604604
)
605605

606606
# 3d - symmetrical on all directions
@@ -616,7 +616,7 @@ def test_Laplacian(par):
616616
Dlapop,
617617
par["nz"] * par["ny"] * par["nx"],
618618
par["nz"] * par["ny"] * par["nx"],
619-
tol=1e-3,
619+
rtol=1e-3,
620620
)
621621

622622

@@ -634,7 +634,7 @@ def test_Gradient(par):
634634
kind=kind,
635635
dtype="float32",
636636
)
637-
assert dottest(Gop, 2 * par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
637+
assert dottest(Gop, 2 * par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
638638

639639
# 3d
640640
Gop = Gradient(
@@ -648,7 +648,7 @@ def test_Gradient(par):
648648
Gop,
649649
3 * par["nz"] * par["ny"] * par["nx"],
650650
par["nz"] * par["ny"] * par["nx"],
651-
tol=1e-3,
651+
rtol=1e-3,
652652
)
653653

654654

@@ -667,7 +667,7 @@ def test_FirstDirectionalDerivative(par):
667667
kind=kind,
668668
dtype="float32",
669669
)
670-
assert dottest(Fdop, par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
670+
assert dottest(Fdop, par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
671671

672672
# 3d
673673
Fdop = FirstDirectionalDerivative(
@@ -682,7 +682,7 @@ def test_FirstDirectionalDerivative(par):
682682
Fdop,
683683
par["nz"] * par["ny"] * par["nx"],
684684
par["nz"] * par["ny"] * par["nx"],
685-
tol=1e-3,
685+
rtol=1e-3,
686686
)
687687

688688

@@ -699,7 +699,7 @@ def test_SecondDirectionalDerivative(par):
699699
edge=par["edge"],
700700
dtype="float32",
701701
)
702-
assert dottest(Fdop, par["ny"] * par["nx"], par["ny"] * par["nx"], tol=1e-3)
702+
assert dottest(Fdop, par["ny"] * par["nx"], par["ny"] * par["nx"], rtol=1e-3)
703703

704704
# 3d
705705
Fdop = SecondDirectionalDerivative(
@@ -713,7 +713,7 @@ def test_SecondDirectionalDerivative(par):
713713
Fdop,
714714
par["nz"] * par["ny"] * par["nx"],
715715
par["nz"] * par["ny"] * par["nx"],
716-
tol=1e-3,
716+
rtol=1e-3,
717717
)
718718

719719

0 commit comments

Comments
 (0)