Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-01-19 09:25:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

added array::ensure() function wrapping PyArray_FromAny

Browse Source 
This convenience function ensures that a py::object is either a
py::array, or the implementation will try to convert it into one. Layout
requirements (such as c_style or f_style) can be also be provided.
This commit is contained in:
Wenzel Jakob 2016-10-14 01:08:03 +02:00
parent 00488a3e2c
commit c01a1c1ade
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/pybind11/numpy.h
View File

@ -425,6 +425,13 @@ public:
return array(api.PyArray_Squeeze_(m_ptr), false);
}
/// Ensure that the argument is a NumPy array
static array ensure(object input, int ExtraFlags = 0) {
auto& api = detail::npy_api::get();
return array(api.PyArray_FromAny_(
input.release().ptr(), nullptr, 0, 0, detail::npy_api::NPY_ENSURE_ARRAY_ | ExtraFlags, nullptr), false);
}
protected:
template<typename, typename> friend struct detail::npy_format_descriptor;
@ -466,7 +473,7 @@ protected:
template <typename T, int ExtraFlags = array::forcecast> class array_t : public array {
public:
PYBIND11_OBJECT_CVT(array_t, array, is_non_null, m_ptr = ensure(m_ptr));
PYBIND11_OBJECT_CVT(array_t, array, is_non_null, m_ptr = ensure_(m_ptr));
array_t() : array() { }
@ -518,7 +525,7 @@ public:
static bool is_non_null(PyObject *ptr) { return ptr != nullptr; }
static PyObject *ensure(PyObject *ptr) {
static PyObject *ensure_(PyObject *ptr) {
if (ptr == nullptr)
return nullptr;
auto& api = detail::npy_api::get();