Update pybind11 to 2.9.2
Fixes https://gitlab.com/kicad/code/kicad/-/issues/10729
This commit is contained in:
+20
-16
@@ -8,38 +8,43 @@
|
||||
BSD-style license that can be found in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "pybind11_tests.h"
|
||||
#include <pybind11/numpy.h>
|
||||
|
||||
#include "pybind11_tests.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
double my_func(int x, float y, double z) {
|
||||
py::print("my_func(x:int={}, y:float={:.0f}, z:float={:.0f})"_s.format(x, y, z));
|
||||
return (float) x*y*z;
|
||||
return (float) x * y * z;
|
||||
}
|
||||
|
||||
TEST_SUBMODULE(numpy_vectorize, m) {
|
||||
try { py::module_::import("numpy"); }
|
||||
catch (...) { return; }
|
||||
try {
|
||||
py::module_::import("numpy");
|
||||
} catch (...) {
|
||||
return;
|
||||
}
|
||||
|
||||
// test_vectorize, test_docs, test_array_collapse
|
||||
// Vectorize all arguments of a function (though non-vector arguments are also allowed)
|
||||
m.def("vectorized_func", py::vectorize(my_func));
|
||||
|
||||
// Vectorize a lambda function with a capture object (e.g. to exclude some arguments from the vectorization)
|
||||
// Vectorize a lambda function with a capture object (e.g. to exclude some arguments from the
|
||||
// vectorization)
|
||||
m.def("vectorized_func2", [](py::array_t<int> x, py::array_t<float> y, float z) {
|
||||
return py::vectorize([z](int x, float y) { return my_func(x, y, z); })(std::move(x),
|
||||
std::move(y));
|
||||
});
|
||||
|
||||
// Vectorize a complex-valued function
|
||||
m.def("vectorized_func3", py::vectorize(
|
||||
[](std::complex<double> c) { return c * std::complex<double>(2.f); }
|
||||
));
|
||||
m.def("vectorized_func3",
|
||||
py::vectorize([](std::complex<double> c) { return c * std::complex<double>(2.f); }));
|
||||
|
||||
// test_type_selection
|
||||
// NumPy function which only accepts specific data types
|
||||
// A lot of these no lints could be replaced with const refs, and probably should at some point.
|
||||
// A lot of these no lints could be replaced with const refs, and probably should at some
|
||||
// point.
|
||||
m.def("selective_func",
|
||||
[](const py::array_t<int, py::array::c_style> &) { return "Int branch taken."; });
|
||||
m.def("selective_func",
|
||||
@@ -49,10 +54,10 @@ TEST_SUBMODULE(numpy_vectorize, m) {
|
||||
});
|
||||
|
||||
// test_passthrough_arguments
|
||||
// Passthrough test: references and non-pod types should be automatically passed through (in the
|
||||
// function definition below, only `b`, `d`, and `g` are vectorized):
|
||||
// Passthrough test: references and non-pod types should be automatically passed through (in
|
||||
// the function definition below, only `b`, `d`, and `g` are vectorized):
|
||||
struct NonPODClass {
|
||||
NonPODClass(int v) : value{v} {}
|
||||
explicit NonPODClass(int v) : value{v} {}
|
||||
int value;
|
||||
};
|
||||
py::class_<NonPODClass>(m, "NonPODClass")
|
||||
@@ -71,13 +76,12 @@ TEST_SUBMODULE(numpy_vectorize, m) {
|
||||
|
||||
// test_method_vectorization
|
||||
struct VectorizeTestClass {
|
||||
VectorizeTestClass(int v) : value{v} {};
|
||||
explicit VectorizeTestClass(int v) : value{v} {};
|
||||
float method(int x, float y) const { return y + (float) (x + value); }
|
||||
int value = 0;
|
||||
};
|
||||
py::class_<VectorizeTestClass> vtc(m, "VectorizeTestClass");
|
||||
vtc .def(py::init<int>())
|
||||
.def_readwrite("value", &VectorizeTestClass::value);
|
||||
vtc.def(py::init<int>()).def_readwrite("value", &VectorizeTestClass::value);
|
||||
|
||||
// Automatic vectorizing of methods
|
||||
vtc.def("method", py::vectorize(&VectorizeTestClass::method));
|
||||
@@ -99,5 +103,5 @@ TEST_SUBMODULE(numpy_vectorize, m) {
|
||||
return py::detail::broadcast(buffers, ndim, shape);
|
||||
});
|
||||
|
||||
m.def("add_to", py::vectorize([](NonPODClass& x, int a) { x.value += a; }));
|
||||
m.def("add_to", py::vectorize([](NonPODClass &x, int a) { x.value += a; }));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user