Remove iterator pair constructors

They can be handled via any_container arguments via {begin, end}, and
not having them cuts down the number of constructors required.

Author: jagerman

include/pybind11/buffer_info.h

@@ -35,19 +35,12 @@ struct buffer_info {
             size *= shape[i];
     }
 
-
-    template <typename ShapeIt, typename StridesIt,
-             typename = detail::enable_if_t<detail::is_input_iterator<ShapeIt>::value && detail::is_input_iterator<StridesIt>::value>>
-    buffer_info(void *ptr, size_t itemsize, const std::string &format, size_t ndim,
-            ShapeIt shape_first, ShapeIt shape_last, StridesIt strides_first, StridesIt strides_last)
-    : buffer_info(ptr, itemsize, format, ndim, {shape_first, shape_last}, {strides_first, strides_last}) { }
-
     buffer_info(void *ptr, size_t itemsize, const std::string &format, size_t size)
     : buffer_info(ptr, itemsize, format, 1, { size }, { itemsize }) { }
 
     explicit buffer_info(Py_buffer *view, bool ownview_in = true)
     : buffer_info(view->buf, (size_t) view->itemsize, view->format, (size_t) view->ndim,
-            view->shape, view->shape + view->ndim, view->strides, view->strides + view->ndim) {
+            {view->shape, view->shape + view->ndim}, {view->strides, view->strides + view->ndim}) {
         ownview = ownview_in;
     }
 

include/pybind11/numpy.h

@@ -496,26 +496,13 @@ class array : public buffer {
         m_ptr = tmp.release().ptr();
     }
 
-    template <typename ShapeIt, typename StridesIt,
-             typename = detail::enable_if_t<detail::is_input_iterator<ShapeIt>::value && detail::is_input_iterator<StridesIt>::value>>
-    array(const pybind11::dtype &dt, ShapeIt shape_first, ShapeIt shape_last, StridesIt strides_first, StridesIt strides_last,
-            const void *ptr = nullptr, handle base = handle())
-        : array(dt, {shape_first, shape_last}, {strides_first, strides_last}, ptr, base) { }
-
     array(const pybind11::dtype &dt, ShapeContainer shape, const void *ptr = nullptr, handle base = handle())
         : array(dt, std::move(shape), {}, ptr, base) { }
 
     array(const pybind11::dtype &dt, size_t count, const void *ptr = nullptr,
           handle base = handle())
         : array(dt, ShapeContainer{{ count }}, ptr, base) { }
 
-    template <typename T, typename ShapeIt, typename StridesIt,
-             typename = detail::enable_if_t<detail::is_input_iterator<ShapeIt>::value && detail::is_input_iterator<StridesIt>::value>>
-    array(ShapeIt shape_first, ShapeIt shape_last, StridesIt strides_first, StridesIt strides_last,
-            const T *ptr = nullptr, handle base = handle())
-        : array(pybind11::dtype::of<T>(), ShapeContainer(std::move(shape_first), std::move(shape_last)),
-                StrideContainer(std::move(strides_first), std::move(strides_last)), ptr, base) { }
-
     template <typename T>
     array(ShapeContainer shape, StridesContainer strides, const T *ptr, handle base = handle())
         : array(pybind11::dtype::of<T>(), std::move(shape), std::move(strides), ptr, base) { }
@@ -747,13 +734,6 @@ template <typename T, int ExtraFlags = array::forcecast> class array_t : public
     array_t(ShapeContainer shape, StridesContainer strides, const T *ptr = nullptr, handle base = handle())
         : array(std::move(shape), std::move(strides), ptr, base) { }
 
-    template <typename ShapeIt, typename StridesIt,
-             typename = detail::enable_if_t<detail::is_input_iterator<ShapeIt>::value && detail::is_input_iterator<StridesIt>::value>>
-    array_t(ShapeIt shape_first, ShapeIt shape_last, StridesIt strides_first, StridesIt strides_last,
-            const T *ptr = nullptr, handle base = handle())
-        : array(ShapeContainer(std::move(shape_first), std::move(shape_last)),
-                StridesContainer(std::move(strides_first), std::move(strides_last)), ptr, base) { }
-
     explicit array_t(ShapeContainer shape, const T *ptr = nullptr, handle base = handle())
         : array(std::move(shape), ptr, base) { }
 

tests/test_numpy_array.cpp

@@ -118,8 +118,8 @@ test_initializer numpy_array([](py::module &m) {
     sm.def("wrap", [](py::array a) {
         return py::array(
             a.dtype(),
-            a.shape(), a.shape() + a.ndim(),
-            a.strides(), a.strides() + a.ndim(),
+            {a.shape(), a.shape() + a.ndim()},
+            {a.strides(), a.strides() + a.ndim()},
             a.data(),
             a
         );