Skip to content

Commit 0961a88

Browse files
authored
Fix compilation on oneapi 2025 (#861)
* Fix compilation on oneapi 2025 * switch range-v3 provider * Fix header order
1 parent 01b3e25 commit 0961a88

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ endif()
132132

133133
FetchContent_Declare(
134134
range-v3
135-
GIT_REPOSITORY https://github.com/BenBrock/range-v3.git
136-
GIT_TAG 5300fe3)
135+
GIT_REPOSITORY https://github.com/Xewar313/range-v3.git
136+
GIT_TAG c1ed9bf)
137137
FetchContent_MakeAvailable(range-v3)
138138

139139
FetchContent_Declare(

benchmarks/gbench/common/stream.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "dr_bench.hpp"
88

99
template <class ContainerT> void Stream_Copy(benchmark::State &state) {
10-
using T = rng::value_type_t<ContainerT>;
10+
using T = rng::iter_value_t<ContainerT>;
1111
T init = 0;
1212
ContainerT a(default_vector_size, init);
1313
ContainerT b(default_vector_size, init);
@@ -25,7 +25,7 @@ template <class ContainerT> void Stream_Copy(benchmark::State &state) {
2525
inline int val = 0;
2626

2727
template <class ContainerT> void Stream_Scale(benchmark::State &state) {
28-
using T = rng::value_type_t<ContainerT>;
28+
using T = rng::iter_value_t<ContainerT>;
2929
T scalar = val;
3030
ContainerT a(default_vector_size, scalar);
3131
ContainerT b(default_vector_size, scalar);
@@ -42,7 +42,7 @@ template <class ContainerT> void Stream_Scale(benchmark::State &state) {
4242
}
4343

4444
template <class ContainerT> void Stream_Add(benchmark::State &state) {
45-
using T = rng::value_type_t<ContainerT>;
45+
using T = rng::iter_value_t<ContainerT>;
4646
T scalar = val;
4747
xp::distributed_vector<T> a(default_vector_size, scalar);
4848
xp::distributed_vector<T> b(default_vector_size, scalar);
@@ -60,7 +60,7 @@ template <class ContainerT> void Stream_Add(benchmark::State &state) {
6060
}
6161

6262
template <class ContainerT> void Stream_Triad(benchmark::State &state) {
63-
using T = rng::value_type_t<ContainerT>;
63+
using T = rng::iter_value_t<ContainerT>;
6464
T scalar = val;
6565
ContainerT a(default_vector_size, scalar);
6666
ContainerT b(default_vector_size, scalar);

benchmarks/gbench/mp/fft3d.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
#include "cxxopts.hpp"
66
#include "fmt/core.h"
77
#include "mpi.h"
8-
#include "oneapi/mkl/dfti.hpp"
8+
#include "oneapi/mkl/dft.hpp"
9+
#include <complex>
910

1011
#include "dr/mp.hpp"
1112

benchmarks/gbench/sp/fft3d.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
// SPDX-License-Identifier: BSD-3-Clause
44

55
#include "cxxopts.hpp"
6-
#include "oneapi/mkl/dfti.hpp"
6+
#include "oneapi/mkl/dft.hpp"
7+
#include <complex>
78
#include <dr/sp.hpp>
89
#include <fmt/core.h>
910
#include <latch>

0 commit comments

Comments
 (0)