Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-30 00:47:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of one-dimensional input arrays

Browse Source 
In eigen.h, type_caster<Type>::load():  For the 'ndim == 1' case, use
the 'InnerStride' type because there is only an inner stride for a
vector.  Choose between (n_elts x 1) or (1 x n_elts) according to
whether we're constructing a Vector or a RowVector.
This commit is contained in:
Ben North 2016-07-05 20:05:10 +01:00
parent 4a22091d45
commit 93594a3857
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/pybind11/eigen.h
View File

@ -61,7 +61,7 @@ struct type_caster<Type, typename std::enable_if<is_eigen_dense<Type>::value>::t
buffer_info info = buffer.request(); buffer_info info = buffer.request();
if (info.ndim == 1) { if (info.ndim == 1) {
typedef Eigen::Stride<Eigen::Dynamic, 0> Strides; typedef Eigen::InnerStride<> Strides;
if (!isVector && if (!isVector &&
!(Type::RowsAtCompileTime == Eigen::Dynamic && !(Type::RowsAtCompileTime == Eigen::Dynamic &&
Type::ColsAtCompileTime == Eigen::Dynamic)) Type::ColsAtCompileTime == Eigen::Dynamic))
@ -71,10 +71,13 @@ struct type_caster<Type, typename std::enable_if<is_eigen_dense<Type>::value>::t
info.shape[0] != (size_t) Type::SizeAtCompileTime) info.shape[0] != (size_t) Type::SizeAtCompileTime)
return false; return false;
auto strides = Strides(info.strides[0] / sizeof(Scalar), 0); auto strides = Strides(info.strides[0] / sizeof(Scalar));
Strides::Index n_elts = info.shape[0];
Strides::Index unity = 1;
value = Eigen::Map<Type, 0, Strides>( value = Eigen::Map<Type, 0, Strides>(
(Scalar *) info.ptr, typename Strides::Index(info.shape[0]), 1, strides); (Scalar *) info.ptr, rowMajor ? unity : n_elts, rowMajor ? n_elts : unity, strides);
} else if (info.ndim == 2) { } else if (info.ndim == 2) {
typedef Eigen::Stride<Eigen::Dynamic, Eigen::Dynamic> Strides; typedef Eigen::Stride<Eigen::Dynamic, Eigen::Dynamic> Strides;