minor fixes for comments

oneapi-src · Sep 23, 2024 · 56fc2d7 · 56fc2d7
1 parent 54564cf
commit 56fc2d7
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 61 deletions.
diff --git a/cpp/daal/src/algorithms/naivebayes/naivebayes_predict_kernel.h b/cpp/daal/src/algorithms/naivebayes/naivebayes_predict_kernel.h
@@ -21,8 +21,8 @@
 //--
 */
 
-#ifndef _NAIVEBAYES_ASSIGN_KERNEL_H
-#define _NAIVEBAYES_ASSIGN_KERNEL_H
+#ifndef __NAIVEBAYES_PREDICT_KERNEL_H__
+#define __NAIVEBAYES_PREDICT_KERNEL_H__
 
 #include "algorithms/naive_bayes/multinomial_naive_bayes_model.h"
 #include "algorithms/naive_bayes/multinomial_naive_bayes_predict_types.h"

diff --git a/cpp/daal/src/algorithms/qr/qr_dense_default_kernel.h b/cpp/daal/src/algorithms/qr/qr_dense_default_kernel.h
@@ -21,8 +21,8 @@
 //--
 */
 
-#ifndef __QR_KERNEL_H__
-#define __QR_KERNEL_H__
+#ifndef __QR_DENSE_DEFAULT_KERNEL_H__
+#define __QR_DENSE_DEFAULT_KERNEL_H__
 
 #include "algorithms/qr/qr_batch.h"
 #include "src/algorithms/kernel.h"

diff --git a/cpp/daal/src/algorithms/svd/svd_dense_default_kernel.h b/cpp/daal/src/algorithms/svd/svd_dense_default_kernel.h
@@ -21,8 +21,8 @@
 //--
 */
 
-#ifndef __SVD_KERNEL_H__
-#define __SVD_KERNEL_H__
+#ifndef __SVD_DENSE_DEFAULT_KERNEL_H__
+#define __SVD_DENSE_DEFAULT_KERNEL_H__
 
 #include "algorithms/svd/svd_batch.h"
 #include "src/algorithms/kernel.h"

diff --git a/cpp/daal/src/externals/service_blas_mkl.h b/cpp/daal/src/externals/service_blas_mkl.h
@@ -27,16 +27,6 @@
 #include "services/daal_defines.h"
 #include <mkl.h>
 
-#if !defined(__DAAL_CONCAT4)
-    #define __DAAL_CONCAT4(a, b, c, d)  __DAAL_CONCAT41(a, b, c, d)
-    #define __DAAL_CONCAT41(a, b, c, d) a##b##c##d
-#endif
-
-#if !defined(__DAAL_CONCAT5)
-    #define __DAAL_CONCAT5(a, b, c, d, e)  __DAAL_CONCAT51(a, b, c, d, e)
-    #define __DAAL_CONCAT51(a, b, c, d, e) a##b##c##d##e
-#endif
-
 #define __DAAL_MKLFN_CALL_BLAS(f_name, f_args) f_name f_args;
 
 #define __DAAL_MKLFN_CALL_RETURN_BLAS(f_name, f_args, res) res = f_name f_args;

diff --git a/cpp/daal/src/externals/service_lapack_mkl.h b/cpp/daal/src/externals/service_lapack_mkl.h
@@ -27,16 +27,6 @@
 #include "services/daal_defines.h"
 #include <mkl.h>
 
-#if !defined(__DAAL_CONCAT4)
-    #define __DAAL_CONCAT4(a, b, c, d)  __DAAL_CONCAT41(a, b, c, d)
-    #define __DAAL_CONCAT41(a, b, c, d) a##b##c##d
-#endif
-
-#if !defined(__DAAL_CONCAT5)
-    #define __DAAL_CONCAT5(a, b, c, d, e)  __DAAL_CONCAT51(a, b, c, d, e)
-    #define __DAAL_CONCAT51(a, b, c, d, e) a##b##c##d##e
-#endif
-
 #define __DAAL_MKLFN_CALL_LAPACK(f_name, f_args) f_name f_args;
 
 #define __DAAL_MKLFN_CALL_RETURN_LAPACK(f_name, f_args) return f_name f_args;

