Skip to content

Commit 8e41928

Browse files
committed
clean up pass
1 parent 6f318bb commit 8e41928

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

include/RAJA/util/View.hpp

+10-13
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,13 @@ template<std::size_t... stride_order_idx>
307307
struct PermutedViewHelper<std::index_sequence<stride_order_idx...>>
308308
{
309309
template<typename IndexType, typename T, typename... Extents>
310-
static auto get(T* ptr, Extents... extents)
310+
static auto get(T* ptr, Extents&&... extents)
311311
{
312312
constexpr int N = sizeof...(Extents);
313-
std::array<RAJA::idx_t, N> extent_arr {extents...};
314313

315314
auto custom_layout = RAJA::make_permuted_layout(
316-
extent_arr, std::array<RAJA::idx_t, N> {stride_order_idx...});
315+
std::array<RAJA::idx_t, N> {std::forward<Extents>(extents)...},
316+
std::array<RAJA::idx_t, N> {stride_order_idx...});
317317

318318
constexpr auto unit_stride = detail::get_last_index(stride_order_idx...);
319319
using view_t = RAJA::View<T, RAJA::Layout<N, IndexType, unit_stride>>;
@@ -326,12 +326,12 @@ template<>
326326
struct PermutedViewHelper<layout_right>
327327
{
328328
template<typename IndexType, typename T, typename... Extents>
329-
static auto get(T* ptr, Extents... extends)
329+
static auto get(T* ptr, Extents&&... extents)
330330
{
331331
constexpr int N = sizeof...(Extents);
332332
using view_t = RAJA::View<T, RAJA::Layout<N, IndexType, N - 1>>;
333333

334-
return view_t(ptr, extends...);
334+
return view_t(ptr, std::forward<Extents>(extents)...);
335335
}
336336
};
337337

@@ -347,17 +347,14 @@ template<>
347347
struct PermutedViewHelper<layout_left>
348348
{
349349
template<typename IndexType, typename T, typename... Extents>
350-
static auto get(T* ptr, Extents... extends)
350+
static auto get(T* ptr, Extents&&... extents)
351351
{
352352
constexpr int N = sizeof...(Extents);
353353

354-
std::array<RAJA::idx_t, N> extent_arr {extends...};
355-
356-
constexpr auto reverse_array =
357-
detail::make_reverse_array(std::make_index_sequence<N> {});
358-
359-
auto reverse_layout = RAJA::make_permuted_layout(extent_arr, reverse_array);
360-
using view_t = RAJA::View<T, RAJA::Layout<N, IndexType, 0U>>;
354+
auto reverse_layout = RAJA::make_permuted_layout(
355+
std::array<RAJA::idx_t, N> {std::forward<Extents>(extents)...},
356+
make_reverse_array(std::make_index_sequence<N> {}));
357+
using view_t = RAJA::View<T, RAJA::Layout<N, IndexType, 0U>>;
361358

362359
return view_t(ptr, reverse_layout);
363360
}

0 commit comments

Comments
 (0)