Skip to content

Commit 29a4dc2

Browse files
committed
Merge branch 'feature-jax' of https://github.com/mrava87/pylops into feature-jax
2 parents 5a8a20b + 162d72a commit 29a4dc2

File tree

8 files changed

+55
-160
lines changed

8 files changed

+55
-160
lines changed

pylops/basicoperators/firstderivative.py

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -102,30 +102,13 @@ def __init__(
102102
self.order = order
103103
self.slice = {
104104
i: {
105-
j: tuple(
106-
[
107-
slice(None, None),
108-
]
109-
* (len(dims) - 1)
110-
+ [
111-
slice(i, j),
112-
]
113-
)
105+
j: tuple([slice(None, None)] * (len(dims) - 1) + [slice(i, j)])
114106
for j in (None, -1, -2, -3, -4)
115107
}
116108
for i in (None, 1, 2, 3, 4)
117109
}
118110
self.sample = {
119-
i: tuple(
120-
[
121-
slice(None, None),
122-
]
123-
* (len(dims) - 1)
124-
+ [
125-
i,
126-
]
127-
)
128-
for i in range(-3, 4)
111+
i: tuple([slice(None, None)] * (len(dims) - 1) + [i]) for i in range(-3, 4)
129112
}
130113
self._register_multiplications(self.kind, self.order)
131114

pylops/basicoperators/secondderivative.py

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -92,30 +92,13 @@ def __init__(
9292
self.edge = edge
9393
self.slice = {
9494
i: {
95-
j: tuple(
96-
[
97-
slice(None, None),
98-
]
99-
* (len(dims) - 1)
100-
+ [
101-
slice(i, j),
102-
]
103-
)
95+
j: tuple([slice(None, None)] * (len(dims) - 1) + [slice(i, j)])
10496
for j in (None, -1, -2, -3, -4)
10597
}
10698
for i in (None, 1, 2, 3, 4)
10799
}
108100
self.sample = {
109-
i: tuple(
110-
[
111-
slice(None, None),
112-
]
113-
* (len(dims) - 1)
114-
+ [
115-
i,
116-
]
117-
)
118-
for i in range(-3, 4)
101+
i: tuple([slice(None, None)] * (len(dims) - 1) + [i]) for i in range(-3, 4)
119102
}
120103
self._register_multiplications(self.kind)
121104

pylops/basicoperators/symmetrize.py

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -80,32 +80,12 @@ def __init__(
8080
self.nsym = dims[self.axis]
8181
dimsd = list(dims)
8282
dimsd[self.axis] = 2 * dims[self.axis] - 1
83-
self.slice1 = tuple(
84-
[
85-
slice(None, None),
86-
]
87-
* (len(dims) - 1)
88-
+ [
89-
slice(1, None),
90-
]
91-
)
83+
self.slice1 = tuple([slice(None, None)] * (len(dims) - 1) + [slice(1, None)])
9284
self.slicensym_1 = tuple(
93-
[
94-
slice(None, None),
95-
]
96-
* (len(dims) - 1)
97-
+ [
98-
slice(self.nsym - 1, None),
99-
]
85+
[slice(None, None)] * (len(dims) - 1) + [slice(self.nsym - 1, None)]
10086
)
10187
self.slice_nsym_1 = tuple(
102-
[
103-
slice(None, None),
104-
]
105-
* (len(dims) - 1)
106-
+ [
107-
slice(None, self.nsym - 1),
108-
]
88+
[slice(None, None)] * (len(dims) - 1) + [slice(None, self.nsym - 1)]
10989
)
11090

11191
super().__init__(dtype=np.dtype(dtype), dims=dims, dimsd=dimsd, name=name)

pylops/basicoperators/vstack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
from scipy.sparse.linalg.interface import LinearOperator as spLinearOperator
1313
from scipy.sparse.linalg.interface import _get_dtype
1414
else:
15-
from scipy.sparse.linalg._interface import _get_dtype
1615
from scipy.sparse.linalg._interface import (
1716
LinearOperator as spLinearOperator,
1817
)
18+
from scipy.sparse.linalg._interface import _get_dtype
1919

2020
from typing import Callable, Optional, Sequence
2121

pylops/signalprocessing/fft.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,8 @@ def __init__(
6262
elif self.norm is _FFTNorms.ONE_OVER_N:
6363
self._scale = 1.0 / self.nfft
6464
self.slice = tuple(
65-
[
66-
slice(None, None),
67-
]
68-
* (len(self.dims) - 1)
69-
+ [
70-
slice(1, 1 + (self.nfft - 1) // 2),
71-
]
65+
[slice(None, None)] * (len(self.dims) - 1)
66+
+ [slice(1, 1 + (self.nfft - 1) // 2)]
7267
)
7368

7469
@reshaped

pylops/signalprocessing/nonstatconvolve1d.py

Lines changed: 9 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,8 @@ def _matvec(self, x: NDArray) -> NDArray:
163163
# x[..., ix : ix + 1] * h[hextremes[0] : hextremes[1]]
164164
# )
165165
sl = tuple(
166-
[
167-
slice(None, None),
168-
]
169-
* (len(self.dimsd) - 1)
170-
+ [
171-
slice(xextremes[0], xextremes[1]),
172-
]
166+
[slice(None, None)] * (len(self.dimsd) - 1)
167+
+ [slice(xextremes[0], xextremes[1])]
173168
)
174169
y = inplace_add(x[..., ix : ix + 1] * h[hextremes[0] : hextremes[1]], y, sl)
175170
return y
@@ -192,15 +187,7 @@ def _rmatvec(self, x: NDArray) -> NDArray:
192187
# h[hextremes[0] : hextremes[1]] * x[..., xextremes[0] : xextremes[1]],
193188
# axis=-1,
194189
# )
195-
sl = tuple(
196-
[
197-
slice(None, None),
198-
]
199-
* (len(self.dimsd) - 1)
200-
+ [
201-
ix,
202-
]
203-
)
190+
sl = tuple([slice(None, None)] * (len(self.dimsd) - 1) + [ix])
204191
y = inplace_set(
205192
ncp.sum(
206193
h[hextremes[0] : hextremes[1]]
@@ -350,47 +337,19 @@ def _interpolate_hadj(htmp, hs, hextremes, ix, oh, dh, nh):
350337
ih_closest = int(np.floor((ix - oh) / dh))
351338
if ih_closest < 0:
352339
# hs[0, hextremes[0] : hextremes[1]] += htmp
353-
sl = tuple(
354-
[
355-
0,
356-
]
357-
+ [
358-
slice(hextremes[0], hextremes[1]),
359-
]
360-
)
340+
sl = tuple([0] + [slice(hextremes[0], hextremes[1])])
361341
hs = inplace_add(htmp, hs, sl)
362342
elif ih_closest >= nh - 1:
363343
# hs[nh - 1, hextremes[0] : hextremes[1]] += htmp
364-
sl = tuple(
365-
[
366-
nh - 1,
367-
]
368-
+ [
369-
slice(hextremes[0], hextremes[1]),
370-
]
371-
)
344+
sl = tuple([nh - 1] + [slice(hextremes[0], hextremes[1])])
372345
hs = inplace_add(htmp, hs, sl)
373346
else:
374347
dh_closest = (ix - oh) / dh - ih_closest
375348
# hs[ih_closest, hextremes[0] : hextremes[1]] += (1 - dh_closest) * htmp
376-
sl = tuple(
377-
[
378-
ih_closest,
379-
]
380-
+ [
381-
slice(hextremes[0], hextremes[1]),
382-
]
383-
)
349+
sl = tuple([ih_closest] + [slice(hextremes[0], hextremes[1])])
384350
hs = inplace_add((1 - dh_closest) * htmp, hs, sl)
385351
# hs[ih_closest + 1, hextremes[0] : hextremes[1]] += dh_closest * htmp
386-
sl = tuple(
387-
[
388-
ih_closest + 1,
389-
]
390-
+ [
391-
slice(hextremes[0], hextremes[1]),
392-
]
393-
)
352+
sl = tuple([ih_closest + 1] + [slice(hextremes[0], hextremes[1])])
394353
hs = inplace_add(dh_closest * htmp, hs, sl)
395354
return hs
396355

@@ -412,13 +371,8 @@ def _matvec(self, x: NDArray) -> NDArray:
412371
# self.inp[..., ix : ix + 1] * h[hextremes[0] : hextremes[1]]
413372
# )
414373
sl = tuple(
415-
[
416-
slice(None, None),
417-
]
418-
* (len(self.dimsd) - 1)
419-
+ [
420-
slice(xextremes[0], xextremes[1]),
421-
]
374+
[slice(None, None)] * (len(self.dimsd) - 1)
375+
+ [slice(xextremes[0], xextremes[1])]
422376
)
423377
y = inplace_add(
424378
self.inp[..., ix : ix + 1] * h[hextremes[0] : hextremes[1]], y, sl

0 commit comments

Comments
 (0)