Skip to content

Commit 31dcaa3

Browse files
committed
Adapt to P0009R17
- flyby: minor tweak to CMakeLists.txt (detect KokkosKernels quietly) - flyby: adding workaround for MSVC to transposed.hpp
1 parent 76d38cf commit 31dcaa3

File tree

8 files changed

+345
-296
lines changed

8 files changed

+345
-296
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ option(LINALG_ENABLE_BLAS
123123
"Assume that we are linking with a BLAS library."
124124
${BLAS_FOUND})
125125

126-
find_package(KokkosKernels)
126+
find_package(KokkosKernels QUIET)
127127
option(LINALG_ENABLE_KOKKOS
128128
"Enable Kokkos-based implementation. Default: autodetect Kokkos installation."
129129
${KokkosKernels_FOUND})

include/experimental/__p1673_bits/transposed.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,8 @@ namespace impl {
253253
template<class OriginalExtents>
254254
static auto mapping(const typename layout_stride::template mapping<OriginalExtents>& orig_map) {
255255
using original_mapping_type = typename layout_stride::template mapping<OriginalExtents>;
256-
using extents_type = transpose_extents_t<typename original_mapping_type::extents_type>;
256+
// MSVC fails for transpose_extents_t<typename original_mapping_type::extents_type>
257+
using extents_type = transpose_extents_t<typename layout_stride::template mapping<OriginalExtents>::extents_type>;
257258
using return_mapping_type = typename layout_type::template mapping<extents_type>;
258259
return return_mapping_type{
259260
transpose_extents(orig_map.extents()),

tests/hpx-based/add_rank1_hpx.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Copyright (c) 2022 Hartmut Kaiser
22

33
#include <complex>
4+
#include <cstddef>
5+
46
#include <experimental/linalg>
57
#include <experimental/mdspan>
68

@@ -35,7 +37,7 @@ void hpx_blas1_add_test_impl(ExPolicy policy, x_t x, y_t y, z_t z)
3537
// compute gold
3638
std::vector<value_type> gold(extent);
3739
using mdspan_t = std::experimental::mdspan<value_type,
38-
std::experimental::extents<dynamic_extent>>;
40+
std::experimental::extents<::std::size_t, dynamic_extent>>;
3941
mdspan_t z_gold(gold.data(), extent);
4042
add_gold_solution(x, y, z_gold);
4143

0 commit comments

Comments
 (0)