Skip to content

Commit ec00f13

Browse files
committed
Bump to latest C-Blosc2 sources, and all tests *should* be passing now
1 parent c81a6fd commit ec00f13

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ else()
5050
include(FetchContent)
5151
FetchContent_Declare(blosc2
5252
GIT_REPOSITORY https://github.com/Blosc/c-blosc2
53-
GIT_TAG 40783eb33269883aa090daf04e091dbe39317fb9 # v2.17.1 + mmap fix + concatenate
53+
GIT_TAG 092296e26defdcbf117dccb8fca0bfc23ecaf024 # v2.17.1 + mmap fix + concatenate
5454
)
5555
FetchContent_MakeAvailable(blosc2)
5656
include_directories("${blosc2_SOURCE_DIR}/include")

src/blosc2/ndarray.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3577,7 +3577,7 @@ def concatenate(arrays: list[NDArray], /, axis=0, **kwargs: Any) -> NDArray: #
35773577
f"{arr1.shape} vs {arr2.shape}"
35783578
)
35793579

3580-
# Procced with the actual concatenation
3580+
# Proceed with the actual concatenation
35813581
copy = True
35823582
for arr2 in arrays[1:]:
35833583
arr1 = blosc2_ext.concatenate(arr1, arr2, axis, copy=copy, **kwargs)

tests/ndarray/test_concatenate.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
([21, 121, 101, 10], [2, 121, 101, 10], "f4", 0),
2727
([121, 21, 101, 10], [121, 12, 101, 10], "i8", 1),
2828
([121, 121, 10, 10], [121, 121, 1, 10], "i8", 2),
29-
# TODO: this test fails
30-
# ([121, 121, 101, 2], [121, 121, 101, 10], "i8", -1),
29+
([121, 121, 101, 2], [121, 121, 101, 10], "i8", -1),
3130
],
3231
)
3332
def test_concat2(shape1, shape2, dtype, axis):
@@ -47,12 +46,11 @@ def test_concat2(shape1, shape2, dtype, axis):
4746
([521, 121, 10], [121, 121, 10], [21, 121, 10], "f4", 0),
4847
([121, 521, 10], [121, 121, 10], [121, 21, 10], "f8", 1),
4948
([121, 121, 101], [121, 121, 10], [121, 121, 1], "i4", 2),
50-
# # 4-dimensional arrays
49+
# 4-dimensional arrays
5150
([21, 121, 101, 10], [2, 121, 101, 10], [1, 121, 101, 10], "f4", 0),
5251
([121, 21, 101, 10], [121, 12, 101, 10], [121, 1, 101, 10], "i8", 1),
5352
([121, 121, 10, 10], [121, 121, 1, 10], [121, 121, 3, 10], "i8", 2),
54-
# TODO: this test fails
55-
# ([121, 121, 101, 2], [121, 121, 101, 10], [121, 121, 101, 1], "i8", -1),
53+
([121, 121, 101, 2], [121, 121, 101, 10], [121, 121, 101, 1], "i8", -1),
5654
],
5755
)
5856
def test_concat3(shape1, shape2, shape3, dtype, axis):

0 commit comments

Comments
 (0)