72a73,88
> struct ComplexStruct {
> std::complex<float> cflt;
> std::complex<double> cdbl;
> };
>
> std::ostream& operator<<(std::ostream& os, const ComplexStruct& v) {
> return os << "c:" << v.cflt << "," << v.cdbl;
> }
>
> struct ArrayStruct {
> char a[3][4];
> int32_t b[2];
> std::array<uint8_t, 3> c;
> std::array<float, 2> d[4];
> };
>
93a110,130
> std::ostream& operator<<(std::ostream& os, const ArrayStruct& v) {
> os << "a={";
> for (int i = 0; i < 3; i++) {
> if (i > 0)
> os << ',';
> os << '{';
> for (int j = 0; j < 3; j++)
> os << v.a[i][j] << ',';
> os << v.a[i][3] << '}';
> }
> os << "},b={" << v.b[0] << ',' << v.b[1];
> os << "},c={" << int(v.c[0]) << ',' << int(v.c[1]) << ',' << int(v.c[2]);
> os << "},d={";
> for (int i = 0; i < 4; i++) {
> if (i > 0)
> os << ',';
> os << '{' << v.d[i][0] << ',' << v.d[i][1] << '}';
> }
> return os << '}';
> }
>
122,175d158
< std::string get_format_unbound() {
< return py::format_descriptor<UnboundStruct>::format();
< }
<
< py::array_t<NestedStruct, 0> create_nested(size_t n) {
< auto arr = mkarray_via_buffer<NestedStruct>(n);
< auto req = arr.request();
< auto ptr = static_cast<NestedStruct*>(req.ptr);
< for (size_t i = 0; i < n; i++) {
< SET_TEST_VALS(ptr[i].a, i);
< SET_TEST_VALS(ptr[i].b, i + 1);
< }
< return arr;
< }
<
< py::array_t<PartialNestedStruct, 0> create_partial_nested(size_t n) {
< auto arr = mkarray_via_buffer<PartialNestedStruct>(n);
< auto req = arr.request();
< auto ptr = static_cast<PartialNestedStruct*>(req.ptr);
< for (size_t i = 0; i < n; i++) {
< SET_TEST_VALS(ptr[i].a, i);
< }
< return arr;
< }
<
< py::array_t<StringStruct, 0> create_string_array(bool non_empty) {
< auto arr = mkarray_via_buffer<StringStruct>(non_empty ? 4 : 0);
< if (non_empty) {
< auto req = arr.request();
< auto ptr = static_cast<StringStruct*>(req.ptr);
< for (size_t i = 0; i < req.size * req.itemsize; i++)
< static_cast<char*>(req.ptr)[i] = 0;
< ptr[1].a[0] = 'a'; ptr[1].b[0] = 'a';
< ptr[2].a[0] = 'a'; ptr[2].b[0] = 'a';
< ptr[3].a[0] = 'a'; ptr[3].b[0] = 'a';
<
< ptr[2].a[1] = 'b'; ptr[2].b[1] = 'b';
< ptr[3].a[1] = 'b'; ptr[3].b[1] = 'b';
<
< ptr[3].a[2] = 'c'; ptr[3].b[2] = 'c';
< }
< return arr;
< }
<
< py::array_t<EnumStruct, 0> create_enum_array(size_t n) {
< auto arr = mkarray_via_buffer<EnumStruct>(n);
< auto ptr = (EnumStruct *) arr.mutable_data();
< for (size_t i = 0; i < n; i++) {
< ptr[i].e1 = static_cast<E1>(-1 + ((int) i % 2) * 2);
< ptr[i].e2 = static_cast<E2>(1 + (i % 2));
< }
< return arr;
< }
<
181c164
< for (size_t i = 0; i < req.size; i++) {
---
> for (ssize_t i = 0; i < req.size; i++) {
189,223d171
< py::list print_format_descriptors() {
< const auto fmts = {
< py::format_descriptor<SimpleStruct>::format(),
< py::format_descriptor<PackedStruct>::format(),
< py::format_descriptor<NestedStruct>::format(),
< py::format_descriptor<PartialStruct>::format(),
< py::format_descriptor<PartialNestedStruct>::format(),
< py::format_descriptor<StringStruct>::format(),
< py::format_descriptor<EnumStruct>::format()
< };
< auto l = py::list();
< for (const auto &fmt : fmts) {
< l.append(py::cast(fmt));
< }
< return l;
< }
<
< py::list print_dtypes() {
< const auto dtypes = {
< py::str(py::dtype::of<SimpleStruct>()),
< py::str(py::dtype::of<PackedStruct>()),
< py::str(py::dtype::of<NestedStruct>()),
< py::str(py::dtype::of<PartialStruct>()),
< py::str(py::dtype::of<PartialNestedStruct>()),
< py::str(py::dtype::of<StringStruct>()),
< py::str(py::dtype::of<EnumStruct>()),
< py::str(py::dtype::of<StructWithUglyNames>())
< };
< auto l = py::list();
< for (const auto &s : dtypes) {
< l.append(s);
< }
< return l;
< }
<
228,229c176,177
< std::vector<size_t> shape { 3, 2 };
< std::vector<size_t> strides { 8, 4 };
---
> std::vector<ssize_t> shape { 3, 2 };
> std::vector<ssize_t> strides { 8, 4 };
299,302c247,249
< struct TrailingPaddingStruct {
< int32_t a;
< char b;
< };
---
> TEST_SUBMODULE(numpy_dtypes, m) {
> try { py::module::import("numpy"); }
> catch (...) { return; }
304,344d250
< py::dtype trailing_padding_dtype() {
< return py::dtype::of<TrailingPaddingStruct>();
< }
<
< py::dtype buffer_to_dtype(py::buffer& buf) {
< return py::dtype(buf.request());
< }
<
< py::list test_dtype_methods() {
< py::list list;
< auto dt1 = py::dtype::of<int32_t>();
< auto dt2 = py::dtype::of<SimpleStruct>();
< list.append(dt1); list.append(dt2);
< list.append(py::bool_(dt1.has_fields())); list.append(py::bool_(dt2.has_fields()));
< list.append(py::int_(dt1.itemsize())); list.append(py::int_(dt2.itemsize()));
< return list;
< }
<
< struct CompareStruct {
< bool x;
< uint32_t y;
< float z;
< };
<
< py::list test_compare_buffer_info() {
< py::list list;
< list.append(py::bool_(py::detail::compare_buffer_info<float>::compare(py::buffer_info(nullptr, sizeof(float), "f", 1))));
< list.append(py::bool_(py::detail::compare_buffer_info<unsigned>::compare(py::buffer_info(nullptr, sizeof(int), "I", 1))));
< list.append(py::bool_(py::detail::compare_buffer_info<long>::compare(py::buffer_info(nullptr, sizeof(long), "l", 1))));
< list.append(py::bool_(py::detail::compare_buffer_info<long>::compare(py::buffer_info(nullptr, sizeof(long), sizeof(long) == sizeof(int) ? "i" : "q", 1))));
< list.append(py::bool_(py::detail::compare_buffer_info<CompareStruct>::compare(py::buffer_info(nullptr, sizeof(CompareStruct), "T{?:x:3xI:y:f:z:}", 1))));
< return list;
< }
<
< test_initializer numpy_dtypes([](py::module &m) {
< try {
< py::module::import("numpy");
< } catch (...) {
< return;
< }
<
353a260
> PYBIND11_NUMPY_DTYPE(ArrayStruct, a, b, c, d);
355,356c262
< PYBIND11_NUMPY_DTYPE(TrailingPaddingStruct, a, b);
< PYBIND11_NUMPY_DTYPE(CompareStruct, x, y, z);
---
> PYBIND11_NUMPY_DTYPE(ComplexStruct, cflt, cdbl);
367a274
> // test_recarray, test_scalar_conversion
370c277,286
< m.def("create_rec_nested", &create_nested);
---
> m.def("create_rec_nested", [](size_t n) { // test_signature
> py::array_t<NestedStruct, 0> arr = mkarray_via_buffer<NestedStruct>(n);
> auto req = arr.request();
> auto ptr = static_cast<NestedStruct*>(req.ptr);
> for (size_t i = 0; i < n; i++) {
> SET_TEST_VALS(ptr[i].a, i);
> SET_TEST_VALS(ptr[i].b, i + 1);
> }
> return arr;
> });
372,373c288,296
< m.def("create_rec_partial_nested", &create_partial_nested);
< m.def("print_format_descriptors", &print_format_descriptors);
---
> m.def("create_rec_partial_nested", [](size_t n) {
> py::array_t<PartialNestedStruct, 0> arr = mkarray_via_buffer<PartialNestedStruct>(n);
> auto req = arr.request();
> auto ptr = static_cast<PartialNestedStruct*>(req.ptr);
> for (size_t i = 0; i < n; i++) {
> SET_TEST_VALS(ptr[i].a, i);
> }
> return arr;
> });
377,379c300,374
< m.def("print_dtypes", &print_dtypes);
< m.def("get_format_unbound", &get_format_unbound);
< m.def("create_string_array", &create_string_array);
---
>
> // test_format_descriptors
> m.def("get_format_unbound", []() { return py::format_descriptor<UnboundStruct>::format(); });
> m.def("print_format_descriptors", []() {
> py::list l;
> for (const auto &fmt : {
> py::format_descriptor<SimpleStruct>::format(),
> py::format_descriptor<PackedStruct>::format(),
> py::format_descriptor<NestedStruct>::format(),
> py::format_descriptor<PartialStruct>::format(),
> py::format_descriptor<PartialNestedStruct>::format(),
> py::format_descriptor<StringStruct>::format(),
> py::format_descriptor<ArrayStruct>::format(),
> py::format_descriptor<EnumStruct>::format(),
> py::format_descriptor<ComplexStruct>::format()
> }) {
> l.append(py::cast(fmt));
> }
> return l;
> });
>
> // test_dtype
> m.def("print_dtypes", []() {
> py::list l;
> for (const py::handle &d : {
> py::dtype::of<SimpleStruct>(),
> py::dtype::of<PackedStruct>(),
> py::dtype::of<NestedStruct>(),
> py::dtype::of<PartialStruct>(),
> py::dtype::of<PartialNestedStruct>(),
> py::dtype::of<StringStruct>(),
> py::dtype::of<ArrayStruct>(),
> py::dtype::of<EnumStruct>(),
> py::dtype::of<StructWithUglyNames>(),
> py::dtype::of<ComplexStruct>()
> })
> l.append(py::str(d));
> return l;
> });
> m.def("test_dtype_ctors", &test_dtype_ctors);
> m.def("test_dtype_methods", []() {
> py::list list;
> auto dt1 = py::dtype::of<int32_t>();
> auto dt2 = py::dtype::of<SimpleStruct>();
> list.append(dt1); list.append(dt2);
> list.append(py::bool_(dt1.has_fields())); list.append(py::bool_(dt2.has_fields()));
> list.append(py::int_(dt1.itemsize())); list.append(py::int_(dt2.itemsize()));
> return list;
> });
> struct TrailingPaddingStruct {
> int32_t a;
> char b;
> };
> PYBIND11_NUMPY_DTYPE(TrailingPaddingStruct, a, b);
> m.def("trailing_padding_dtype", []() { return py::dtype::of<TrailingPaddingStruct>(); });
>
> // test_string_array
> m.def("create_string_array", [](bool non_empty) {
> py::array_t<StringStruct, 0> arr = mkarray_via_buffer<StringStruct>(non_empty ? 4 : 0);
> if (non_empty) {
> auto req = arr.request();
> auto ptr = static_cast<StringStruct*>(req.ptr);
> for (ssize_t i = 0; i < req.size * req.itemsize; i++)
> static_cast<char*>(req.ptr)[i] = 0;
> ptr[1].a[0] = 'a'; ptr[1].b[0] = 'a';
> ptr[2].a[0] = 'a'; ptr[2].b[0] = 'a';
> ptr[3].a[0] = 'a'; ptr[3].b[0] = 'a';
>
> ptr[2].a[1] = 'b'; ptr[2].b[1] = 'b';
> ptr[3].a[1] = 'b'; ptr[3].b[1] = 'b';
>
> ptr[3].a[2] = 'c'; ptr[3].b[2] = 'c';
> }
> return arr;
> });
381c376,406
< m.def("create_enum_array", &create_enum_array);
---
>
> // test_array_array
> m.def("create_array_array", [](size_t n) {
> py::array_t<ArrayStruct, 0> arr = mkarray_via_buffer<ArrayStruct>(n);
> auto ptr = (ArrayStruct *) arr.mutable_data();
> for (size_t i = 0; i < n; i++) {
> for (size_t j = 0; j < 3; j++)
> for (size_t k = 0; k < 4; k++)
> ptr[i].a[j][k] = char('A' + (i * 100 + j * 10 + k) % 26);
> for (size_t j = 0; j < 2; j++)
> ptr[i].b[j] = int32_t(i * 1000 + j);
> for (size_t j = 0; j < 3; j++)
> ptr[i].c[j] = uint8_t(i * 10 + j);
> for (size_t j = 0; j < 4; j++)
> for (size_t k = 0; k < 2; k++)
> ptr[i].d[j][k] = float(i) * 100.0f + float(j) * 10.0f + float(k);
> }
> return arr;
> });
> m.def("print_array_array", &print_recarray<ArrayStruct>);
>
> // test_enum_array
> m.def("create_enum_array", [](size_t n) {
> py::array_t<EnumStruct, 0> arr = mkarray_via_buffer<EnumStruct>(n);
> auto ptr = (EnumStruct *) arr.mutable_data();
> for (size_t i = 0; i < n; i++) {
> ptr[i].e1 = static_cast<E1>(-1 + ((int) i % 2) * 2);
> ptr[i].e2 = static_cast<E2>(1 + (i % 2));
> }
> return arr;
> });
382a408,423
>
> // test_complex_array
> m.def("create_complex_array", [](size_t n) {
> py::array_t<ComplexStruct, 0> arr = mkarray_via_buffer<ComplexStruct>(n);
> auto ptr = (ComplexStruct *) arr.mutable_data();
> for (size_t i = 0; i < n; i++) {
> ptr[i].cflt.real(float(i));
> ptr[i].cflt.imag(float(i) + 0.25f);
> ptr[i].cdbl.real(double(i) + 0.5);
> ptr[i].cdbl.imag(double(i) + 0.75);
> }
> return arr;
> });
> m.def("print_complex_array", &print_recarray<ComplexStruct>);
>
> // test_array_constructors
384,388c425,444
< m.def("test_dtype_ctors", &test_dtype_ctors);
< m.def("test_dtype_methods", &test_dtype_methods);
< m.def("compare_buffer_info", &test_compare_buffer_info);
< m.def("trailing_padding_dtype", &trailing_padding_dtype);
< m.def("buffer_to_dtype", &buffer_to_dtype);
---
>
> // test_compare_buffer_info
> struct CompareStruct {
> bool x;
> uint32_t y;
> float z;
> };
> PYBIND11_NUMPY_DTYPE(CompareStruct, x, y, z);
> m.def("compare_buffer_info", []() {
> py::list list;
> list.append(py::bool_(py::detail::compare_buffer_info<float>::compare(py::buffer_info(nullptr, sizeof(float), "f", 1))));
> list.append(py::bool_(py::detail::compare_buffer_info<unsigned>::compare(py::buffer_info(nullptr, sizeof(int), "I", 1))));
> list.append(py::bool_(py::detail::compare_buffer_info<long>::compare(py::buffer_info(nullptr, sizeof(long), "l", 1))));
> list.append(py::bool_(py::detail::compare_buffer_info<long>::compare(py::buffer_info(nullptr, sizeof(long), sizeof(long) == sizeof(int) ? "i" : "q", 1))));
> list.append(py::bool_(py::detail::compare_buffer_info<CompareStruct>::compare(py::buffer_info(nullptr, sizeof(CompareStruct), "T{?:x:3xI:y:f:z:}", 1))));
> return list;
> });
> m.def("buffer_to_dtype", [](py::buffer& buf) { return py::dtype(buf.request()); });
>
> // test_scalar_conversion
392,393d447
< m.def("register_dtype", []() { PYBIND11_NUMPY_DTYPE(SimpleStruct, bool_, uint_, float_, ldbl_); });
< });
395c449,451
< #undef PYBIND11_PACKED
---
> // test_register_dtype
> m.def("register_dtype", []() { PYBIND11_NUMPY_DTYPE(SimpleStruct, bool_, uint_, float_, ldbl_); });
> }
> struct ComplexStruct {
> std::complex<float> cflt;
> std::complex<double> cdbl;
> };
>
> std::ostream& operator<<(std::ostream& os, const ComplexStruct& v) {
> return os << "c:" << v.cflt << "," << v.cdbl;
> }
>
> struct ArrayStruct {
> char a[3][4];
> int32_t b[2];
> std::array<uint8_t, 3> c;
> std::array<float, 2> d[4];
> };
>
93a110,130
> std::ostream& operator<<(std::ostream& os, const ArrayStruct& v) {
> os << "a={";
> for (int i = 0; i < 3; i++) {
> if (i > 0)
> os << ',';
> os << '{';
> for (int j = 0; j < 3; j++)
> os << v.a[i][j] << ',';
> os << v.a[i][3] << '}';
> }
> os << "},b={" << v.b[0] << ',' << v.b[1];
> os << "},c={" << int(v.c[0]) << ',' << int(v.c[1]) << ',' << int(v.c[2]);
> os << "},d={";
> for (int i = 0; i < 4; i++) {
> if (i > 0)
> os << ',';
> os << '{' << v.d[i][0] << ',' << v.d[i][1] << '}';
> }
> return os << '}';
> }
>
122,175d158
< std::string get_format_unbound() {
< return py::format_descriptor<UnboundStruct>::format();
< }
<
< py::array_t<NestedStruct, 0> create_nested(size_t n) {
< auto arr = mkarray_via_buffer<NestedStruct>(n);
< auto req = arr.request();
< auto ptr = static_cast<NestedStruct*>(req.ptr);
< for (size_t i = 0; i < n; i++) {
< SET_TEST_VALS(ptr[i].a, i);
< SET_TEST_VALS(ptr[i].b, i + 1);
< }
< return arr;
< }
<
< py::array_t<PartialNestedStruct, 0> create_partial_nested(size_t n) {
< auto arr = mkarray_via_buffer<PartialNestedStruct>(n);
< auto req = arr.request();
< auto ptr = static_cast<PartialNestedStruct*>(req.ptr);
< for (size_t i = 0; i < n; i++) {
< SET_TEST_VALS(ptr[i].a, i);
< }
< return arr;
< }
<
< py::array_t<StringStruct, 0> create_string_array(bool non_empty) {
< auto arr = mkarray_via_buffer<StringStruct>(non_empty ? 4 : 0);
< if (non_empty) {
< auto req = arr.request();
< auto ptr = static_cast<StringStruct*>(req.ptr);
< for (size_t i = 0; i < req.size * req.itemsize; i++)
< static_cast<char*>(req.ptr)[i] = 0;
< ptr[1].a[0] = 'a'; ptr[1].b[0] = 'a';
< ptr[2].a[0] = 'a'; ptr[2].b[0] = 'a';
< ptr[3].a[0] = 'a'; ptr[3].b[0] = 'a';
<
< ptr[2].a[1] = 'b'; ptr[2].b[1] = 'b';
< ptr[3].a[1] = 'b'; ptr[3].b[1] = 'b';
<
< ptr[3].a[2] = 'c'; ptr[3].b[2] = 'c';
< }
< return arr;
< }
<
< py::array_t<EnumStruct, 0> create_enum_array(size_t n) {
< auto arr = mkarray_via_buffer<EnumStruct>(n);
< auto ptr = (EnumStruct *) arr.mutable_data();
< for (size_t i = 0; i < n; i++) {
< ptr[i].e1 = static_cast<E1>(-1 + ((int) i % 2) * 2);
< ptr[i].e2 = static_cast<E2>(1 + (i % 2));
< }
< return arr;
< }
<
181c164
< for (size_t i = 0; i < req.size; i++) {
---
> for (ssize_t i = 0; i < req.size; i++) {
189,223d171
< py::list print_format_descriptors() {
< const auto fmts = {
< py::format_descriptor<SimpleStruct>::format(),
< py::format_descriptor<PackedStruct>::format(),
< py::format_descriptor<NestedStruct>::format(),
< py::format_descriptor<PartialStruct>::format(),
< py::format_descriptor<PartialNestedStruct>::format(),
< py::format_descriptor<StringStruct>::format(),
< py::format_descriptor<EnumStruct>::format()
< };
< auto l = py::list();
< for (const auto &fmt : fmts) {
< l.append(py::cast(fmt));
< }
< return l;
< }
<
< py::list print_dtypes() {
< const auto dtypes = {
< py::str(py::dtype::of<SimpleStruct>()),
< py::str(py::dtype::of<PackedStruct>()),
< py::str(py::dtype::of<NestedStruct>()),
< py::str(py::dtype::of<PartialStruct>()),
< py::str(py::dtype::of<PartialNestedStruct>()),
< py::str(py::dtype::of<StringStruct>()),
< py::str(py::dtype::of<EnumStruct>()),
< py::str(py::dtype::of<StructWithUglyNames>())
< };
< auto l = py::list();
< for (const auto &s : dtypes) {
< l.append(s);
< }
< return l;
< }
<
228,229c176,177
< std::vector<size_t> shape { 3, 2 };
< std::vector<size_t> strides { 8, 4 };
---
> std::vector<ssize_t> shape { 3, 2 };
> std::vector<ssize_t> strides { 8, 4 };
299,302c247,249
< struct TrailingPaddingStruct {
< int32_t a;
< char b;
< };
---
> TEST_SUBMODULE(numpy_dtypes, m) {
> try { py::module::import("numpy"); }
> catch (...) { return; }
304,344d250
< py::dtype trailing_padding_dtype() {
< return py::dtype::of<TrailingPaddingStruct>();
< }
<
< py::dtype buffer_to_dtype(py::buffer& buf) {
< return py::dtype(buf.request());
< }
<
< py::list test_dtype_methods() {
< py::list list;
< auto dt1 = py::dtype::of<int32_t>();
< auto dt2 = py::dtype::of<SimpleStruct>();
< list.append(dt1); list.append(dt2);
< list.append(py::bool_(dt1.has_fields())); list.append(py::bool_(dt2.has_fields()));
< list.append(py::int_(dt1.itemsize())); list.append(py::int_(dt2.itemsize()));
< return list;
< }
<
< struct CompareStruct {
< bool x;
< uint32_t y;
< float z;
< };
<
< py::list test_compare_buffer_info() {
< py::list list;
< list.append(py::bool_(py::detail::compare_buffer_info<float>::compare(py::buffer_info(nullptr, sizeof(float), "f", 1))));
< list.append(py::bool_(py::detail::compare_buffer_info<unsigned>::compare(py::buffer_info(nullptr, sizeof(int), "I", 1))));
< list.append(py::bool_(py::detail::compare_buffer_info<long>::compare(py::buffer_info(nullptr, sizeof(long), "l", 1))));
< list.append(py::bool_(py::detail::compare_buffer_info<long>::compare(py::buffer_info(nullptr, sizeof(long), sizeof(long) == sizeof(int) ? "i" : "q", 1))));
< list.append(py::bool_(py::detail::compare_buffer_info<CompareStruct>::compare(py::buffer_info(nullptr, sizeof(CompareStruct), "T{?:x:3xI:y:f:z:}", 1))));
< return list;
< }
<
< test_initializer numpy_dtypes([](py::module &m) {
< try {
< py::module::import("numpy");
< } catch (...) {
< return;
< }
<
353a260
> PYBIND11_NUMPY_DTYPE(ArrayStruct, a, b, c, d);
355,356c262
< PYBIND11_NUMPY_DTYPE(TrailingPaddingStruct, a, b);
< PYBIND11_NUMPY_DTYPE(CompareStruct, x, y, z);
---
> PYBIND11_NUMPY_DTYPE(ComplexStruct, cflt, cdbl);
367a274
> // test_recarray, test_scalar_conversion
370c277,286
< m.def("create_rec_nested", &create_nested);
---
> m.def("create_rec_nested", [](size_t n) { // test_signature
> py::array_t<NestedStruct, 0> arr = mkarray_via_buffer<NestedStruct>(n);
> auto req = arr.request();
> auto ptr = static_cast<NestedStruct*>(req.ptr);
> for (size_t i = 0; i < n; i++) {
> SET_TEST_VALS(ptr[i].a, i);
> SET_TEST_VALS(ptr[i].b, i + 1);
> }
> return arr;
> });
372,373c288,296
< m.def("create_rec_partial_nested", &create_partial_nested);
< m.def("print_format_descriptors", &print_format_descriptors);
---
> m.def("create_rec_partial_nested", [](size_t n) {
> py::array_t<PartialNestedStruct, 0> arr = mkarray_via_buffer<PartialNestedStruct>(n);
> auto req = arr.request();
> auto ptr = static_cast<PartialNestedStruct*>(req.ptr);
> for (size_t i = 0; i < n; i++) {
> SET_TEST_VALS(ptr[i].a, i);
> }
> return arr;
> });
377,379c300,374
< m.def("print_dtypes", &print_dtypes);
< m.def("get_format_unbound", &get_format_unbound);
< m.def("create_string_array", &create_string_array);
---
>
> // test_format_descriptors
> m.def("get_format_unbound", []() { return py::format_descriptor<UnboundStruct>::format(); });
> m.def("print_format_descriptors", []() {
> py::list l;
> for (const auto &fmt : {
> py::format_descriptor<SimpleStruct>::format(),
> py::format_descriptor<PackedStruct>::format(),
> py::format_descriptor<NestedStruct>::format(),
> py::format_descriptor<PartialStruct>::format(),
> py::format_descriptor<PartialNestedStruct>::format(),
> py::format_descriptor<StringStruct>::format(),
> py::format_descriptor<ArrayStruct>::format(),
> py::format_descriptor<EnumStruct>::format(),
> py::format_descriptor<ComplexStruct>::format()
> }) {
> l.append(py::cast(fmt));
> }
> return l;
> });
>
> // test_dtype
> m.def("print_dtypes", []() {
> py::list l;
> for (const py::handle &d : {
> py::dtype::of<SimpleStruct>(),
> py::dtype::of<PackedStruct>(),
> py::dtype::of<NestedStruct>(),
> py::dtype::of<PartialStruct>(),
> py::dtype::of<PartialNestedStruct>(),
> py::dtype::of<StringStruct>(),
> py::dtype::of<ArrayStruct>(),
> py::dtype::of<EnumStruct>(),
> py::dtype::of<StructWithUglyNames>(),
> py::dtype::of<ComplexStruct>()
> })
> l.append(py::str(d));
> return l;
> });
> m.def("test_dtype_ctors", &test_dtype_ctors);
> m.def("test_dtype_methods", []() {
> py::list list;
> auto dt1 = py::dtype::of<int32_t>();
> auto dt2 = py::dtype::of<SimpleStruct>();
> list.append(dt1); list.append(dt2);
> list.append(py::bool_(dt1.has_fields())); list.append(py::bool_(dt2.has_fields()));
> list.append(py::int_(dt1.itemsize())); list.append(py::int_(dt2.itemsize()));
> return list;
> });
> struct TrailingPaddingStruct {
> int32_t a;
> char b;
> };
> PYBIND11_NUMPY_DTYPE(TrailingPaddingStruct, a, b);
> m.def("trailing_padding_dtype", []() { return py::dtype::of<TrailingPaddingStruct>(); });
>
> // test_string_array
> m.def("create_string_array", [](bool non_empty) {
> py::array_t<StringStruct, 0> arr = mkarray_via_buffer<StringStruct>(non_empty ? 4 : 0);
> if (non_empty) {
> auto req = arr.request();
> auto ptr = static_cast<StringStruct*>(req.ptr);
> for (ssize_t i = 0; i < req.size * req.itemsize; i++)
> static_cast<char*>(req.ptr)[i] = 0;
> ptr[1].a[0] = 'a'; ptr[1].b[0] = 'a';
> ptr[2].a[0] = 'a'; ptr[2].b[0] = 'a';
> ptr[3].a[0] = 'a'; ptr[3].b[0] = 'a';
>
> ptr[2].a[1] = 'b'; ptr[2].b[1] = 'b';
> ptr[3].a[1] = 'b'; ptr[3].b[1] = 'b';
>
> ptr[3].a[2] = 'c'; ptr[3].b[2] = 'c';
> }
> return arr;
> });
381c376,406
< m.def("create_enum_array", &create_enum_array);
---
>
> // test_array_array
> m.def("create_array_array", [](size_t n) {
> py::array_t<ArrayStruct, 0> arr = mkarray_via_buffer<ArrayStruct>(n);
> auto ptr = (ArrayStruct *) arr.mutable_data();
> for (size_t i = 0; i < n; i++) {
> for (size_t j = 0; j < 3; j++)
> for (size_t k = 0; k < 4; k++)
> ptr[i].a[j][k] = char('A' + (i * 100 + j * 10 + k) % 26);
> for (size_t j = 0; j < 2; j++)
> ptr[i].b[j] = int32_t(i * 1000 + j);
> for (size_t j = 0; j < 3; j++)
> ptr[i].c[j] = uint8_t(i * 10 + j);
> for (size_t j = 0; j < 4; j++)
> for (size_t k = 0; k < 2; k++)
> ptr[i].d[j][k] = float(i) * 100.0f + float(j) * 10.0f + float(k);
> }
> return arr;
> });
> m.def("print_array_array", &print_recarray<ArrayStruct>);
>
> // test_enum_array
> m.def("create_enum_array", [](size_t n) {
> py::array_t<EnumStruct, 0> arr = mkarray_via_buffer<EnumStruct>(n);
> auto ptr = (EnumStruct *) arr.mutable_data();
> for (size_t i = 0; i < n; i++) {
> ptr[i].e1 = static_cast<E1>(-1 + ((int) i % 2) * 2);
> ptr[i].e2 = static_cast<E2>(1 + (i % 2));
> }
> return arr;
> });
382a408,423
>
> // test_complex_array
> m.def("create_complex_array", [](size_t n) {
> py::array_t<ComplexStruct, 0> arr = mkarray_via_buffer<ComplexStruct>(n);
> auto ptr = (ComplexStruct *) arr.mutable_data();
> for (size_t i = 0; i < n; i++) {
> ptr[i].cflt.real(float(i));
> ptr[i].cflt.imag(float(i) + 0.25f);
> ptr[i].cdbl.real(double(i) + 0.5);
> ptr[i].cdbl.imag(double(i) + 0.75);
> }
> return arr;
> });
> m.def("print_complex_array", &print_recarray<ComplexStruct>);
>
> // test_array_constructors
384,388c425,444
< m.def("test_dtype_ctors", &test_dtype_ctors);
< m.def("test_dtype_methods", &test_dtype_methods);
< m.def("compare_buffer_info", &test_compare_buffer_info);
< m.def("trailing_padding_dtype", &trailing_padding_dtype);
< m.def("buffer_to_dtype", &buffer_to_dtype);
---
>
> // test_compare_buffer_info
> struct CompareStruct {
> bool x;
> uint32_t y;
> float z;
> };
> PYBIND11_NUMPY_DTYPE(CompareStruct, x, y, z);
> m.def("compare_buffer_info", []() {
> py::list list;
> list.append(py::bool_(py::detail::compare_buffer_info<float>::compare(py::buffer_info(nullptr, sizeof(float), "f", 1))));
> list.append(py::bool_(py::detail::compare_buffer_info<unsigned>::compare(py::buffer_info(nullptr, sizeof(int), "I", 1))));
> list.append(py::bool_(py::detail::compare_buffer_info<long>::compare(py::buffer_info(nullptr, sizeof(long), "l", 1))));
> list.append(py::bool_(py::detail::compare_buffer_info<long>::compare(py::buffer_info(nullptr, sizeof(long), sizeof(long) == sizeof(int) ? "i" : "q", 1))));
> list.append(py::bool_(py::detail::compare_buffer_info<CompareStruct>::compare(py::buffer_info(nullptr, sizeof(CompareStruct), "T{?:x:3xI:y:f:z:}", 1))));
> return list;
> });
> m.def("buffer_to_dtype", [](py::buffer& buf) { return py::dtype(buf.request()); });
>
> // test_scalar_conversion
392,393d447
< m.def("register_dtype", []() { PYBIND11_NUMPY_DTYPE(SimpleStruct, bool_, uint_, float_, ldbl_); });
< });
395c449,451
< #undef PYBIND11_PACKED
---
> // test_register_dtype
> m.def("register_dtype", []() { PYBIND11_NUMPY_DTYPE(SimpleStruct, bool_, uint_, float_, ldbl_); });
> }