Skip to content

add support for noconvert#75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nbecker wants to merge 4 commits into from
Closed

add support for noconvert #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c4cb83
add support for noconvert
nbecker Apr 12, 2017
f317231
need cast
nbecker Apr 12, 2017
d6b2fb4
CMakeLists.txt: add pytraits.hpp
nbecker Apr 12, 2017
64a404a
Don't need header pytraits.hpp: same code is in pycontainer.hpp
nbecker Apr 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion include/xtensor-python/pyarray.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,15 @@ namespace pybind11
{
using type = xt::pyarray<T>

bool load(handle src, bool)
bool load(handle src, bool convert)
{
if (!convert){
if (!PyArray_Check(src.ptr()))
return false;
int type_num = xt::detail::numpy_traits<T>::type_num;
if (PyArray_TYPE(reinterpret_cast<PyArrayObject*>(src.ptr())) != type_num)
return false;
}
value = type::ensure(src);
return static_cast<bool>(value);
}
Expand Down
11 changes: 9 additions & 2 deletions include/xtensor-python/pytensor.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,16 @@ namespace pybind11
{
using type = xt::pytensor<T, N>

bool load(handle src, bool)
bool load(handle src, bool convert)
{
value = type::ensure(src);
if (!convert){
if (!PyArray_Check(src.ptr()))
return false;
int type_num = xt::detail::numpy_traits<T>::type_num;
if (PyArray_TYPE(reinterpret_cast<PyArrayObject*>(src.ptr())) != type_num)
return false;
}
value = type::ensure(src);
return static_cast<bool>(value);
}

Expand Down