mirror of
https://github.com/pybind/pybind11.git
synced 2025-01-19 09:25:51 +00:00
Add a test for numpy dtypes with custom names
This commit is contained in:
parent
e8b50360fe
commit
abd3429ce9
@ -67,6 +67,11 @@ struct StringStruct {
|
|||||||
std::array<char, 3> b;
|
std::array<char, 3> b;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
PYBIND11_PACKED(struct StructWithUglyNames {
|
||||||
|
int8_t __x__;
|
||||||
|
uint64_t __y__;
|
||||||
|
});
|
||||||
|
|
||||||
enum class E1 : int64_t { A = -1, B = 1 };
|
enum class E1 : int64_t { A = -1, B = 1 };
|
||||||
enum E2 : uint8_t { X = 1, Y = 2 };
|
enum E2 : uint8_t { X = 1, Y = 2 };
|
||||||
|
|
||||||
@ -197,7 +202,8 @@ py::list print_dtypes() {
|
|||||||
py::dtype::of<PartialStruct>().str(),
|
py::dtype::of<PartialStruct>().str(),
|
||||||
py::dtype::of<PartialNestedStruct>().str(),
|
py::dtype::of<PartialNestedStruct>().str(),
|
||||||
py::dtype::of<StringStruct>().str(),
|
py::dtype::of<StringStruct>().str(),
|
||||||
py::dtype::of<EnumStruct>().str()
|
py::dtype::of<EnumStruct>().str(),
|
||||||
|
py::dtype::of<StructWithUglyNames>().str()
|
||||||
};
|
};
|
||||||
auto l = py::list();
|
auto l = py::list();
|
||||||
for (const auto &s : dtypes) {
|
for (const auto &s : dtypes) {
|
||||||
@ -312,6 +318,8 @@ test_initializer numpy_dtypes([](py::module &m) {
|
|||||||
// ... or after
|
// ... or after
|
||||||
py::class_<PackedStruct>(m, "PackedStruct");
|
py::class_<PackedStruct>(m, "PackedStruct");
|
||||||
|
|
||||||
|
PYBIND11_NUMPY_DTYPE_EX(StructWithUglyNames, __x__, "x", __y__, "y");
|
||||||
|
|
||||||
m.def("create_rec_simple", &create_recarray<SimpleStruct>);
|
m.def("create_rec_simple", &create_recarray<SimpleStruct>);
|
||||||
m.def("create_rec_packed", &create_recarray<PackedStruct>);
|
m.def("create_rec_packed", &create_recarray<PackedStruct>);
|
||||||
m.def("create_rec_nested", &create_nested);
|
m.def("create_rec_nested", &create_nested);
|
||||||
|
@ -42,7 +42,8 @@ def test_dtype():
|
|||||||
"{'names':['x','y','z'], 'formats':['?','<u4','<f4'], 'offsets':[0,4,8], 'itemsize':24}",
|
"{'names':['x','y','z'], 'formats':['?','<u4','<f4'], 'offsets':[0,4,8], 'itemsize':24}",
|
||||||
"{'names':['a'], 'formats':[{'names':['x','y','z'], 'formats':['?','<u4','<f4'], 'offsets':[0,4,8], 'itemsize':24}], 'offsets':[8], 'itemsize':40}",
|
"{'names':['a'], 'formats':[{'names':['x','y','z'], 'formats':['?','<u4','<f4'], 'offsets':[0,4,8], 'itemsize':24}], 'offsets':[8], 'itemsize':40}",
|
||||||
"[('a', 'S3'), ('b', 'S3')]",
|
"[('a', 'S3'), ('b', 'S3')]",
|
||||||
"[('e1', '<i8'), ('e2', 'u1')]"
|
"[('e1', '<i8'), ('e2', 'u1')]",
|
||||||
|
"[('x', 'i1'), ('y', '<u8')]"
|
||||||
]
|
]
|
||||||
|
|
||||||
d1 = np.dtype({'names': ['a', 'b'], 'formats': ['int32', 'float64'],
|
d1 = np.dtype({'names': ['a', 'b'], 'formats': ['int32', 'float64'],
|
||||||
|
Loading…
Reference in New Issue
Block a user