Merge pull request #154 from quantopian/ndarray-shape

gerrymanoim · web-flow · commit 31f4086fe901 · 2020-06-13T19:20:27.000-04:00
BUG: `shape()` should return shape
diff --git a/include/libpy/ndarray_view.h b/include/libpy/ndarray_view.h
@@ -220,7 +220,7 @@ class ndarray_view {
         return ndim;
     }
 
-    /** The number of bytes to go from one element to the next.
+    /** The shape of this array.
      */
     const std::array<std::size_t, ndim>& shape() const {
         return m_shape;
@@ -815,10 +815,10 @@ class any_ref_ndarray_view {
         return ndim;
     }
 
-    /** The number of bytes to go from one element to the next.
+    /** The shape of this array.
      */
     const std::array<std::size_t, ndim>& shape() const {
-        return m_strides;
+        return m_shape;
     }
 
     /** The number of bytes to go from one element to the next.

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ class ndarray_view {`
`220`	`220`	`return ndim;`
`221`	`221`	`}`
`222`	`222`
`223`		`- /** The number of bytes to go from one element to the next.`
	`223`	`+ /** The shape of this array.`
`224`	`224`	`*/`
`225`	`225`	`const std::array<std::size_t, ndim>& shape() const {`
`226`	`226`	`return m_shape;`
`@@ -815,10 +815,10 @@ class any_ref_ndarray_view {`
`815`	`815`	`return ndim;`
`816`	`816`	`}`
`817`	`817`
`818`		`- /** The number of bytes to go from one element to the next.`
	`818`	`+ /** The shape of this array.`
`819`	`819`	`*/`
`820`	`820`	`const std::array<std::size_t, ndim>& shape() const {`
`821`		`- return m_strides;`
	`821`	`+ return m_shape;`
`822`	`822`	`}`
`823`	`823`
`824`	`824`	`/** The number of bytes to go from one element to the next.`