Commit 0f63a89
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -624,7 +624,7 @@ namespace xt | |||
| 624 | 624 | template <class S> | |
| 625 | 625 | inline pyarray<T, L> pyarray<T, L>::from_shape(S&& shape) | |
| 626 | 626 | { | |
| 627 | - auto shp = xtl::forward_sequence<shape_type>(shape); | ||
| 627 | + auto shp = xtl::forward_sequence<shape_type, S>(shape); | ||
| 628 | 628 | return self_type(shp); | |
| 629 | 629 | } | |
| 630 | 630 | //@} | |
@@ -679,7 +679,7 @@ namespace xt | |||
| 679 | 679 | : base_type() | |
| 680 | 680 | { | |
| 681 | 681 | // TODO: prevent intermediary shape allocation | |
| 682 | - shape_type shape = xtl::forward_sequence<shape_type>(e.derived_cast().shape()); | ||
| 682 | + shape_type shape = xtl::forward_sequence<shape_type, decltype(e.derived_cast().shape())>(e.derived_cast().shape()); | ||
| 683 | 683 | strides_type strides = xtl::make_sequence<strides_type>(shape.size(), size_type(0)); | |
| 684 | 684 | compute_strides(shape, layout_type::row_major, strides); | |
| 685 | 685 | init_array(shape, strides); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -378,7 +378,7 @@ namespace xt | |||
| 378 | 378 | inline void pycontainer<D>::resize(const S& shape, const strides_type& strides) | |
| 379 | 379 | { | |
| 380 | 380 | detail::check_dims<shape_type>::run(shape.size()); | |
| 381 | - derived_type tmp(xtl::forward_sequence<shape_type>(shape), strides); | ||
| 381 | + derived_type tmp(xtl::forward_sequence<shape_type, decltype(shape)>(shape), strides); | ||
| 382 | 382 | *static_cast<derived_type*>(this) = std::move(tmp); | |
| 383 | 383 | } | |
| 384 | 384 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -334,7 +334,7 @@ namespace xt | |||
| 334 | 334 | inline pytensor<T, N, L> pytensor<T, N, L>::from_shape(S&& shape) | |
| 335 | 335 | { | |
| 336 | 336 | detail::check_dims<shape_type>::run(shape.size()); | |
| 337 | - auto shp = xtl::forward_sequence<shape_type>(shape); | ||
| 337 | + auto shp = xtl::forward_sequence<shape_type, S>(shape); | ||
| 338 | 338 | return self_type(shp); | |
| 339 | 339 | } | |
| 340 | 340 | //@} | |
@@ -378,7 +378,7 @@ namespace xt | |||
| 378 | 378 | inline pytensor<T, N, L>::pytensor(const xexpression<E>& e) | |
| 379 | 379 | : base_type() | |
| 380 | 380 | { | |
| 381 | - shape_type shape = xtl::forward_sequence<shape_type>(e.derived_cast().shape()); | ||
| 381 | + shape_type shape = xtl::forward_sequence<shape_type, decltype(e.derived_cast().shape())>(e.derived_cast().shape()); | ||
| 382 | 382 | strides_type strides = xtl::make_sequence<strides_type>(N, size_type(0)); | |
| 383 | 383 | compute_strides(shape, layout_type::row_major, strides); | |
| 384 | 384 | init_tensor(shape, strides); | |
0 commit comments