Henry SchreinerandRalf W. Grosse-Kunstleve
57e7a8de34
* fix(stl_bind): correct __delitem__ for negative-step slices and re-enable contiguous erase fast path The slice __delitem__ binding advanced the erase index by step - 1 for all steps. That correction is only valid for positive steps, where erasing shifts later elements down by one. For negative steps the visited indices are strictly decreasing and erasing never shifts them, so the extra -1 deleted the wrong elements (e.g. del v[::-2] on [0,1,2,3] yielded [1,2] instead of [0,2]) and del v[::-1] walked off the front of the vector (v.begin() - 1, observed SIGBUS). Switch to the signed slice::compute overload so negative steps stay signed, advance by step for negative steps and step - 1 for positive ones, and drop the && false that had disabled the O(n) contiguous fast path since 2016. Assisted-by: ClaudeCode:claude-fable-5 * refactor: address review — static_cast and parametrized test Use static_cast instead of a C-style cast for the slice.compute() size argument, and convert the __delitem__ slice test to pytest.mark.parametrize over the slice cases. Assisted-by: ClaudeCode:claude-fable-5 * test(stl_bind): cover slice deletion edge cases * fix(stl_bind): erase strided slices in descending order * Eliminate a variable and avoid redundant index increment (i + 1, ++i). The control flow handles all relevant boundaries: - slicelength == 0: excluded by the outer guard. - slicelength == 1: erases once, decrements to zero, and breaks without touching start. - Larger slices: updates start exactly when another erase remains. - slicelength cannot underflow because the loop exits when it reaches zero. - Mutating slicelength is harmless because it is not used afterward. - The potentially dangerous final start += step remains eliminated. It also removes the separate loop counter. The compiler would probably optimize the former i + 1, ++i mechanics away, but the new source expresses the real state more directly: "number of erasures remaining." The unconditional while (true) is safe because entry is strictly guarded by slicelength > 0, and the decrement guarantees eventual termination. --------- Co-authored-by: Ralf W. Grosse-Kunstleve <rgrossekunst@nvidia.com>
451 lines
12 KiB
Python
451 lines
12 KiB
Python
from __future__ import annotations
|
|
|
|
import sys
|
|
|
|
import pytest
|
|
|
|
from pybind11_tests import stl_binders as m
|
|
|
|
|
|
def test_vector_int():
|
|
v_int = m.VectorInt([0, 0])
|
|
assert len(v_int) == 2
|
|
assert bool(v_int) is True
|
|
|
|
# test construction from a generator
|
|
v_int1 = m.VectorInt(x for x in range(5))
|
|
assert v_int1 == m.VectorInt([0, 1, 2, 3, 4])
|
|
|
|
v_int2 = m.VectorInt([0, 0])
|
|
assert v_int == v_int2
|
|
v_int2[1] = 1
|
|
assert v_int != v_int2
|
|
|
|
v_int2.append(2)
|
|
v_int2.insert(0, 1)
|
|
v_int2.insert(0, 2)
|
|
v_int2.insert(0, 3)
|
|
v_int2.insert(6, 3)
|
|
assert str(v_int2) == "VectorInt[3, 2, 1, 0, 1, 2, 3]"
|
|
with pytest.raises(IndexError):
|
|
v_int2.insert(8, 4)
|
|
|
|
v_int.append(99)
|
|
v_int2[2:-2] = v_int
|
|
assert v_int2 == m.VectorInt([3, 2, 0, 0, 99, 2, 3])
|
|
del v_int2[1:3]
|
|
assert v_int2 == m.VectorInt([3, 0, 99, 2, 3])
|
|
del v_int2[0]
|
|
assert v_int2 == m.VectorInt([0, 99, 2, 3])
|
|
|
|
v_int2.extend(m.VectorInt([4, 5]))
|
|
assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5])
|
|
|
|
v_int2.extend([6, 7])
|
|
assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7])
|
|
|
|
# test error handling, and that the vector is unchanged
|
|
with pytest.raises(RuntimeError):
|
|
v_int2.extend([8, "a"])
|
|
|
|
assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7])
|
|
|
|
# test extending from a generator
|
|
v_int2.extend(x for x in range(5))
|
|
assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4])
|
|
|
|
# test negative indexing
|
|
assert v_int2[-1] == 4
|
|
|
|
# insert with negative index
|
|
v_int2.insert(-1, 88)
|
|
assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 88, 4])
|
|
|
|
# delete negative index
|
|
del v_int2[-1]
|
|
assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 88])
|
|
|
|
v_int2.clear()
|
|
assert len(v_int2) == 0
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"s",
|
|
[
|
|
slice(1, 4),
|
|
slice(None, None, 2),
|
|
slice(1, None, 2),
|
|
slice(None, None, -1),
|
|
slice(None, None, -2),
|
|
slice(3, 1, -1),
|
|
slice(2, 2),
|
|
slice(None),
|
|
slice(5, 0, -2),
|
|
slice(-3, -1),
|
|
slice(None, None, -3),
|
|
slice(3, None, sys.maxsize),
|
|
slice(-2, -7, -2),
|
|
],
|
|
)
|
|
def test_vector_delitem_slice(s):
|
|
for n in range(8):
|
|
ref = list(range(n))
|
|
got = m.VectorInt(range(n))
|
|
del ref[s]
|
|
del got[s]
|
|
assert list(got) == ref, f"n={n}"
|
|
|
|
|
|
def test_vector_delitem_slice_step_zero():
|
|
v = m.VectorInt(range(8))
|
|
with pytest.raises(ValueError):
|
|
del v[::0]
|
|
assert list(v) == list(range(8))
|
|
|
|
|
|
# Older PyPy's failed here, related to the PyPy's buffer protocol.
|
|
def test_vector_buffer():
|
|
b = bytearray([1, 2, 3, 4])
|
|
v = m.VectorUChar(b)
|
|
assert v[1] == 2
|
|
v[2] = 5
|
|
mv = memoryview(v) # We expose the buffer interface
|
|
assert mv[2] == 5
|
|
mv[2] = 6
|
|
assert v[2] == 6
|
|
|
|
mv = memoryview(b)
|
|
v = m.VectorUChar(mv[::2])
|
|
assert v[1] == 3
|
|
|
|
with pytest.raises(RuntimeError) as excinfo:
|
|
m.create_undeclstruct() # Undeclared struct contents, no buffer interface
|
|
assert "NumPy type info missing for " in str(excinfo.value)
|
|
|
|
|
|
def test_vector_buffer_numpy():
|
|
np = pytest.importorskip("numpy")
|
|
a = np.array([1, 2, 3, 4], dtype=np.int32)
|
|
with pytest.raises(TypeError):
|
|
m.VectorInt(a)
|
|
|
|
a = np.array([[1, 2, 3, 4], [5, 6, 7, 8], [9, 10, 11, 12]], dtype=np.uintc)
|
|
v = m.VectorInt(a[0, :])
|
|
assert len(v) == 4
|
|
assert v[2] == 3
|
|
ma = np.asarray(v)
|
|
ma[2] = 5
|
|
assert v[2] == 5
|
|
|
|
v = m.VectorInt(a[:, 1])
|
|
assert len(v) == 3
|
|
assert v[2] == 10
|
|
|
|
v = m.get_vectorstruct()
|
|
assert v[0].x == 5
|
|
ma = np.asarray(v)
|
|
ma[1]["x"] = 99
|
|
assert v[1].x == 99
|
|
|
|
v = m.VectorStruct(
|
|
np.zeros(
|
|
3,
|
|
dtype=np.dtype(
|
|
[("w", "bool"), ("x", "I"), ("y", "float64"), ("z", "bool")], align=True
|
|
),
|
|
)
|
|
)
|
|
assert len(v) == 3
|
|
|
|
b = np.array([1, 2, 3, 4], dtype=np.uint8)
|
|
v = m.VectorUChar(b[::2])
|
|
assert v[1] == 3
|
|
|
|
|
|
def test_vector_bool():
|
|
import pybind11_cross_module_tests as cm
|
|
|
|
vv_c = cm.VectorBool()
|
|
for i in range(10):
|
|
vv_c.append(i % 2 == 0)
|
|
for i in range(10):
|
|
assert vv_c[i] == (i % 2 == 0)
|
|
assert str(vv_c) == "VectorBool[1, 0, 1, 0, 1, 0, 1, 0, 1, 0]"
|
|
|
|
|
|
def test_vector_custom():
|
|
v_a = m.VectorEl()
|
|
v_a.append(m.El(1))
|
|
v_a.append(m.El(2))
|
|
assert str(v_a) == "VectorEl[El{1}, El{2}]"
|
|
|
|
vv_a = m.VectorVectorEl()
|
|
vv_a.append(v_a)
|
|
vv_b = vv_a[0]
|
|
assert str(vv_b) == "VectorEl[El{1}, El{2}]"
|
|
|
|
|
|
def test_map_string_double():
|
|
mm = m.MapStringDouble()
|
|
mm["a"] = 1
|
|
mm["b"] = 2.5
|
|
|
|
assert list(mm) == ["a", "b"]
|
|
assert str(mm) == "MapStringDouble{a: 1, b: 2.5}"
|
|
assert "b" in mm
|
|
assert "c" not in mm
|
|
assert 123 not in mm
|
|
|
|
# Check that keys, values, items are views, not merely iterable
|
|
keys = mm.keys()
|
|
values = mm.values()
|
|
items = mm.items()
|
|
assert list(keys) == ["a", "b"]
|
|
assert len(keys) == 2
|
|
assert "a" in keys
|
|
assert "c" not in keys
|
|
assert 123 not in keys
|
|
assert list(items) == [("a", 1), ("b", 2.5)]
|
|
assert len(items) == 2
|
|
assert ("b", 2.5) in items
|
|
assert "hello" not in items
|
|
assert ("b", 2.5, None) not in items
|
|
assert list(values) == [1, 2.5]
|
|
assert len(values) == 2
|
|
assert 1 in values
|
|
assert 2 not in values
|
|
# Check that views update when the map is updated
|
|
mm["c"] = -1
|
|
assert list(keys) == ["a", "b", "c"]
|
|
assert list(values) == [1, 2.5, -1]
|
|
assert list(items) == [("a", 1), ("b", 2.5), ("c", -1)]
|
|
|
|
um = m.UnorderedMapStringDouble()
|
|
um["ua"] = 1.1
|
|
um["ub"] = 2.6
|
|
|
|
assert sorted(um) == ["ua", "ub"]
|
|
assert list(um.keys()) == list(um)
|
|
assert sorted(um.items()) == [("ua", 1.1), ("ub", 2.6)]
|
|
assert list(zip(um.keys(), um.values())) == list(um.items())
|
|
assert "UnorderedMapStringDouble" in str(um)
|
|
|
|
|
|
def test_map_string_double_const():
|
|
mc = m.MapStringDoubleConst()
|
|
mc["a"] = 10
|
|
mc["b"] = 20.5
|
|
assert str(mc) == "MapStringDoubleConst{a: 10, b: 20.5}"
|
|
|
|
umc = m.UnorderedMapStringDoubleConst()
|
|
umc["a"] = 11
|
|
umc["b"] = 21.5
|
|
|
|
str(umc)
|
|
|
|
|
|
def test_noncopyable_containers():
|
|
# std::vector
|
|
vnc = m.get_vnc(5)
|
|
for i in range(5):
|
|
assert vnc[i].value == i + 1
|
|
|
|
for i, j in enumerate(vnc, start=1):
|
|
assert j.value == i
|
|
|
|
# std::deque
|
|
dnc = m.get_dnc(5)
|
|
for i in range(5):
|
|
assert dnc[i].value == i + 1
|
|
|
|
i = 1
|
|
for j in dnc:
|
|
assert j.value == i
|
|
i += 1
|
|
|
|
# std::map
|
|
mnc = m.get_mnc(5)
|
|
for i in range(1, 6):
|
|
assert mnc[i].value == 10 * i
|
|
|
|
vsum = 0
|
|
for k, v in mnc.items():
|
|
assert v.value == 10 * k
|
|
vsum += v.value
|
|
|
|
assert vsum == 150
|
|
|
|
# std::unordered_map
|
|
mnc = m.get_umnc(5)
|
|
for i in range(1, 6):
|
|
assert mnc[i].value == 10 * i
|
|
|
|
vsum = 0
|
|
for k, v in mnc.items():
|
|
assert v.value == 10 * k
|
|
vsum += v.value
|
|
|
|
assert vsum == 150
|
|
|
|
# nested std::map<std::vector>
|
|
nvnc = m.get_nvnc(5)
|
|
for i in range(1, 6):
|
|
for j in range(5):
|
|
assert nvnc[i][j].value == j + 1
|
|
|
|
# Note: maps do not have .values()
|
|
for v in nvnc.values():
|
|
for i, j in enumerate(v, start=1):
|
|
assert j.value == i
|
|
|
|
# nested std::map<std::map>
|
|
nmnc = m.get_nmnc(5)
|
|
for i in range(1, 6):
|
|
for j in range(10, 60, 10):
|
|
assert nmnc[i][j].value == 10 * j
|
|
|
|
vsum = 0
|
|
for v_o in nmnc.values():
|
|
for k_i, v_i in v_o.items():
|
|
assert v_i.value == 10 * k_i
|
|
vsum += v_i.value
|
|
|
|
assert vsum == 7500
|
|
|
|
# nested std::unordered_map<std::unordered_map>
|
|
numnc = m.get_numnc(5)
|
|
for i in range(1, 6):
|
|
for j in range(10, 60, 10):
|
|
assert numnc[i][j].value == 10 * j
|
|
|
|
vsum = 0
|
|
for v_o in numnc.values():
|
|
for k_i, v_i in v_o.items():
|
|
assert v_i.value == 10 * k_i
|
|
vsum += v_i.value
|
|
|
|
assert vsum == 7500
|
|
|
|
|
|
def test_map_delitem():
|
|
mm = m.MapStringDouble()
|
|
mm["a"] = 1
|
|
mm["b"] = 2.5
|
|
|
|
assert list(mm) == ["a", "b"]
|
|
assert list(mm.items()) == [("a", 1), ("b", 2.5)]
|
|
del mm["a"]
|
|
assert list(mm) == ["b"]
|
|
assert list(mm.items()) == [("b", 2.5)]
|
|
|
|
with pytest.raises(KeyError) as excinfo:
|
|
mm["a_long_key"]
|
|
assert "a_long_key" in str(excinfo.value)
|
|
|
|
with pytest.raises(KeyError) as excinfo:
|
|
del mm["a_long_key"]
|
|
assert "a_long_key" in str(excinfo.value)
|
|
|
|
cut_length = 100
|
|
k_very_long = "ab" * cut_length + "xyz"
|
|
with pytest.raises(KeyError) as excinfo:
|
|
mm[k_very_long]
|
|
assert k_very_long in str(excinfo.value)
|
|
k_very_long += "@"
|
|
with pytest.raises(KeyError) as excinfo:
|
|
mm[k_very_long]
|
|
k_repr = k_very_long[:cut_length] + "✄✄✄" + k_very_long[-cut_length:]
|
|
assert k_repr in str(excinfo.value)
|
|
|
|
um = m.UnorderedMapStringDouble()
|
|
um["ua"] = 1.1
|
|
um["ub"] = 2.6
|
|
|
|
assert sorted(um) == ["ua", "ub"]
|
|
assert sorted(um.items()) == [("ua", 1.1), ("ub", 2.6)]
|
|
del um["ua"]
|
|
assert sorted(um) == ["ub"]
|
|
assert sorted(um.items()) == [("ub", 2.6)]
|
|
|
|
|
|
def test_map_view_types():
|
|
map_string_double = m.MapStringDouble()
|
|
unordered_map_string_double = m.UnorderedMapStringDouble()
|
|
map_string_double_const = m.MapStringDoubleConst()
|
|
unordered_map_string_double_const = m.UnorderedMapStringDoubleConst()
|
|
|
|
assert map_string_double.keys().__class__.__name__ == "KeysView"
|
|
assert map_string_double.values().__class__.__name__ == "ValuesView"
|
|
assert map_string_double.items().__class__.__name__ == "ItemsView"
|
|
|
|
keys_type = type(map_string_double.keys())
|
|
assert type(unordered_map_string_double.keys()) is keys_type
|
|
assert type(map_string_double_const.keys()) is keys_type
|
|
assert type(unordered_map_string_double_const.keys()) is keys_type
|
|
|
|
values_type = type(map_string_double.values())
|
|
assert type(unordered_map_string_double.values()) is values_type
|
|
assert type(map_string_double_const.values()) is values_type
|
|
assert type(unordered_map_string_double_const.values()) is values_type
|
|
|
|
items_type = type(map_string_double.items())
|
|
assert type(unordered_map_string_double.items()) is items_type
|
|
assert type(map_string_double_const.items()) is items_type
|
|
assert type(unordered_map_string_double_const.items()) is items_type
|
|
|
|
map_string_float = m.MapStringFloat()
|
|
unordered_map_string_float = m.UnorderedMapStringFloat()
|
|
|
|
assert type(map_string_float.keys()) is keys_type
|
|
assert type(unordered_map_string_float.keys()) is keys_type
|
|
assert type(map_string_float.values()) is values_type
|
|
assert type(unordered_map_string_float.values()) is values_type
|
|
assert type(map_string_float.items()) is items_type
|
|
assert type(unordered_map_string_float.items()) is items_type
|
|
|
|
map_pair_double_int_int32 = m.MapPairDoubleIntInt32()
|
|
map_pair_double_int_int64 = m.MapPairDoubleIntInt64()
|
|
|
|
assert type(map_pair_double_int_int32.values()) is values_type
|
|
assert type(map_pair_double_int_int64.values()) is values_type
|
|
|
|
map_int_object = m.MapIntObject()
|
|
map_string_object = m.MapStringObject()
|
|
|
|
assert type(map_int_object.keys()) is keys_type
|
|
assert type(map_string_object.keys()) is keys_type
|
|
assert type(map_int_object.items()) is items_type
|
|
assert type(map_string_object.items()) is items_type
|
|
|
|
|
|
def test_recursive_vector():
|
|
recursive_vector = m.RecursiveVector()
|
|
recursive_vector.append(m.RecursiveVector())
|
|
recursive_vector[0].append(m.RecursiveVector())
|
|
recursive_vector[0].append(m.RecursiveVector())
|
|
# Can't use len() since test_stl_binders.cpp does not include stl.h,
|
|
# so the necessary conversion is missing
|
|
assert recursive_vector[0].count(m.RecursiveVector()) == 2
|
|
|
|
|
|
def test_recursive_map():
|
|
recursive_map = m.RecursiveMap()
|
|
recursive_map[100] = m.RecursiveMap()
|
|
recursive_map[100][101] = m.RecursiveMap()
|
|
recursive_map[100][102] = m.RecursiveMap()
|
|
assert list(recursive_map[100].keys()) == [101, 102]
|
|
|
|
|
|
def test_user_vector_like():
|
|
vec = m.UserVectorLike()
|
|
vec.append(2)
|
|
assert vec[0] == 2
|
|
assert len(vec) == 1
|
|
|
|
|
|
def test_user_like_map():
|
|
map = m.UserMapLike()
|
|
map[33] = 44
|
|
assert map[33] == 44
|
|
assert len(map) == 1
|