Merge remote-tracking branch 'origin/main'

Author: capi1500

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(

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);

benchmarks/gbench/mp/fft3d.cpp

@@ -5,7 +5,12 @@
 #include "cxxopts.hpp"
 #include "fmt/core.h"
 #include "mpi.h"
+#if (__INTEL_LLVM_COMPILER >= 20250000)
+#include "oneapi/mkl/dft.hpp"
+#else
 #include "oneapi/mkl/dfti.hpp"
+#endif
+#include <complex>
 
 #include "dr/mp.hpp"
 

benchmarks/gbench/sp/fft3d.cpp

@@ -3,7 +3,12 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 #include "cxxopts.hpp"
+#if (__INTEL_LLVM_COMPILER >= 20250000)
+#include "oneapi/mkl/dft.hpp"
+#else
 #include "oneapi/mkl/dfti.hpp"
+#endif
+#include <complex>
 #include <dr/sp.hpp>
 #include <fmt/core.h>
 #include <latch>