Skip to content

P
pybind11
Commit c6257f86 by Ivan Smirnov
Options

Allow nullptr in array ctors wherever possible

parent 10af58fa
Showing with 57 additions and 37 deletions
example/example-numpy-dtypes.cpp
...@@ -178,24 +178,47 @@ py::array_t<int32_t, 0> test_array_ctors(int i) { ...@@ -178,24 +178,47 @@ py::array_t<int32_t, 0> test_array_ctors(int i) {
auto dtype = py::dtype("int32"); auto dtype = py::dtype("int32");
py::buffer_info buf_ndim1(vptr, 4, "i", 6); py::buffer_info buf_ndim1(vptr, 4, "i", 6);
py::buffer_info buf_ndim1_null(nullptr, 4, "i", 6);
py::buffer_info buf_ndim2(vptr, 4, "i", 2, shape, strides); py::buffer_info buf_ndim2(vptr, 4, "i", 2, shape, strides);
py::buffer_info buf_ndim2_null(nullptr, 4, "i", 2, shape, strides);
auto fill = [](py::array arr) {
auto req = arr.request();
for (int i = 0; i < 6; i++) ((int32_t *) req.ptr)[i] = i + 1;
return arr;
};
switch (i) { switch (i) {
// shape: (3, 2) // shape: (3, 2)
case 0: return arr_t(shape, ptr, strides); case 10: return arr_t(shape, strides, ptr);
case 1: return py::array(shape, ptr, strides); case 11: return py::array(shape, strides, ptr);
case 2: return py::array(dtype, shape, vptr, strides); case 12: return py::array(dtype, shape, strides, vptr);
case 3: return arr_t(shape, ptr); case 13: return arr_t(shape, ptr);
case 4: return py::array(shape, ptr); case 14: return py::array(shape, ptr);
case 5: return py::array(dtype, shape, vptr); case 15: return py::array(dtype, shape, vptr);
case 6: return arr_t(buf_ndim2); case 16: return arr_t(buf_ndim2);
case 7: return py::array(buf_ndim2); case 17: return py::array(buf_ndim2);
// shape: (3, 2) - post-fill
case 20: return fill(arr_t(shape, strides));
case 21: return py::array(shape, strides, ptr); // can't have nullptr due to templated ctor
case 22: return fill(py::array(dtype, shape, strides));
case 23: return fill(arr_t(shape));
case 24: return py::array(shape, ptr); // can't have nullptr due to templated ctor
case 25: return fill(py::array(dtype, shape));
case 26: return fill(arr_t(buf_ndim2_null));
case 27: return fill(py::array(buf_ndim2_null));
// shape: (6, )
case 30: return arr_t(6, ptr);
case 31: return py::array(6, ptr);
case 32: return py::array(dtype, 6, vptr);
case 33: return arr_t(buf_ndim1);
case 34: return py::array(buf_ndim1);
// shape: (6, ) // shape: (6, )
case 8: return arr_t(6, ptr); case 40: return fill(arr_t(6));
case 9: return py::array(6, ptr); case 41: return py::array(6, ptr); // can't have nullptr due to templated ctor
case 10: return py::array(dtype, 6, vptr); case 42: return fill(py::array(dtype, 6));
case 11: return arr_t(buf_ndim1); case 43: return fill(arr_t(buf_ndim1_null));
case 12: return py::array(buf_ndim1); case 44: return fill(py::array(buf_ndim1_null));
} }
return arr_t(); return arr_t();
} }
......
example/example-numpy-dtypes.py
...@@ -83,9 +83,12 @@ arr = create_string_array(False) ...@@ -83,9 +83,12 @@ arr = create_string_array(False)
assert dtype == arr.dtype assert dtype == arr.dtype
data = np.arange(1, 7, dtype='int32') data = np.arange(1, 7, dtype='int32')
for i in range(13): for i in range(8):
expected = data if i >= 8 else data.reshape((3, 2)) np.testing.assert_array_equal(test_array_ctors(10 + i), data.reshape((3, 2)))
np.testing.assert_array_equal(test_array_ctors(i), expected) np.testing.assert_array_equal(test_array_ctors(20 + i), data.reshape((3, 2)))
for i in range(5):
np.testing.assert_array_equal(test_array_ctors(30 + i), data)
np.testing.assert_array_equal(test_array_ctors(40 + i), data)
d1 = np.dtype({'names': ['a', 'b'], 'formats': ['int32', 'float64'], d1 = np.dtype({'names': ['a', 'b'], 'formats': ['int32', 'float64'],
'offsets': [1, 10], 'itemsize': 20}) 'offsets': [1, 10], 'itemsize': 20})
......
include/pybind11/numpy.h
...@@ -212,7 +212,7 @@ public: ...@@ -212,7 +212,7 @@ public:
}; };
array(const pybind11::dtype& dt, const std::vector<size_t>& shape, array(const pybind11::dtype& dt, const std::vector<size_t>& shape,
void *ptr, const std::vector<size_t>& strides) { const std::vector<size_t>& strides, void *ptr = nullptr) {
auto& api = detail::npy_api::get(); auto& api = detail::npy_api::get();
auto ndim = shape.size(); auto ndim = shape.size();
if (shape.size() != strides.size()) if (shape.size() != strides.size())
...@@ -228,30 +228,24 @@ public: ...@@ -228,30 +228,24 @@ public:
m_ptr = tmp.release().ptr(); m_ptr = tmp.release().ptr();
} }
array(const pybind11::dtype& dt, const std::vector<size_t>& shape, void *ptr) array(const pybind11::dtype& dt, const std::vector<size_t>& shape, void *ptr = nullptr)
: array(dt, shape, ptr, default_strides(shape, dt.itemsize())) : array(dt, shape, default_strides(shape, dt.itemsize()), ptr) { }
{ }
array(const pybind11::dtype& dt, size_t size, void *ptr) array(const pybind11::dtype& dt, size_t size, void *ptr = nullptr)
: array(dt, std::vector<size_t> { size }, ptr) : array(dt, std::vector<size_t> { size }, ptr) { }
{ }
template<typename T> array(const std::vector<size_t>& shape, template<typename T> array(const std::vector<size_t>& shape,
T* ptr, const std::vector<size_t>& strides) const std::vector<size_t>& strides, T* ptr)
: array(pybind11::dtype::of<T>(), shape, (void *) ptr, strides) : array(pybind11::dtype::of<T>(), shape, strides, (void *) ptr) { }
{ }
template<typename T> array(const std::vector<size_t>& shape, T* ptr) template<typename T> array(const std::vector<size_t>& shape, T* ptr)
: array(shape, ptr, default_strides(shape, sizeof(T))) : array(shape, default_strides(shape, sizeof(T)), ptr) { }
{ }
template<typename T> array(size_t size, T* ptr) template<typename T> array(size_t size, T* ptr)
: array(std::vector<size_t> { size }, ptr) : array(std::vector<size_t> { size }, ptr) { }
{ }
array(const buffer_info &info) array(const buffer_info &info)
: array(pybind11::dtype(info), info.shape, info.ptr, info.strides) : array(pybind11::dtype(info), info.shape, info.strides, info.ptr) { }
{ }
pybind11::dtype dtype() { pybind11::dtype dtype() {
return attr("dtype").cast<pybind11::dtype>(); return attr("dtype").cast<pybind11::dtype>();
...@@ -281,17 +275,17 @@ public: ...@@ -281,17 +275,17 @@ public:
array_t(const buffer_info& info) : array(info) { } array_t(const buffer_info& info) : array(info) { }
array_t(const std::vector<size_t>& shape, array_t(const std::vector<size_t>& shape, const std::vector<size_t>& strides, T* ptr = nullptr)
T* ptr, const std::vector<size_t>& strides) : array(shape, strides, ptr) { }
: array(shape, ptr, strides) { }
array_t(const std::vector<size_t>& shape, T* ptr) array_t(const std::vector<size_t>& shape, T* ptr = nullptr)
: array(shape, ptr) { } : array(shape, ptr) { }
array_t(size_t size, T* ptr) array_t(size_t size, T* ptr = nullptr)
: array(size, ptr) { } : array(size, ptr) { }
static bool is_non_null(PyObject *ptr) { return ptr != nullptr; } static bool is_non_null(PyObject *ptr) { return ptr != nullptr; }
static PyObject *ensure(PyObject *ptr) { static PyObject *ensure(PyObject *ptr) {
if (ptr == nullptr) if (ptr == nullptr)
return nullptr; return nullptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment