Merge pull request #332 from jcarpent/devel

Fix handling of Numpy blocks on vector types

Author: jcarpent

include/eigenpy/eigen-allocator.hpp

@@ -245,7 +245,8 @@ inline bool is_arr_layout_compatible_with_mat_type(PyArrayObject *pyArray) {
   bool is_array_F_cont = PyArray_IS_F_CONTIGUOUS(pyArray);
   return (MatType::IsRowMajor && is_array_C_cont) ||
          (!MatType::IsRowMajor && is_array_F_cont) ||
-         MatType::IsVectorAtCompileTime;
+         (MatType::IsVectorAtCompileTime &&
+          (is_array_C_cont || is_array_F_cont));
 }
 
 template <typename MatType, int Options, typename Stride>

include/eigenpy/numpy-map.hpp

@@ -161,7 +161,6 @@ struct NumpyMapTraits<MatType, InputScalar, AlignmentValue, Stride, true> {
     const int R = (int)PyArray_DIMS(pyArray)[rowMajor];
     const long int itemsize = PyArray_ITEMSIZE(pyArray);
     const int stride = (int)PyArray_STRIDE(pyArray, rowMajor) / (int)itemsize;
-    ;
 
     if ((MatType::MaxSizeAtCompileTime != R) &&
         (MatType::MaxSizeAtCompileTime != Eigen::Dynamic)) {
@@ -171,6 +170,8 @@ struct NumpyMapTraits<MatType, InputScalar, AlignmentValue, Stride, true> {
 
     InputScalar* pyData = reinterpret_cast<InputScalar*>(PyArray_DATA(pyArray));
 
+    assert(Stride(stride).inner() == stride &&
+           "Stride should be a dynamic stride");
     return EigenMap(pyData, R, Stride(stride));
   }
 };

unittest/eigen_ref.cpp

@@ -30,6 +30,12 @@ void setOnes(Eigen::Ref<MatType> mat) {
   mat.setOnes();
 }
 
+template <typename VecType>
+VecType copyVectorFromConstRef(const Eigen::Ref<const VecType> vec) {
+  std::cout << "copyVectorFromConstRef::vec: " << vec.transpose() << std::endl;
+  return VecType(vec);
+}
+
 template <typename MatType>
 Eigen::Ref<MatType> getBlock(Eigen::Ref<MatType> mat, Eigen::DenseIndex i,
                              Eigen::DenseIndex j, Eigen::DenseIndex n,
@@ -120,6 +126,9 @@ BOOST_PYTHON_MODULE(eigen_ref) {
   bp::def("getBlock", &getBlock<MatrixXd>);
   bp::def("editBlock", &editBlock<MatrixXd>);
 
+  bp::def("copyVectorFromConstRef", &copyVectorFromConstRef<VectorXd>);
+  bp::def("copyRowVectorFromConstRef", &copyVectorFromConstRef<RowVectorXd>);
+
   bp::class_<modify_block_wrap, boost::noncopyable>("modify_block",
                                                     bp::init<>())
       .def_readonly("J", &modify_block::J)

unittest/python/test_eigen_ref.py

@@ -9,6 +9,8 @@
     editBlock,
     modify_block,
     has_ref_member,
+    copyVectorFromConstRef,
+    copyRowVectorFromConstRef,
 )
 
 
@@ -44,6 +46,18 @@ def test_create_ref_to_static(mat):
     assert np.array_equal(A_ref, A_ref2)
 
 
+def test_read_block():
+    data = np.array([[0, 0.2, 0.3, 0.4], [0, 1, 0, 0], [0, 0, 0, 0], [1, 0, 0, 0]])
+
+    data_strided = data[:, 0]
+
+    data_strided_copy = copyVectorFromConstRef(data_strided)
+    assert np.all(data_strided == data_strided_copy)
+
+    data_strided_copy = copyRowVectorFromConstRef(data_strided)
+    assert np.all(data_strided == data_strided_copy)
+
+
 def test_create_ref(mat):
     print("[asRef(mat)]")
     ref = asRef(mat)
@@ -116,6 +130,7 @@ def do_test(mat):
     test_create_const_ref(mat)
     test_create_ref(mat)
     test_edit_block(rows, cols)
+    test_read_block()
     print("=" * 10)