feature: enabling oneMKL instead of FPKs

WORKSPACE

@@ -22,21 +22,6 @@ opencl_repo(
     name = "opencl",
 )
 
-load("@onedal//dev/bazel/deps:micromkl.bzl", "micromkl_repo", "micromkl_dpc_repo")
-micromkl_repo(
-    name = "micromkl",
-    root_env_var = "MKLFPKROOT",
-    url = "https://github.com/oneapi-src/oneDAL/releases/download/Dependencies/mklfpk_lnx_20230413.tgz",
-    sha256 = "e99dd6fb18f1fda382c53373262d1bb44c1b58aa6edff94cfb0e9d8dcd3395ed",
-)
-
-micromkl_dpc_repo(
-    name = "micromkl_dpc",
-    root_env_var = "MKLGPUFPKROOT",
-    url = "https://github.com/oneapi-src/oneDAL/releases/download/Dependencies/mklgpufpk_lnx_20240605.tgz",
-    sha256 = "0787a92e9580ed6b9fb97d054a0ed77994dbc18b4b3fb099451cb1e6ebdf4f16",
-)
-
 load("@onedal//dev/bazel/deps:openblas.bzl", "openblas_repo")
 openblas_repo(
     name = "openblas",

cpp/daal/BUILD

@@ -18,10 +18,7 @@ daal_module(
     deps = select({
         "@config//:backend_ref": [ ],
         "//conditions:default": [
-                                    "@micromkl//:vml_ipp",
-                                    # TODO: Currently vml_ipp lib depends on TBB, but it shouldn't
-                                    #       Remove TBB from deps once problem with vml_ipp is resolved
-                                    "@tbb//:tbb_binary",
+                                    "@mkl//:mkl_thr",
                                 ],
         }),
 )
@@ -32,7 +29,7 @@ daal_module(
     deps = select({
         "@config//:backend_ref": [ "@openblas//:openblas",
                                  ],
-        "//conditions:default": [ "@micromkl//:mkl_thr",
+        "//conditions:default": [ "@mkl//:mkl_thr",
                                 ],
         }),
 )
@@ -64,8 +61,7 @@ daal_module(
                                  ],
         "//conditions:default": [
                                   ":public_includes",
-                                  "@micromkl//:headers",
-                                  "@micromkl_dpc//:headers",
+                                  "@mkl//:headers",
                                 ],
         }),
 )
@@ -134,7 +130,7 @@ daal_module(
             "//conditions:default": [
                                     ":services",
                                     "@onedal//cpp/daal/src/algorithms/engines:kernel",
-                                    "@micromkl_dpc//:headers",
+                                    "@mkl//:headers",
                                     ],
         }),
 )

cpp/daal/include/services/internal/sycl/math/mkl_blas.h

