Skip to content

Commit 4af50cd

Browse files
committed
Remove in-place squeezes
1 parent f91bae7 commit 4af50cd

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

src/blosc2/linalg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ def matmul(x1: blosc2.Array, x2: blosc2.NDArray, **kwargs: Any) -> blosc2.NDArra
127127
result[chunk + (slice(row, row_end), slice(col, col_end))] += np.matmul(bx1, bx2)
128128

129129
if x1_is_vector:
130-
result.squeeze(axis=-2)
130+
result = result.squeeze(axis=-2)
131131
if x2_is_vector:
132-
result.squeeze(axis=-1)
132+
result = result.squeeze(axis=-1)
133133

134134
return result
135135

src/blosc2/ndarray.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4681,8 +4681,7 @@ def slice(self, key: int | slice | Sequence[slice], **kwargs: Any) -> NDArray:
46814681
for order, nchunk in enumerate(aligned_chunks):
46824682
chunk = self.schunk.get_chunk(nchunk)
46834683
newarr.schunk.update_chunk(order, chunk)
4684-
newarr.squeeze(axis=np.where(mask)[0]) # remove any dummy dims introduced
4685-
return newarr
4684+
return newarr.squeeze(axis=np.where(mask)[0]) # remove any dummy dims introduced
46864685

46874686
key = (start, stop)
46884687
ndslice = super().get_slice(key, mask, **kwargs)
@@ -4724,16 +4723,7 @@ def squeeze(self, axis: int | Sequence[int]) -> NDArray:
47244723
>>> a.shape
47254724
(23, 11)
47264725
"""
4727-
axis = [axis] if isinstance(axis, int) else axis
4728-
mask = [False for i in range(self.ndim)]
4729-
for a in axis:
4730-
if a < 0:
4731-
a += self.ndim # Adjust axis to be within the array's dimensions
4732-
if mask[a]:
4733-
raise ValueError("Axis values must be unique.")
4734-
mask[a] = True
4735-
super().squeeze(axis_mask=mask)
4736-
return self
4726+
return blosc2.squeeze(self, axis=axis)
47374727

47384728
def indices(self, order: str | list[str] | None = None, **kwargs: Any) -> NDArray:
47394729
"""

0 commit comments

Comments
 (0)