Skip to content

Commit

Permalink
Test: Numpy Scalar Creation
Browse files Browse the repository at this point in the history
I found that te numpy array tests already contained an empty-shaped
array test, but none with data in it.

Following PEP 3118, scalars have an empty shape and ndim 0. This
works already and is now also documented/covered by a test.
  • Loading branch information
ax3l committed Sep 17, 2018
1 parent 9343e68 commit 6fa8cb5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions tests/test_numpy_array.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ template <typename T, typename T2> py::handle auxiliaries(T &&r, T2 &&r2) {
return l.release();
}

// note: declaration at local scope would create a dangling reference!
static int data_i = 42;

TEST_SUBMODULE(numpy_array, sm) {
try { py::module::import("numpy"); }
catch (...) { return; }
Expand Down Expand Up @@ -104,6 +107,8 @@ TEST_SUBMODULE(numpy_array, sm) {

// test_empty_shaped_array
sm.def("make_empty_shaped_array", [] { return py::array(py::dtype("f"), {}, {}); });
// test numpy scalars (empty shape, ndim==0)
sm.def("scalar_int", []() { return py::array(py::dtype("i"), {}, {}, &data_i); });

// test_wrap
sm.def("wrap", [](py::array a) {
Expand Down
5 changes: 5 additions & 0 deletions tests/test_numpy_array.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ def test_make_c_f_array():
def test_make_empty_shaped_array():
m.make_empty_shaped_array()

# empty shape means numpy scalar, PEP 3118
assert m.scalar_int().ndim == 0
assert m.scalar_int().shape == ()
assert m.scalar_int() == 42


def test_wrap():
def assert_references(a, b, base=None):
Expand Down

0 comments on commit 6fa8cb5

Please sign in to comment.