[mklcpu][mklgpu] use dynamic link for oneMKL, add MKLCPU_THREAD_OMP (#718)

Author: mkrainiuk

CMakeLists.txt

@@ -39,6 +39,7 @@ option(ENABLE_MKLCPU_BACKEND "Enable the Intel oneMKL CPU backend for supported
 option(ENABLE_MKLGPU_BACKEND "Enable the Intel oneMKL GPU backend for supported interfaces" ON)
 if(ENABLE_MKLCPU_BACKEND)
   option(ENABLE_MKLCPU_THREAD_TBB "Enable the use of Intel TBB with the oneMath CPU backend" ON)
+  option(ENABLE_MKLCPU_THREAD_OMP "Enable the use of Intel OpenMP with the oneMath CPU backend" OFF)
 endif()
 
 option(ENABLE_ARMPL_BACKEND "Enable the ArmPl backend for BLAS/LAPACK interface" OFF)
@@ -256,14 +257,12 @@ if(ENABLE_MKLGPU_BACKEND OR ENABLE_MKLCPU_BACKEND)
   set(MKL_INTERFACE ilp64)
   if(ENABLE_MKLCPU_THREAD_TBB)
     set(MKL_THREADING tbb_thread)
+  elseif(ENABLE_MKLCPU_THREAD_OMP)
+    set(MKL_THREADING intel_thread)
   else()
     set(MKL_THREADING sequential)
   endif()
-  if(BUILD_SHARED_LIBS AND NOT WIN32)
-    set(MKL_LINK dynamic)
-  else()
-    set(MKL_LINK static)
-  endif()
+  set(MKL_LINK dynamic)
   # Enable SYCL API
   set(DPCPP_COMPILER ON)
   set(SYCL_COMPILER ON)
@@ -320,6 +319,8 @@ endif()
 if(DEFINED REF_BLAS_ROOT OR DEFINED REF_LAPACK_ROOT)
     find_file(ONEMATH_REF_BLAS_LIBNAME NAMES blas.dll libblas.so HINTS ${REF_BLAS_ROOT} ${REF_LAPACK_ROOT} PATH_SUFFIXES lib lib64)
     find_file(ONEMATH_REF_CBLAS_LIBNAME NAMES cblas.dll libcblas.so HINTS ${REF_BLAS_ROOT} ${REF_LAPACK_ROOT} PATH_SUFFIXES lib lib64)
+    find_file(ONEMATH_REF_LAPACKE_LIBNAME NAMES lapacke64.dll liblapacke64.so HINTS ${REF_LAPACK_ROOT} PATH_SUFFIXES lib lib64)
+    find_file(ONEMATH_REF_LAPACK_LIBNAME NAMES lapack64.dll liblapack64.so HINTS ${REF_LAPACK_ROOT} PATH_SUFFIXES lib lib64)
 endif()
 
 # Add source directory and output to bin/

docs/building_the_project_with_adaptivecpp.rst

@@ -104,7 +104,10 @@ The most important supported build options are:
      - False     
    * - ENABLE_MKLCPU_THREAD_TBB
      - True, False
-     - True      
+     - True
+   * - ENABLE_MKLCPU_THREAD_OMP
+     - True, False
+     - False
    * - BUILD_FUNCTIONAL_TESTS
      - True, False
      - True      

docs/building_the_project_with_dpcpp.rst

@@ -135,7 +135,10 @@ The most important supported build options are:
      - False     
    * - ENABLE_MKLCPU_THREAD_TBB
      - True, False
-     - True      
+     - True
+   * - ENABLE_MKLCPU_THREAD_OMP
+     - True, False
+     - False
    * - ENABLE_GENERIC_BLAS_BACKEND
      - True, False
      - False      

src/lapack/backends/mklcpu/CMakeLists.txt

@@ -39,7 +39,7 @@ target_include_directories(${LIB_OBJ}
 target_compile_options(${LIB_OBJ} PRIVATE ${ONEMATH_BUILD_COPT})
 
 if(TARGET MKL::MKL_SYCL::LAPACK)
-  target_link_libraries(${LIB_OBJ} PUBLIC ONEMATH::SYCL::SYCL MKL::MKL_SYCL::LAPACK)
+  target_link_libraries(${LIB_OBJ} PUBLIC ONEMATH::SYCL::SYCL MKL::MKL_SYCL::LAPACK MKL::MKL_SYCL::BLAS)
 else()
   target_link_libraries(${LIB_OBJ} PUBLIC ONEMATH::SYCL::SYCL MKL::MKL_DPCPP)
 endif()

src/lapack/backends/mklgpu/CMakeLists.txt

@@ -39,7 +39,7 @@ target_include_directories(${LIB_OBJ}
 target_compile_options(${LIB_OBJ} PRIVATE ${ONEMATH_BUILD_COPT})
 
 if(TARGET MKL::MKL_SYCL::LAPACK)
-  target_link_libraries(${LIB_OBJ} PUBLIC ONEMATH::SYCL::SYCL MKL::MKL_SYCL::LAPACK)
+  target_link_libraries(${LIB_OBJ} PUBLIC ONEMATH::SYCL::SYCL MKL::MKL_SYCL::LAPACK MKL::MKL_SYCL::BLAS)
 else()
   target_link_libraries(${LIB_OBJ} PUBLIC ONEMATH::SYCL::SYCL MKL::MKL_DPCPP)
 endif()

tests/unit_tests/lapack/CMakeLists.txt

@@ -17,8 +17,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #===============================================================================
 add_compile_definitions(
-	ONEMATH_REF_LAPACK_LIBNAME="${LAPACK64_file}"
-	ONEMATH_REF_LAPACKE_LIBNAME="${LAPACKE64_file}"
+	ONEMATH_REF_LAPACK_LIBNAME="${ONEMATH_REF_LAPACK_LIBNAME}"
+	ONEMATH_REF_LAPACKE_LIBNAME="${ONEMATH_REF_LAPACKE_LIBNAME}"
 	ONEMATH_REF_CBLAS_LIBNAME="${ONEMATH_REF_CBLAS_LIBNAME}")
 add_subdirectory(source)
 add_subdirectory(common)