Merge pull request #2258 from davidbrochart/chunked_shape

Support initialized list for chunked_array shapes

Author: JohanMabille

include/xtensor/xchunked_array.hpp

@@ -234,6 +234,9 @@ namespace xt
     template <class T, layout_type L = XTENSOR_DEFAULT_LAYOUT, class EXT = empty_extension, class S>
     xchunked_array<xarray<xarray<T>>, EXT> chunked_array(S&& shape, S&& chunk_shape, layout_type chunk_memory_layout = XTENSOR_DEFAULT_LAYOUT);
 
+    template <class T, layout_type L = XTENSOR_DEFAULT_LAYOUT, class EXT = empty_extension, class S>
+    xchunked_array<xarray<xarray<T>>, EXT> chunked_array(std::initializer_list<S> shape, std::initializer_list<S> chunk_shape, layout_type chunk_memory_layout = XTENSOR_DEFAULT_LAYOUT);
+
     /**
      * Creates an in-memory chunked array.
      * This function returns a ``xchunked_array<xarray<T>>`` initialized from an expression.
@@ -331,6 +334,15 @@ namespace xt
         return xchunked_array<chunk_storage, EXT>(chunk_storage(), std::forward<S>(shape), std::forward<S>(chunk_shape), chunk_memory_layout);
     }
 
+    template <class T, layout_type L, class EXT, class S>
+    xchunked_array<xarray<xarray<T>>, EXT> chunked_array(std::initializer_list<S> shape, std::initializer_list<S> chunk_shape, layout_type chunk_memory_layout)
+    {
+        using sh_type = std::vector<std::size_t>;
+        auto sh = xtl::forward_sequence<sh_type, std::initializer_list<S>>(shape);
+        auto ch_sh = xtl::forward_sequence<sh_type, std::initializer_list<S>>(chunk_shape);
+        return chunked_array<T, L, EXT, sh_type>(std::move(sh), std::move(ch_sh), chunk_memory_layout);
+    }
+
     template <layout_type L, class EXT, class E, class S>
     inline xchunked_array<xarray<xarray<typename E::value_type>>, EXT>
     chunked_array(const xexpression<E>& e, S&& chunk_shape, layout_type chunk_memory_layout)

test/test_xchunked_array.cpp

@@ -20,9 +20,7 @@ namespace xt
 
     TEST(xchunked_array, indexed_access)
     {
-        std::vector<size_t> shape = {10, 10, 10};
-        std::vector<size_t> chunk_shape = {2, 3, 4};
-        auto a = chunked_array<double>(shape, chunk_shape);
+        auto a = chunked_array<double>({10, 10, 10}, {2, 3, 4});
 
         std::vector<size_t> idx = {3, 9, 8};
         double val;