Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation on oneapi 2025 #861

Merged
merged 3 commits into from
Nov 13, 2024
Merged

Fix compilation on oneapi 2025 #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b11e81d
Fix compilation on oneapi 2025
Xewar313 Nov 5, 2024
f487154
switch range-v3 provider
Xewar313 Nov 8, 2024
dd90427
Fix header order
Xewar313 Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ endif()

FetchContent_Declare(
range-v3
GIT_REPOSITORY https://github.com/BenBrock/range-v3.git
GIT_TAG 5300fe3)
GIT_REPOSITORY https://github.com/Xewar313/range-v3.git
GIT_TAG c1ed9bf)
FetchContent_MakeAvailable(range-v3)

FetchContent_Declare(
Expand Down
8 changes: 4 additions & 4 deletions benchmarks/gbench/common/stream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "dr_bench.hpp"

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

template <class ContainerT> void Stream_Scale(benchmark::State &state) {
using T = rng::value_type_t<ContainerT>;
using T = rng::iter_value_t<ContainerT>;
T scalar = val;
ContainerT a(default_vector_size, scalar);
ContainerT b(default_vector_size, scalar);
Expand All @@ -42,7 +42,7 @@ template <class ContainerT> void Stream_Scale(benchmark::State &state) {
}

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

template <class ContainerT> void Stream_Triad(benchmark::State &state) {
using T = rng::value_type_t<ContainerT>;
using T = rng::iter_value_t<ContainerT>;
T scalar = val;
ContainerT a(default_vector_size, scalar);
ContainerT b(default_vector_size, scalar);
Expand Down
3 changes: 2 additions & 1 deletion benchmarks/gbench/mp/fft3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
#include "cxxopts.hpp"
#include "fmt/core.h"
#include "mpi.h"
#include "oneapi/mkl/dfti.hpp"
#include "oneapi/mkl/dft.hpp"
#include <complex>

#include "dr/mp.hpp"

Expand Down
3 changes: 2 additions & 1 deletion benchmarks/gbench/sp/fft3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
// SPDX-License-Identifier: BSD-3-Clause

#include "cxxopts.hpp"
#include "oneapi/mkl/dfti.hpp"
#include "oneapi/mkl/dft.hpp"
#include <complex>
#include <dr/sp.hpp>
#include <fmt/core.h>
#include <latch>
Expand Down