diff --git a/cpp/daal/src/externals/service_spblas_mkl.h b/cpp/daal/src/externals/service_spblas_mkl.h
@@ -27,16 +27,6 @@
 #include "services/daal_defines.h"
 #include <mkl.h>
 
-#if !defined(__DAAL_CONCAT4)
-    #define __DAAL_CONCAT4(a, b, c, d)  __DAAL_CONCAT41(a, b, c, d)
-    #define __DAAL_CONCAT41(a, b, c, d) a##b##c##d
-#endif
-
-#if !defined(__DAAL_CONCAT5)
-    #define __DAAL_CONCAT5(a, b, c, d, e)  __DAAL_CONCAT51(a, b, c, d, e)
-    #define __DAAL_CONCAT51(a, b, c, d, e) a##b##c##d##e
-#endif
-
 namespace daal
 {
 namespace internal

diff --git a/cpp/oneapi/dal/test/engine/mkl/BUILD b/cpp/oneapi/dal/test/engine/mkl/BUILD
@@ -13,7 +13,7 @@ dal_test_module(
     extra_deps = [{
         "@config//:backend_ref": [ "@openblas//:openblas",
                                     ],
-        "//conditions:default": [ "@mkl//:mkl_seq", 
+        "//conditions:default": [ "@mkl//:mkl_thr", 
                                 ],
         }],
 )
diff --git a/dev/bazel/deps/mkl.bzl b/dev/bazel/deps/mkl.bzl
@@ -23,7 +23,6 @@ mkl_repo = repos.prebuilt_libs_repo_rule(
     libs = [
         "lib/libmkl_core.a",
         "lib/libmkl_intel_ilp64.a",
-        "lib/libmkl_sequential.a",
         "lib/libmkl_tbb_thread.a",
         "lib/libmkl_sycl.a",
     ],

diff --git a/dev/bazel/deps/mkl.tpl.BUILD b/dev/bazel/deps/mkl.tpl.BUILD
@@ -19,6 +19,7 @@ cc_library(
     srcs = [
         "lib/libmkl_core.a",
         "lib/libmkl_intel_ilp64.a",
+        "lib/libmkl_tbb_thread.a",
     ],
     linkopts = [
         "-lpthread",
@@ -28,21 +29,8 @@ cc_library(
     ]
 )
 
-cc_library(
-    name = "libmkl_sequential",
-    srcs = [
-        "lib/libmkl_sequential.a",
-    ],
-    deps = [
-        ":mkl_core",
-    ]
-)
-
 cc_library(
     name = "mkl_thr",
-    srcs = [
-        "lib/libmkl_tbb_thread.a",
-    ],
     linkopts = [
         "-lpthread",
     ],
@@ -52,15 +40,6 @@ cc_library(
     ]
 )
 
-cc_library(
-    name = "mkl_seq",
-    deps = [
-        ":headers",
-        ":mkl_core",
-        ":libmkl_sequential",
-    ],
-)
-
 cc_library(
     name = "mkl_dpc",
     srcs = [

diff --git a/dev/make/compiler_definitions/dpcpp.mk b/dev/make/compiler_definitions/dpcpp.mk
@@ -32,7 +32,7 @@ COMPILER.lnx.dpcpp = icpx -fsycl -m64 -stdlib=libstdc++ -fgnu-runtime -fwrapv \
                      -Werror -Wreturn-type -fsycl-device-code-split=per_kernel
 COMPILER.win.dpcpp = icx -fsycl $(if $(MSVC_RT_is_release),-MD, -MDd /debug:none) -nologo -WX \
                      -Wno-deprecated-declarations -fsycl-device-code-split=per_kernel
-#-fsycl-max-parallel-link-jobs=2
+
 link.dynamic.lnx.dpcpp = icpx -fsycl -m64 -fsycl-device-code-split=per_kernel
 link.dynamic.win.dpcpp = icx -fsycl -m64 -fsycl-device-code-split=per_kernel