From b11e81d589ba2a86e8b093104670e73bfaf4451b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Komar?= <mikolaj.komar@intel.com>
Date: Tue, 5 Nov 2024 14:50:47 +0000
Subject: [PATCH 1/3] Fix compilation on oneapi 2025

---
 benchmarks/gbench/common/stream.hpp | 8 ++++----
 benchmarks/gbench/mp/fft3d.cpp      | 3 ++-
 benchmarks/gbench/sp/fft3d.cpp      | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/benchmarks/gbench/common/stream.hpp b/benchmarks/gbench/common/stream.hpp
index 92df45e043..de7c9f6182 100644
--- a/benchmarks/gbench/common/stream.hpp
+++ b/benchmarks/gbench/common/stream.hpp
@@ -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);
@@ -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);
@@ -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);
@@ -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);
diff --git a/benchmarks/gbench/mp/fft3d.cpp b/benchmarks/gbench/mp/fft3d.cpp
index d848beddfb..5e30a57b44 100644
--- a/benchmarks/gbench/mp/fft3d.cpp
+++ b/benchmarks/gbench/mp/fft3d.cpp
@@ -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"
 
diff --git a/benchmarks/gbench/sp/fft3d.cpp b/benchmarks/gbench/sp/fft3d.cpp
index 54d6229906..700d6cffcc 100644
--- a/benchmarks/gbench/sp/fft3d.cpp
+++ b/benchmarks/gbench/sp/fft3d.cpp
@@ -3,11 +3,12 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 #include "cxxopts.hpp"
-#include "oneapi/mkl/dfti.hpp"
+#include "oneapi/mkl/dft.hpp"
 #include <dr/sp.hpp>
 #include <fmt/core.h>
 #include <latch>
 #include <thread>
+#include <complex>
 
 #ifndef STANDALONE_BENCHMARK
 

From f48715444199212a784cbce05e22e628338ae36a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Komar?= <mikolaj.komar@intel.com>
Date: Fri, 8 Nov 2024 10:28:26 +0000
Subject: [PATCH 2/3] switch range-v3 provider

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b963e0290..931d00f7bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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(

From dd90427dfcda88a18435b2822103a47cd5f4bef9 Mon Sep 17 00:00:00 2001
From: Mikolaj Komar <mikolaj.komar@intel.com>
Date: Fri, 8 Nov 2024 12:03:55 +0100
Subject: [PATCH 3/3] Fix header order

---
 benchmarks/gbench/sp/fft3d.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/gbench/sp/fft3d.cpp b/benchmarks/gbench/sp/fft3d.cpp
index 700d6cffcc..19d4f3aee4 100644
--- a/benchmarks/gbench/sp/fft3d.cpp
+++ b/benchmarks/gbench/sp/fft3d.cpp
@@ -4,11 +4,11 @@
 
 #include "cxxopts.hpp"
 #include "oneapi/mkl/dft.hpp"
+#include <complex>
 #include <dr/sp.hpp>
 #include <fmt/core.h>
 #include <latch>
 #include <thread>
-#include <complex>
 
 #ifndef STANDALONE_BENCHMARK