Accept dimension mismatch for empty arrays

jkseppan · jkseppan · commit 33178e9c0b7f · 2015-09-20T18:37:46.000+03:00
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -447,6 +447,10 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
 		    return 1;
 		}
             }
+	    if (PyArray_NDIM(tmp) > 0 && PyArray_DIM(tmp, 0) == 0) {
+		// accept dimension mismatch for empty arrays
+		return 1;
+	    }
 	    if (PyArray_NDIM(tmp) != ND) {
 		PyErr_Format(PyExc_ValueError,
 			     "Expected %d-dimensional array, got %d",

Original file line number	Diff line number	Diff line change
`@@ -447,6 +447,10 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`447`	`447`	`return 1;`
`448`	`448`	`}`
`449`	`449`	`}`
	`450`	`+ if (PyArray_NDIM(tmp) > 0 && PyArray_DIM(tmp, 0) == 0) {`
	`451`	`+ // accept dimension mismatch for empty arrays`
	`452`	`+ return 1;`
	`453`	`+ }`
`450`	`454`	`if (PyArray_NDIM(tmp) != ND) {`
`451`	`455`	`PyErr_Format(PyExc_ValueError,`
`452`	`456`	`"Expected %d-dimensional array, got %d",`