Merge pull request #46 from SylvainCorlay/fix-compute-strides

SylvainCorlay · web-flow · commit 07df129fa901 · 2017-03-26T15:16:32.000+02:00
Use xstrided's compute_strides
diff --git a/include/xtensor-python/pyarray.hpp b/include/xtensor-python/pyarray.hpp
@@ -261,7 +261,7 @@ namespace xt
     inline pyarray<T>::pyarray(const shape_type& shape, layout l)
     {
         strides_type strides;
-        base_type::fill_default_strides(shape, l, strides);
+        compute_strides(shape, l, strides);
         init_array(shape, strides);
     }
 
diff --git a/include/xtensor-python/pytensor.hpp b/include/xtensor-python/pytensor.hpp
@@ -179,7 +179,7 @@ namespace xt
     template <class T, std::size_t N>
     inline pytensor<T, N>::pytensor(const shape_type& shape, layout l)
     {
-        base_type::fill_default_strides(shape, l, m_strides);
+        compute_strides(shape, l, m_strides);
         init_tensor(shape, m_strides);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ namespace xt`
`261`	`261`	`inline pyarray<T>::pyarray(const shape_type& shape, layout l)`
`262`	`262`	`{`
`263`	`263`	`strides_type strides;`
`264`		`- base_type::fill_default_strides(shape, l, strides);`
	`264`	`+ compute_strides(shape, l, strides);`
`265`	`265`	`init_array(shape, strides);`
`266`	`266`	`}`
`267`	`267`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ namespace xt`
`179`	`179`	`template <class T, std::size_t N>`
`180`	`180`	`inline pytensor<T, N>::pytensor(const shape_type& shape, layout l)`
`181`	`181`	`{`
`182`		`- base_type::fill_default_strides(shape, l, m_strides);`
	`182`	`+ compute_strides(shape, l, m_strides);`
`183`	`183`	`init_tensor(shape, m_strides);`
`184`	`184`	`}`
`185`	`185`