2016-08-29 01:41:05 +00:00
|
|
|
/*
|
|
|
|
tests/test_numpy_array.cpp -- test core array functionality
|
|
|
|
|
|
|
|
Copyright (c) 2016 Ivan Smirnov <i.s.smirnov@gmail.com>
|
|
|
|
|
|
|
|
All rights reserved. Use of this source code is governed by a
|
|
|
|
BSD-style license that can be found in the LICENSE file.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "pybind11_tests.h"
|
2016-09-08 22:03:35 +00:00
|
|
|
|
2016-08-29 01:41:05 +00:00
|
|
|
#include <pybind11/numpy.h>
|
|
|
|
#include <pybind11/stl.h>
|
|
|
|
|
2016-09-08 22:03:35 +00:00
|
|
|
#include <cstdint>
|
|
|
|
|
|
|
|
using arr = py::array;
|
|
|
|
using arr_t = py::array_t<uint16_t, 0>;
|
2017-03-13 18:17:18 +00:00
|
|
|
static_assert(std::is_same<arr_t::value_type, uint16_t>::value, "");
|
2016-09-08 22:03:35 +00:00
|
|
|
|
2016-11-16 16:53:37 +00:00
|
|
|
template<typename... Ix> arr data(const arr& a, Ix... index) {
|
2017-04-14 20:33:44 +00:00
|
|
|
return arr(a.nbytes() - a.offset_at(index...), (const uint8_t *) a.data(index...));
|
2016-09-08 22:03:35 +00:00
|
|
|
}
|
|
|
|
|
2016-11-16 16:53:37 +00:00
|
|
|
template<typename... Ix> arr data_t(const arr_t& a, Ix... index) {
|
2017-04-14 20:33:44 +00:00
|
|
|
return arr(a.size() - a.index_at(index...), a.data(index...));
|
2016-09-08 22:03:35 +00:00
|
|
|
}
|
|
|
|
|
2016-11-16 16:53:37 +00:00
|
|
|
template<typename... Ix> arr& mutate_data(arr& a, Ix... index) {
|
2016-09-08 22:03:35 +00:00
|
|
|
auto ptr = (uint8_t *) a.mutable_data(index...);
|
2017-04-14 20:33:44 +00:00
|
|
|
for (ssize_t i = 0; i < a.nbytes() - a.offset_at(index...); i++)
|
2016-09-08 22:03:35 +00:00
|
|
|
ptr[i] = (uint8_t) (ptr[i] * 2);
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
2016-11-16 16:53:37 +00:00
|
|
|
template<typename... Ix> arr_t& mutate_data_t(arr_t& a, Ix... index) {
|
2016-09-08 22:03:35 +00:00
|
|
|
auto ptr = a.mutable_data(index...);
|
2017-04-14 20:33:44 +00:00
|
|
|
for (ssize_t i = 0; i < a.size() - a.index_at(index...); i++)
|
2016-09-08 22:03:35 +00:00
|
|
|
ptr[i]++;
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
2017-04-14 20:33:44 +00:00
|
|
|
template<typename... Ix> ssize_t index_at(const arr& a, Ix... idx) { return a.index_at(idx...); }
|
|
|
|
template<typename... Ix> ssize_t index_at_t(const arr_t& a, Ix... idx) { return a.index_at(idx...); }
|
|
|
|
template<typename... Ix> ssize_t offset_at(const arr& a, Ix... idx) { return a.offset_at(idx...); }
|
|
|
|
template<typename... Ix> ssize_t offset_at_t(const arr_t& a, Ix... idx) { return a.offset_at(idx...); }
|
|
|
|
template<typename... Ix> ssize_t at_t(const arr_t& a, Ix... idx) { return a.at(idx...); }
|
2016-11-16 16:53:37 +00:00
|
|
|
template<typename... Ix> arr_t& mutate_at_t(arr_t& a, Ix... idx) { a.mutable_at(idx...)++; return a; }
|
2016-09-08 22:03:35 +00:00
|
|
|
|
|
|
|
#define def_index_fn(name, type) \
|
|
|
|
sm.def(#name, [](type a) { return name(a); }); \
|
|
|
|
sm.def(#name, [](type a, int i) { return name(a, i); }); \
|
|
|
|
sm.def(#name, [](type a, int i, int j) { return name(a, i, j); }); \
|
|
|
|
sm.def(#name, [](type a, int i, int j, int k) { return name(a, i, j, k); });
|
|
|
|
|
2017-03-20 20:48:38 +00:00
|
|
|
template <typename T, typename T2> py::handle auxiliaries(T &&r, T2 &&r2) {
|
|
|
|
if (r.ndim() != 2) throw std::domain_error("error: ndim != 2");
|
|
|
|
py::list l;
|
|
|
|
l.append(*r.data(0, 0));
|
|
|
|
l.append(*r2.mutable_data(0, 0));
|
|
|
|
l.append(r.data(0, 1) == r2.mutable_data(0, 1));
|
|
|
|
l.append(r.ndim());
|
|
|
|
l.append(r.itemsize());
|
|
|
|
l.append(r.shape(0));
|
|
|
|
l.append(r.shape(1));
|
|
|
|
l.append(r.size());
|
|
|
|
l.append(r.nbytes());
|
|
|
|
return l.release();
|
|
|
|
}
|
|
|
|
|
2019-06-11 12:00:05 +00:00
|
|
|
// note: declaration at local scope would create a dangling reference!
|
|
|
|
static int data_i = 42;
|
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
TEST_SUBMODULE(numpy_array, sm) {
|
|
|
|
try { py::module::import("numpy"); }
|
|
|
|
catch (...) { return; }
|
2016-09-08 22:03:35 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_array_attributes
|
2016-09-08 22:03:35 +00:00
|
|
|
sm.def("ndim", [](const arr& a) { return a.ndim(); });
|
|
|
|
sm.def("shape", [](const arr& a) { return arr(a.ndim(), a.shape()); });
|
2017-04-14 20:33:44 +00:00
|
|
|
sm.def("shape", [](const arr& a, ssize_t dim) { return a.shape(dim); });
|
2016-09-08 22:03:35 +00:00
|
|
|
sm.def("strides", [](const arr& a) { return arr(a.ndim(), a.strides()); });
|
2017-04-14 20:33:44 +00:00
|
|
|
sm.def("strides", [](const arr& a, ssize_t dim) { return a.strides(dim); });
|
2016-09-08 22:03:35 +00:00
|
|
|
sm.def("writeable", [](const arr& a) { return a.writeable(); });
|
|
|
|
sm.def("size", [](const arr& a) { return a.size(); });
|
|
|
|
sm.def("itemsize", [](const arr& a) { return a.itemsize(); });
|
|
|
|
sm.def("nbytes", [](const arr& a) { return a.nbytes(); });
|
|
|
|
sm.def("owndata", [](const arr& a) { return a.owndata(); });
|
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_index_offset
|
2016-09-08 22:03:35 +00:00
|
|
|
def_index_fn(index_at, const arr&);
|
|
|
|
def_index_fn(index_at_t, const arr_t&);
|
|
|
|
def_index_fn(offset_at, const arr&);
|
|
|
|
def_index_fn(offset_at_t, const arr_t&);
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_data
|
|
|
|
def_index_fn(data, const arr&);
|
|
|
|
def_index_fn(data_t, const arr_t&);
|
|
|
|
// test_mutate_data, test_mutate_readonly
|
2016-09-08 22:03:35 +00:00
|
|
|
def_index_fn(mutate_data, arr&);
|
|
|
|
def_index_fn(mutate_data_t, arr_t&);
|
|
|
|
def_index_fn(at_t, const arr_t&);
|
|
|
|
def_index_fn(mutate_at_t, arr_t&);
|
2016-10-12 21:34:06 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_make_c_f_array
|
|
|
|
sm.def("make_f_array", [] { return py::array_t<float>({ 2, 2 }, { 4, 8 }); });
|
|
|
|
sm.def("make_c_array", [] { return py::array_t<float>({ 2, 2 }, { 8, 4 }); });
|
2016-10-12 22:57:42 +00:00
|
|
|
|
2018-05-06 13:59:25 +00:00
|
|
|
// test_empty_shaped_array
|
|
|
|
sm.def("make_empty_shaped_array", [] { return py::array(py::dtype("f"), {}, {}); });
|
2019-06-11 12:00:05 +00:00
|
|
|
// test numpy scalars (empty shape, ndim==0)
|
|
|
|
sm.def("scalar_int", []() { return py::array(py::dtype("i"), {}, {}, &data_i); });
|
2018-05-06 13:59:25 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_wrap
|
2016-10-12 22:57:42 +00:00
|
|
|
sm.def("wrap", [](py::array a) {
|
|
|
|
return py::array(
|
|
|
|
a.dtype(),
|
2017-04-07 19:49:54 +00:00
|
|
|
{a.shape(), a.shape() + a.ndim()},
|
|
|
|
{a.strides(), a.strides() + a.ndim()},
|
2016-10-12 22:57:42 +00:00
|
|
|
a.data(),
|
|
|
|
a
|
|
|
|
);
|
|
|
|
});
|
2016-10-13 08:37:52 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_numpy_view
|
2016-10-13 08:37:52 +00:00
|
|
|
struct ArrayClass {
|
|
|
|
int data[2] = { 1, 2 };
|
|
|
|
ArrayClass() { py::print("ArrayClass()"); }
|
|
|
|
~ArrayClass() { py::print("~ArrayClass()"); }
|
|
|
|
};
|
|
|
|
py::class_<ArrayClass>(sm, "ArrayClass")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def("numpy_view", [](py::object &obj) {
|
|
|
|
py::print("ArrayClass::numpy_view()");
|
|
|
|
ArrayClass &a = obj.cast<ArrayClass&>();
|
|
|
|
return py::array_t<int>({2}, {4}, a.data, obj);
|
|
|
|
}
|
|
|
|
);
|
2016-10-27 22:37:07 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_cast_numpy_int64_to_uint64
|
2016-10-27 23:23:42 +00:00
|
|
|
sm.def("function_taking_uint64", [](uint64_t) { });
|
2016-11-16 00:35:22 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_isinstance
|
2016-11-16 00:35:22 +00:00
|
|
|
sm.def("isinstance_untyped", [](py::object yes, py::object no) {
|
|
|
|
return py::isinstance<py::array>(yes) && !py::isinstance<py::array>(no);
|
|
|
|
});
|
|
|
|
sm.def("isinstance_typed", [](py::object o) {
|
|
|
|
return py::isinstance<py::array_t<double>>(o) && !py::isinstance<py::array_t<int>>(o);
|
|
|
|
});
|
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_constructors
|
2016-11-16 00:35:22 +00:00
|
|
|
sm.def("default_constructors", []() {
|
|
|
|
return py::dict(
|
|
|
|
"array"_a=py::array(),
|
|
|
|
"array_t<int32>"_a=py::array_t<std::int32_t>(),
|
|
|
|
"array_t<double>"_a=py::array_t<double>()
|
|
|
|
);
|
|
|
|
});
|
|
|
|
sm.def("converting_constructors", [](py::object o) {
|
|
|
|
return py::dict(
|
|
|
|
"array"_a=py::array(o),
|
|
|
|
"array_t<int32>"_a=py::array_t<std::int32_t>(o),
|
|
|
|
"array_t<double>"_a=py::array_t<double>(o)
|
|
|
|
);
|
|
|
|
});
|
2017-02-24 10:33:31 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_overload_resolution
|
2017-02-26 23:03:00 +00:00
|
|
|
sm.def("overloaded", [](py::array_t<double>) { return "double"; });
|
|
|
|
sm.def("overloaded", [](py::array_t<float>) { return "float"; });
|
|
|
|
sm.def("overloaded", [](py::array_t<int>) { return "int"; });
|
|
|
|
sm.def("overloaded", [](py::array_t<unsigned short>) { return "unsigned short"; });
|
|
|
|
sm.def("overloaded", [](py::array_t<long long>) { return "long long"; });
|
|
|
|
sm.def("overloaded", [](py::array_t<std::complex<double>>) { return "double complex"; });
|
|
|
|
sm.def("overloaded", [](py::array_t<std::complex<float>>) { return "float complex"; });
|
|
|
|
|
|
|
|
sm.def("overloaded2", [](py::array_t<std::complex<double>>) { return "double complex"; });
|
|
|
|
sm.def("overloaded2", [](py::array_t<double>) { return "double"; });
|
|
|
|
sm.def("overloaded2", [](py::array_t<std::complex<float>>) { return "float complex"; });
|
|
|
|
sm.def("overloaded2", [](py::array_t<float>) { return "float"; });
|
|
|
|
|
|
|
|
// Only accept the exact types:
|
|
|
|
sm.def("overloaded3", [](py::array_t<int>) { return "int"; }, py::arg().noconvert());
|
|
|
|
sm.def("overloaded3", [](py::array_t<double>) { return "double"; }, py::arg().noconvert());
|
|
|
|
|
|
|
|
// Make sure we don't do unsafe coercion (e.g. float to int) when not using forcecast, but
|
|
|
|
// rather that float gets converted via the safe (conversion to double) overload:
|
|
|
|
sm.def("overloaded4", [](py::array_t<long long, 0>) { return "long long"; });
|
|
|
|
sm.def("overloaded4", [](py::array_t<double, 0>) { return "double"; });
|
|
|
|
|
|
|
|
// But we do allow conversion to int if forcecast is enabled (but only if no overload matches
|
|
|
|
// without conversion)
|
|
|
|
sm.def("overloaded5", [](py::array_t<unsigned int>) { return "unsigned int"; });
|
|
|
|
sm.def("overloaded5", [](py::array_t<double>) { return "double"; });
|
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_greedy_string_overload
|
2017-02-24 10:33:31 +00:00
|
|
|
// Issue 685: ndarray shouldn't go to std::string overload
|
|
|
|
sm.def("issue685", [](std::string) { return "string"; });
|
|
|
|
sm.def("issue685", [](py::array) { return "array"; });
|
|
|
|
sm.def("issue685", [](py::object) { return "other"; });
|
2017-03-19 04:14:23 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_array_unchecked_fixed_dims
|
2017-03-19 04:14:23 +00:00
|
|
|
sm.def("proxy_add2", [](py::array_t<double> a, double v) {
|
|
|
|
auto r = a.mutable_unchecked<2>();
|
2017-04-14 20:33:44 +00:00
|
|
|
for (ssize_t i = 0; i < r.shape(0); i++)
|
|
|
|
for (ssize_t j = 0; j < r.shape(1); j++)
|
2017-03-19 04:14:23 +00:00
|
|
|
r(i, j) += v;
|
|
|
|
}, py::arg().noconvert(), py::arg());
|
2017-03-20 20:48:38 +00:00
|
|
|
|
2017-03-19 04:14:23 +00:00
|
|
|
sm.def("proxy_init3", [](double start) {
|
|
|
|
py::array_t<double, py::array::c_style> a({ 3, 3, 3 });
|
|
|
|
auto r = a.mutable_unchecked<3>();
|
2017-04-14 20:33:44 +00:00
|
|
|
for (ssize_t i = 0; i < r.shape(0); i++)
|
|
|
|
for (ssize_t j = 0; j < r.shape(1); j++)
|
|
|
|
for (ssize_t k = 0; k < r.shape(2); k++)
|
2017-03-19 04:14:23 +00:00
|
|
|
r(i, j, k) = start++;
|
|
|
|
return a;
|
|
|
|
});
|
|
|
|
sm.def("proxy_init3F", [](double start) {
|
|
|
|
py::array_t<double, py::array::f_style> a({ 3, 3, 3 });
|
|
|
|
auto r = a.mutable_unchecked<3>();
|
2017-04-14 20:33:44 +00:00
|
|
|
for (ssize_t k = 0; k < r.shape(2); k++)
|
|
|
|
for (ssize_t j = 0; j < r.shape(1); j++)
|
|
|
|
for (ssize_t i = 0; i < r.shape(0); i++)
|
2017-03-19 04:14:23 +00:00
|
|
|
r(i, j, k) = start++;
|
|
|
|
return a;
|
|
|
|
});
|
|
|
|
sm.def("proxy_squared_L2_norm", [](py::array_t<double> a) {
|
|
|
|
auto r = a.unchecked<1>();
|
|
|
|
double sumsq = 0;
|
2017-04-14 20:33:44 +00:00
|
|
|
for (ssize_t i = 0; i < r.shape(0); i++)
|
2017-03-19 04:14:23 +00:00
|
|
|
sumsq += r[i] * r(i); // Either notation works for a 1D array
|
|
|
|
return sumsq;
|
|
|
|
});
|
2017-03-20 20:48:38 +00:00
|
|
|
|
|
|
|
sm.def("proxy_auxiliaries2", [](py::array_t<double> a) {
|
|
|
|
auto r = a.unchecked<2>();
|
|
|
|
auto r2 = a.mutable_unchecked<2>();
|
|
|
|
return auxiliaries(r, r2);
|
|
|
|
});
|
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_array_unchecked_dyn_dims
|
2017-03-20 20:48:38 +00:00
|
|
|
// Same as the above, but without a compile-time dimensions specification:
|
|
|
|
sm.def("proxy_add2_dyn", [](py::array_t<double> a, double v) {
|
|
|
|
auto r = a.mutable_unchecked();
|
|
|
|
if (r.ndim() != 2) throw std::domain_error("error: ndim != 2");
|
2017-04-14 20:33:44 +00:00
|
|
|
for (ssize_t i = 0; i < r.shape(0); i++)
|
|
|
|
for (ssize_t j = 0; j < r.shape(1); j++)
|
2017-03-20 20:48:38 +00:00
|
|
|
r(i, j) += v;
|
|
|
|
}, py::arg().noconvert(), py::arg());
|
|
|
|
sm.def("proxy_init3_dyn", [](double start) {
|
|
|
|
py::array_t<double, py::array::c_style> a({ 3, 3, 3 });
|
|
|
|
auto r = a.mutable_unchecked();
|
|
|
|
if (r.ndim() != 3) throw std::domain_error("error: ndim != 3");
|
2017-04-14 20:33:44 +00:00
|
|
|
for (ssize_t i = 0; i < r.shape(0); i++)
|
|
|
|
for (ssize_t j = 0; j < r.shape(1); j++)
|
|
|
|
for (ssize_t k = 0; k < r.shape(2); k++)
|
2017-03-20 20:48:38 +00:00
|
|
|
r(i, j, k) = start++;
|
|
|
|
return a;
|
|
|
|
});
|
|
|
|
sm.def("proxy_auxiliaries2_dyn", [](py::array_t<double> a) {
|
|
|
|
return auxiliaries(a.unchecked(), a.mutable_unchecked());
|
|
|
|
});
|
|
|
|
|
|
|
|
sm.def("array_auxiliaries2", [](py::array_t<double> a) {
|
|
|
|
return auxiliaries(a, a);
|
|
|
|
});
|
2017-04-10 15:05:26 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_array_failures
|
2017-04-10 15:05:26 +00:00
|
|
|
// Issue #785: Uninformative "Unknown internal error" exception when constructing array from empty object:
|
|
|
|
sm.def("array_fail_test", []() { return py::array(py::object()); });
|
|
|
|
sm.def("array_t_fail_test", []() { return py::array_t<double>(py::object()); });
|
2017-04-14 20:33:44 +00:00
|
|
|
// Make sure the error from numpy is being passed through:
|
|
|
|
sm.def("array_fail_test_negative_size", []() { int c = 0; return py::array(-1, &c); });
|
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_initializer_list
|
2017-04-28 15:06:16 +00:00
|
|
|
// Issue (unnumbered; reported in #788): regression: initializer lists can be ambiguous
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
sm.def("array_initializer_list1", []() { return py::array_t<float>(1); }); // { 1 } also works, but clang warns about it
|
|
|
|
sm.def("array_initializer_list2", []() { return py::array_t<float>({ 1, 2 }); });
|
|
|
|
sm.def("array_initializer_list3", []() { return py::array_t<float>({ 1, 2, 3 }); });
|
|
|
|
sm.def("array_initializer_list4", []() { return py::array_t<float>({ 1, 2, 3, 4 }); });
|
2017-04-13 16:41:55 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_array_resize
|
2017-04-13 16:41:55 +00:00
|
|
|
// reshape array to 2D without changing size
|
|
|
|
sm.def("array_reshape2", [](py::array_t<double> a) {
|
2017-04-14 20:33:44 +00:00
|
|
|
const ssize_t dim_sz = (ssize_t)std::sqrt(a.size());
|
2017-04-13 16:41:55 +00:00
|
|
|
if (dim_sz * dim_sz != a.size())
|
|
|
|
throw std::domain_error("array_reshape2: input array total size is not a squared integer");
|
|
|
|
a.resize({dim_sz, dim_sz});
|
|
|
|
});
|
|
|
|
|
|
|
|
// resize to 3D array with each dimension = N
|
|
|
|
sm.def("array_resize3", [](py::array_t<double> a, size_t N, bool refcheck) {
|
|
|
|
a.resize({N, N, N}, refcheck);
|
|
|
|
});
|
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_array_create_and_resize
|
2017-04-13 16:41:55 +00:00
|
|
|
// return 2D array with Nrows = Ncols = N
|
|
|
|
sm.def("create_and_resize", [](size_t N) {
|
|
|
|
py::array_t<double> a;
|
|
|
|
a.resize({N, N});
|
|
|
|
std::fill(a.mutable_data(), a.mutable_data() + a.size(), 42.);
|
|
|
|
return a;
|
|
|
|
});
|
2018-08-27 22:23:59 +00:00
|
|
|
|
|
|
|
#if PY_MAJOR_VERSION >= 3
|
|
|
|
sm.def("index_using_ellipsis", [](py::array a) {
|
|
|
|
return a[py::make_tuple(0, py::ellipsis(), 0)];
|
|
|
|
});
|
|
|
|
#endif
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
}
|