@@ -40,6 +40,9 @@ namespace math
 {
 namespace interface1
 {
+
+namespace mkl = ::oneapi::mkl;
+
 /** @ingroup oneapi_internal
  * @{
  */
@@ -76,7 +79,7 @@ struct MKLGemm
         auto c_ptr = c_usm.get() + offsetC;
 
         status |= catchSyclExceptions([&]() mutable {
-            ::oneapi::fpk::blas::gemm(_queue, transamkl, transbmkl, m, n, k, alpha, a_ptr, lda, b_ptr, ldb, beta, c_ptr, ldc);
+            mkl::blas::gemm(_queue, transamkl, transbmkl, m, n, k, alpha, a_ptr, lda, b_ptr, ldb, beta, c_ptr, ldc);
             _queue.wait_and_throw();
         });
 #else
@@ -87,26 +90,25 @@ struct MKLGemm
 
 private:
     template <typename T>
-    void innerGemm(MKL_TRANSPOSE transa, MKL_TRANSPOSE transb, int64_t m, int64_t n, int64_t k, T alpha, ::sycl::buffer<T, 1> a, int64_t lda,
-                   ::sycl::buffer<T, 1> b, int64_t ldb, T beta, ::sycl::buffer<T, 1> c, int64_t ldc, int64_t offset_a, int64_t offset_b,
-                   int64_t offset_c);
+    DAAL_DEPRECATED void innerGemm(MKL_TRANSPOSE transa, MKL_TRANSPOSE transb, int64_t m, int64_t n, int64_t k, T alpha, ::sycl::buffer<T, 1> a,
+                                   int64_t lda, ::sycl::buffer<T, 1> b, int64_t ldb, T beta, ::sycl::buffer<T, 1> c, int64_t ldc, int64_t offset_a,
+                                   int64_t offset_b, int64_t offset_c);
 
     template <>
-    void innerGemm<double>(MKL_TRANSPOSE transa, MKL_TRANSPOSE transb, int64_t m, int64_t n, int64_t k, double alpha, ::sycl::buffer<double, 1> a,
-                           int64_t lda, ::sycl::buffer<double, 1> b, int64_t ldb, double beta, ::sycl::buffer<double, 1> c, int64_t ldc,
-                           int64_t offset_a, int64_t offset_b, int64_t offset_c)
+    DAAL_DEPRECATED void innerGemm<double>(MKL_TRANSPOSE transa, MKL_TRANSPOSE transb, int64_t m, int64_t n, int64_t k, double alpha,
+                                           ::sycl::buffer<double, 1> a, int64_t lda, ::sycl::buffer<double, 1> b, int64_t ldb, double beta,
+                                           ::sycl::buffer<double, 1> c, int64_t ldc, int64_t offset_a, int64_t offset_b, int64_t offset_c)
     {
-        ::oneapi::fpk::gpu::dgemm_sycl(&_queue, transa, transb, m, n, k, alpha, &a, lda, &b, ldb, beta, &c, ldc, offset_a, offset_b, offset_c);
+        //mkl::blas::gpu::dgemm_sycl(&_queue, transa, transb, m, n, k, alpha, &a, lda, &b, ldb, beta, &c, ldc, offset_a, offset_b, offset_c);
     }
 
     template <>
-    void innerGemm<float>(MKL_TRANSPOSE transa, MKL_TRANSPOSE transb, int64_t m, int64_t n, int64_t k, float alpha, ::sycl::buffer<float, 1> a,
-                          int64_t lda, ::sycl::buffer<float, 1> b, int64_t ldb, float beta, ::sycl::buffer<float, 1> c, int64_t ldc, int64_t offset_a,
-                          int64_t offset_b, int64_t offset_c)
+    DAAL_DEPRECATED void innerGemm<float>(MKL_TRANSPOSE transa, MKL_TRANSPOSE transb, int64_t m, int64_t n, int64_t k, float alpha,
+                                          ::sycl::buffer<float, 1> a, int64_t lda, ::sycl::buffer<float, 1> b, int64_t ldb, float beta,
+                                          ::sycl::buffer<float, 1> c, int64_t ldc, int64_t offset_a, int64_t offset_b, int64_t offset_c)
     {
-        ::oneapi::fpk::gpu::sgemm_sycl(&_queue, transa, transb, m, n, k, alpha, &a, lda, &b, ldb, beta, &c, ldc, offset_a, offset_b, offset_c);
+        //mkl::blas::gpu::sgemm_sycl(&_queue, transa, transb, m, n, k, alpha, &a, lda, &b, ldb, beta, &c, ldc, offset_a, offset_b, offset_c);
     }
-
     ::sycl::queue & _queue;
 };
 
@@ -138,7 +140,7 @@ struct MKLSyrk
         auto c_ptr = c_usm.get() + offsetC;
 
         status |= catchSyclExceptions([&]() mutable {
-            ::oneapi::fpk::blas::syrk(_queue, uplomkl, transmkl, n, k, alpha, a_ptr, lda, beta, c_ptr, ldc);
+            mkl::blas::syrk(_queue, uplomkl, transmkl, n, k, alpha, a_ptr, lda, beta, c_ptr, ldc);
             _queue.wait_and_throw();
         });
 #else
@@ -156,16 +158,15 @@ struct MKLSyrk
     void innerSyrk(MKL_UPLO uplo, MKL_TRANSPOSE trans, int64_t n, int64_t k, double alpha, ::sycl::buffer<double, 1> a, int64_t lda, double beta,
                    ::sycl::buffer<double, 1> c, int64_t ldc, int64_t offset_a, int64_t offset_c)
     {
-        ::oneapi::fpk::gpu::dsyrk_sycl(&_queue, uplo, trans, n, k, alpha, &a, lda, beta, &c, ldc, offset_a, offset_c);
+        //mkl::gpu::dsyrk_sycl(&_queue, uplo, trans, n, k, alpha, &a, lda, beta, &c, ldc, offset_a, offset_c);
     }
 
     template <>
     void innerSyrk(MKL_UPLO uplo, MKL_TRANSPOSE trans, int64_t n, int64_t k, float alpha, ::sycl::buffer<float, 1> a, int64_t lda, float beta,
                    ::sycl::buffer<float, 1> c, int64_t ldc, int64_t offset_a, int64_t offset_c)
     {
-        ::oneapi::fpk::gpu::ssyrk_sycl(&_queue, uplo, trans, n, k, alpha, &a, lda, beta, &c, ldc, offset_a, offset_c);
+        //mkl::gpu::ssyrk_sycl(&_queue, uplo, trans, n, k, alpha, &a, lda, beta, &c, ldc, offset_a, offset_c);
     }
-
     ::sycl::queue & _queue;
 };
 
