From 8f1a2b7e8efb1f30fc720704041ba8990812883a Mon Sep 17 00:00:00 2001 From: Mikolaj Komar Date: Wed, 13 Nov 2024 16:08:44 +0100 Subject: [PATCH 1/3] Fix compilation on older OneDpl --- benchmarks/gbench/mp/fft3d.cpp | 6 +++++- benchmarks/gbench/sp/fft3d.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/benchmarks/gbench/mp/fft3d.cpp b/benchmarks/gbench/mp/fft3d.cpp index 5e30a57b44..4bda1e2d7b 100644 --- a/benchmarks/gbench/mp/fft3d.cpp +++ b/benchmarks/gbench/mp/fft3d.cpp @@ -5,7 +5,11 @@ #include "cxxopts.hpp" #include "fmt/core.h" #include "mpi.h" -#include "oneapi/mkl/dft.hpp" +#if (ONEDPL_VERSION_MAJOR >= 2025) + #include "oneapi/mkl/dft.hpp" +#else + #include "oneapi/mkl/dfti.hpp" +#endif #include #include "dr/mp.hpp" diff --git a/benchmarks/gbench/sp/fft3d.cpp b/benchmarks/gbench/sp/fft3d.cpp index 19d4f3aee4..61f9517528 100644 --- a/benchmarks/gbench/sp/fft3d.cpp +++ b/benchmarks/gbench/sp/fft3d.cpp @@ -3,7 +3,11 @@ // SPDX-License-Identifier: BSD-3-Clause #include "cxxopts.hpp" -#include "oneapi/mkl/dft.hpp" +#if (ONEDPL_VERSION_MAJOR >= 2025) + #include "oneapi/mkl/dft.hpp" +#else + #include "oneapi/mkl/dfti.hpp" +#endif #include #include #include From 28e023ecd0fb143e90cfc411f9071b15bcfe1381 Mon Sep 17 00:00:00 2001 From: Mikolaj Komar Date: Wed, 13 Nov 2024 16:10:34 +0100 Subject: [PATCH 2/3] Fix style --- benchmarks/gbench/mp/fft3d.cpp | 4 ++-- benchmarks/gbench/sp/fft3d.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/benchmarks/gbench/mp/fft3d.cpp b/benchmarks/gbench/mp/fft3d.cpp index 4bda1e2d7b..8ae7d068c6 100644 --- a/benchmarks/gbench/mp/fft3d.cpp +++ b/benchmarks/gbench/mp/fft3d.cpp @@ -6,9 +6,9 @@ #include "fmt/core.h" #include "mpi.h" #if (ONEDPL_VERSION_MAJOR >= 2025) - #include "oneapi/mkl/dft.hpp" +#include "oneapi/mkl/dft.hpp" #else - #include "oneapi/mkl/dfti.hpp" +#include "oneapi/mkl/dfti.hpp" #endif #include diff --git a/benchmarks/gbench/sp/fft3d.cpp b/benchmarks/gbench/sp/fft3d.cpp index 61f9517528..ee1de59ae5 100644 --- a/benchmarks/gbench/sp/fft3d.cpp +++ b/benchmarks/gbench/sp/fft3d.cpp @@ -4,9 +4,9 @@ #include "cxxopts.hpp" #if (ONEDPL_VERSION_MAJOR >= 2025) - #include "oneapi/mkl/dft.hpp" +#include "oneapi/mkl/dft.hpp" #else - #include "oneapi/mkl/dfti.hpp" +#include "oneapi/mkl/dfti.hpp" #endif #include #include From 1f0825d141394b7b621fe278d0b7c7acca322b05 Mon Sep 17 00:00:00 2001 From: Mikolaj Komar Date: Wed, 13 Nov 2024 16:45:55 +0100 Subject: [PATCH 3/3] Some fixes with version macro --- benchmarks/gbench/mp/fft3d.cpp | 2 +- benchmarks/gbench/sp/fft3d.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/benchmarks/gbench/mp/fft3d.cpp b/benchmarks/gbench/mp/fft3d.cpp index 8ae7d068c6..23dcbbdae3 100644 --- a/benchmarks/gbench/mp/fft3d.cpp +++ b/benchmarks/gbench/mp/fft3d.cpp @@ -5,7 +5,7 @@ #include "cxxopts.hpp" #include "fmt/core.h" #include "mpi.h" -#if (ONEDPL_VERSION_MAJOR >= 2025) +#if (__INTEL_LLVM_COMPILER >= 20250000) #include "oneapi/mkl/dft.hpp" #else #include "oneapi/mkl/dfti.hpp" diff --git a/benchmarks/gbench/sp/fft3d.cpp b/benchmarks/gbench/sp/fft3d.cpp index ee1de59ae5..cdf060c88c 100644 --- a/benchmarks/gbench/sp/fft3d.cpp +++ b/benchmarks/gbench/sp/fft3d.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: BSD-3-Clause #include "cxxopts.hpp" -#if (ONEDPL_VERSION_MAJOR >= 2025) +#if (__INTEL_LLVM_COMPILER >= 20250000) #include "oneapi/mkl/dft.hpp" #else #include "oneapi/mkl/dfti.hpp"