[SYCLomatic] Update the include file for oneMKL since it has renamed …

…to oneMath (#2575) Signed-off-by: Jiang, Zhiwei <[email protected]>
oneapi-src · Jan 6, 2025 · 49dd16b · 49dd16b
1 parent eb7646a
commit 49dd16b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/clang/lib/DPCT/AnalysisInfo.cpp b/clang/lib/DPCT/AnalysisInfo.cpp
@@ -984,9 +984,6 @@ void DpctFileInfo::insertHeader(HeaderType Type, unsigned Offset,
     insertHeader(HT_DPL_Execution);
     insertHeader(HT_DPL_Algorithm);
     break;
-  case HT_MKL_RNG:
-    insertHeader(HT_MKL_Mkl);
-    break;
   case HT_DPCT_CodePin_CUDA:
   case HT_DPCT_CodePin_SYCL: {
     OS << getNL();

diff --git a/clang/lib/DPCT/RulesInclude/HeaderTypes.inc b/clang/lib/DPCT/RulesInclude/HeaderTypes.inc
@@ -58,9 +58,6 @@ ONEDPL_HEADER(Async, "<oneapi/dpl/async>")
 ONEDPL_HEADER(Memory, "<oneapi/dpl/memory>")
 ONEDPL_HEADER(Random, "<oneapi/dpl/random>")
 
-MKL_HEADER(Mkl, "<oneapi/mkl.hpp>")
-MKL_HEADER(RNG, "<oneapi/mkl/rng/device.hpp>")
-
 DPCT_HEADER(Dpct,  "<dpct/dpct.hpp>")
 DPCT_HEADER(DPL_Utils, "<dpct/dpl_utils.hpp>")
 DPCT_HEADER(FFT_Utils, "<dpct/fft_utils.hpp>")

diff --git a/clang/runtime/dpct-rt/include/dpct/dnnl_utils.hpp b/clang/runtime/dpct-rt/include/dpct/dnnl_utils.hpp
@@ -14,7 +14,16 @@
 
 #include <oneapi/dnnl/dnnl.hpp>
 #include <oneapi/dnnl/dnnl_sycl.hpp>
+
+#if defined(__has_include) && __has_include(<oneapi/math/rng/device.hpp>)
+#include <oneapi/math/rng/device.hpp>
+#elif defined(__has_include) && __has_include(<oneapi/mkl/rng/device.hpp>)
 #include <oneapi/mkl/rng/device.hpp>
+#elif defined(__has_include)
+#error "SYCLomatic runtime requires oneMath/oneMKL support"
+#else
+#error "SYCLomatic runtime requires __has_include support"
+#endif
 
 #include <algorithm>
 #include <list>

diff --git a/clang/runtime/dpct-rt/include/dpct/lib_common_utils.hpp b/clang/runtime/dpct-rt/include/dpct/lib_common_utils.hpp
@@ -11,7 +11,16 @@
 
 #include "compat_service.hpp"
 
+#if defined(__has_include) && __has_include(<oneapi/math.hpp>)
+#include <oneapi/math.hpp>
+#include <oneapi/mkl/namespace_alias.hpp>
+#elif defined(__has_include) && __has_include(<oneapi/mkl.hpp>)
 #include <oneapi/mkl.hpp>
+#elif defined(__has_include)
+#error "SYCLomatic runtime requires oneMath/oneMKL support"
+#else
+#error "SYCLomatic runtime requires __has_include support"
+#endif
 
 namespace dpct {
 

diff --git a/clang/runtime/dpct-rt/include/dpct/rng_utils.hpp b/clang/runtime/dpct-rt/include/dpct/rng_utils.hpp
@@ -12,7 +12,15 @@
 #include "compat_service.hpp"
 #include "lib_common_utils.hpp"
 
+#if defined(__has_include) && __has_include(<oneapi/math/rng/device.hpp>)
+#include <oneapi/math/rng/device.hpp>
+#elif defined(__has_include) && __has_include(<oneapi/mkl/rng/device.hpp>)
 #include <oneapi/mkl/rng/device.hpp>
+#elif defined(__has_include)
+#error "SYCLomatic runtime requires oneMath/oneMKL support"
+#else
+#error "SYCLomatic runtime requires __has_include support"
+#endif
 
 namespace dpct::rng {
 enum class random_mode {