@@ -191,7 +192,7 @@ struct MKLAxpy
         DAAL_CHECK_STATUS_VAR(status);
 
         status |= catchSyclExceptions([&]() mutable {
-            ::oneapi::fpk::blas::axpy(_queue, n, a, x_usm.get(), incx, y_usm.get(), incy);
+            mkl::blas::axpy(_queue, n, a, x_usm.get(), incx, y_usm.get(), incy);
             _queue.wait_and_throw();
         });
 #else

cpp/daal/include/services/internal/sycl/math/mkl_dal.h

@@ -27,7 +27,7 @@
 #endif
 
 DISABLE_MKL_DAL_SYCL_WARNINGS_BEGIN()
-#include "mkl_dal_sycl.hpp"
+#include <oneapi/mkl.hpp>
 DISABLE_MKL_DAL_SYCL_WARNINGS_END()
 
 #undef DISABLE_MKL_DAL_SYCL_WARNINGS_BEGIN

cpp/daal/include/services/internal/sycl/math/mkl_dal_utils.h

@@ -39,15 +39,16 @@ namespace math
 {
 namespace interface1
 {
-inline ::oneapi::fpk::transpose to_fpk_transpose(const math::Transpose & trans)
+namespace mkl = ::oneapi::mkl;
+inline mkl::transpose to_fpk_transpose(const math::Transpose & trans)
 {
-    using fpk_transpose = ::oneapi::fpk::transpose;
+    using fpk_transpose = mkl::transpose;
     return trans == math::Transpose::Trans ? fpk_transpose::trans : fpk_transpose::nontrans;
 }
 
-inline ::oneapi::fpk::uplo to_fpk_uplo(const math::UpLo & uplo)
+inline mkl::uplo to_fpk_uplo(const math::UpLo & uplo)
 {
-    using fpk_uplo = ::oneapi::fpk::uplo;
+    using fpk_uplo = mkl::uplo;
     return uplo == math::UpLo::Upper ? fpk_uplo::upper : fpk_uplo::lower;
 }
 

cpp/daal/include/services/internal/sycl/math/mkl_lapack.h

@@ -39,6 +39,7 @@ namespace math
 {
 namespace interface1
 {
+namespace mkl = ::oneapi::mkl;
 /** @ingroup oneapi_internal
  * @{
  */
@@ -55,7 +56,7 @@ struct MKLPotrf
     Status operator()(const math::UpLo uplo, const size_t n, Buffer<algorithmFPType> & a, const size_t lda)
     {
         const auto uplomkl                       = to_fpk_uplo(uplo);
-        const std::int64_t minimalScratchpadSize = ::oneapi::fpk::lapack::potrf_scratchpad_size<algorithmFPType>(_queue, uplomkl, n, lda);
+        const std::int64_t minimalScratchpadSize = mkl::lapack::potrf_scratchpad_size<algorithmFPType>(_queue, uplomkl, n, lda);
         return this->operator()(uplo, n, a, lda, minimalScratchpadSize);
     }
 
@@ -79,7 +80,7 @@ struct MKLPotrf
         }
 
         status |= catchSyclExceptions([&]() mutable {
-            ::oneapi::fpk::lapack::potrf(_queue, uplomkl, n, a_usm.get(), lda, scratchpad, scratchpadSize);
+            mkl::lapack::potrf(_queue, uplomkl, n, a_usm.get(), lda, scratchpad, scratchpadSize);
             _queue.wait_and_throw();
         });
 
@@ -109,7 +110,7 @@ struct MKLPotrs
                       Buffer<algorithmFPType> & b, const size_t ldb)
     {
         const auto uplomkl                       = to_fpk_uplo(uplo);
-        const std::int64_t minimalScratchpadSize = ::oneapi::fpk::lapack::potrs_scratchpad_size<algorithmFPType>(_queue, uplomkl, n, ny, lda, ldb);
+        const std::int64_t minimalScratchpadSize = mkl::lapack::potrs_scratchpad_size<algorithmFPType>(_queue, uplomkl, n, ny, lda, ldb);
         return this->operator()(uplo, n, ny, a, lda, b, ldb, minimalScratchpadSize);
     }
 
@@ -137,7 +138,7 @@ struct MKLPotrs
         }
 
         status |= catchSyclExceptions([&]() mutable {
-            ::oneapi::fpk::lapack::potrs(_queue, uplomkl, n, ny, a_usm.get(), lda, b_usm.get(), ldb, scratchpad, scratchpadSize);
+            mkl::lapack::potrs(_queue, uplomkl, n, ny, a_usm.get(), lda, b_usm.get(), ldb, scratchpad, scratchpadSize);
             _queue.wait_and_throw();
         });
 

cpp/daal/src/externals/config_mkl.h

@@ -27,6 +27,7 @@
 #include "services/daal_defines.h"
 #include "services/env_detect.h"
 
+#include "src/externals/service_thread_declar_mkl.h"
 #include "src/externals/service_blas_mkl.h"
 #include "src/externals/service_lapack_mkl.h"
 #include "src/externals/service_math_mkl.h"