build: override cmake default DPC++ compile/link lines for Windows

Use DPC++ compiler for both build and link steps
Remove tool-chain, define required compilers for Windows in CMakeLists.txt

Author: mkrainiuk

CMakeLists.txt

@@ -36,10 +36,30 @@ else()
     message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 endif()
 
+# Define required compilers for Windows before project
+if(WIN32)
+  set(CMAKE_CXX_COMPILER "clang-cl")
+  set(CMAKE_C_COMPILER "clang-cl")
+endif()
+
 project(oneMKL VERSION 0.1.0 LANGUAGES CXX)
 
 option(BUILD_SHARED_LIBS "Build dynamic libraries" ON)
 
+# Override default CXX compile/link lines for Windows after project
+if(WIN32)
+  set(CMAKE_CXX_STANDARD 14)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function -w")
+  foreach (flag_var
+           CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+           CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+    string(REPLACE "/MD" "" ${flag_var} "${${flag_var}}")
+  endforeach()
+  set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> -fsycl /nologo <DEFINES> <INCLUDES> /EHsc <FLAGS> /Fo<OBJECT> -c <SOURCE>")
+  set(CMAKE_CXX_CREATE_STATIC_LIBRARY "lib /nologo <OBJECTS> /out:<TARGET>")
+  set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> -fsycl /nologo <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+endif()
+
 ## Backends
 option(ENABLE_MKLCPU_BACKEND "" ON)
 option(ENABLE_MKLGPU_BACKEND "" ON)
@@ -90,23 +110,6 @@ option(BUILD_FUNCTIONAL_TESTS "" ON)
 ## Documentation
 option(BUILD_DOC "" OFF)
 
-# Set compilation flags
-if(UNIX)
-  set(CMAKE_CXX_STANDARD 11)
-else()
-  set(CMAKE_CXX_STANDARD 14)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")
-  foreach (flag_var
-           CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-           CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-  string(REGEX REPLACE "/M[TD]+[d]*" "" ${flag_var} "${${flag_var}}")
-  endforeach()
-endif()
-
-set(CMAKE_CXX_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
 # Set output directories for the project
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -118,8 +121,12 @@ add_subdirectory(cmake)
 # Include general cmake config files
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
-# Find necessary packages
-find_package(Compiler REQUIRED)
+# Add DPC++ options for Linux
+if(WIN32)
+  add_library(ONEMKL::SYCL::SYCL INTERFACE IMPORTED)
+else()
+  find_package(Compiler REQUIRED)
+endif()
 
 # Add source directory and output to bin/
 add_subdirectory(src bin)

README.md

@@ -501,7 +501,7 @@ cmake --install . --prefix <path_to_install_dir>
 ```bash
 # Inside <path to onemkl>
 md build && cd build
-cmake .. -G Ninja  -DCMAKE_TOOLCHAIN_FILE="..\cmake\toolchain\intel_clang-cl-toolchain.cmake"  
+cmake .. -G Ninja
                   [-DMKL_ROOT=<mkl_install_prefix>] \                   # required only if environment variable MKLROOT is not set
                   [-DREF_BLAS_ROOT=<reference_blas_install_prefix>]     # required only for testing
 

cmake/FindMKL.cmake

@@ -42,6 +42,7 @@ if (ENABLE_MKLCPU_BACKEND OR ENABLE_MKLGPU_BACKEND)
   list(APPEND MKL_LIBRARIES ${MKL_C})
 endif()
 
+include(FindPackageHandleStandardArgs)
 foreach(lib ${MKL_LIBRARIES})
   find_library(${lib}_file NAMES ${lib}
           HINTS $ENV{MKLROOT} ${MKL_ROOT}
@@ -55,7 +56,7 @@ find_path(MKL_INCLUDE mkl.h
           HINTS $ENV{MKLROOT} ${MKL_ROOT}
           PATH_SUFFIXES include)
 
-if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+if(${CMAKE_SIZEOF_VOID_P} EQUAL 8 OR ENABLE_MKLGPU_BACKEND)
   set(MKL_COPT "-DMKL_ILP64")
 else()
   set(MKL_COPT "")
@@ -65,30 +66,29 @@ if(UNIX)
   list(APPEND MKL_LINK_PREFIX "-Wl,-rpath,${MKL_LIB_DIR}")
   list(APPEND MKL_LINK_PREFIX "-L${MKL_LIB_DIR}")
   set(LIB_PREFIX "-l")
-  set(OPENCL_LIBNAME "OpenCL")
+  set(LIB_SUFFIX "")
+  set(OPENCL_LIBNAME "-lOpenCL")
 else()
-  list(APPEND MKL_LINK_PREFIX "-LIBPATH:\"${MKL_LIB_DIR}\"")
-  set(LIB_PREFIX "")
+  set(LIB_PREFIX "${MKL_LIB_DIR}/")
+  set(LIB_SUFFIX ".lib")
   set(OPENCL_LIBNAME "OpenCL.lib")
 endif()
 
 if (ENABLE_MKLCPU_BACKEND OR ENABLE_MKLGPU_BACKEND)
   set(MKL_LINK_C ${MKL_LINK_PREFIX})
   foreach(lib ${MKL_C})
-    list(APPEND MKL_LINK_C ${LIB_PREFIX}${lib})
+    list(APPEND MKL_LINK_C ${LIB_PREFIX}${lib}${LIB_SUFFIX})
   endforeach()
   if(ENABLE_MKLCPU_THREAD_TBB)
     list(APPEND MKL_LINK_C ${TBB_LINK})
   endif()
   if(ENABLE_MKLGPU_BACKEND)
-    set(MKL_LINK_SYCL ${MKL_LINK_PREFIX} ${LIB_PREFIX}${MKL_SYCL} ${MKL_LINK_C} ${LIB_PREFIX}${OPENCL_LIBNAME} )
+    set(MKL_LINK_SYCL ${MKL_LINK_PREFIX} ${LIB_PREFIX}${MKL_SYCL}${LIB_SUFFIX} ${MKL_LINK_C} ${OPENCL_LIBNAME} )
   endif()
 endif()
 
-#Workaround for soname problem
-include(FindPackageHandleStandardArgs)
 if (ENABLE_MKLCPU_BACKEND)
   find_package_handle_standard_args(MKL REQUIRED_VARS MKL_INCLUDE MKL_COPT MKL_LINK_C)
 else(ENABLE_MKLGPU_BACKEND)
   find_package_handle_standard_args(MKL REQUIRED_VARS MKL_INCLUDE MKL_COPT MKL_LINK_SYCL)
-endif()
+endif()

cmake/FindNETLIB.cmake

@@ -19,6 +19,7 @@
 
 include_guard()
 
+include(FindPackageHandleStandardArgs)
 find_library(NETLIB_CBLAS_LIBRARY NAMES cblas.dll.lib cblas.lib cblas HINTS ${REF_BLAS_ROOT} PATH_SUFFIXES lib lib64)
 find_package_handle_standard_args(NETLIB REQUIRED_VARS NETLIB_CBLAS_LIBRARY)
 find_library(NETLIB_BLAS_LIBRARY NAMES blas.dll.lib blas.lib blas HINTS ${REF_BLAS_ROOT} PATH_SUFFIXES lib lib64)
@@ -33,8 +34,6 @@ endif()
 list(APPEND NETLIB_LINK ${NETLIB_CBLAS_LIBRARY})
 list(APPEND NETLIB_LINK ${NETLIB_BLAS_LIBRARY})
 
-
-include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(NETLIB REQUIRED_VARS NETLIB_INCLUDE NETLIB_LINK)
 
 add_library(ONEMKL::NETLIB::NETLIB UNKNOWN IMPORTED)

cmake/FindTBB.cmake

@@ -46,7 +46,7 @@ find_library(TBB_LIBRARIES NAMES tbb
 if(UNIX)
   set(TBB_LINK "-Wl,-rpath,${TBB_LIB_DIR} -L${TBB_LIB_DIR} -ltbb")
 else()
-  set(TBB_LINK "-LIBPATH:\"${TBB_LIB_DIR}\" tbb.lib")
+  set(TBB_LINK ${TBB_LIBRARIES})
 endif()
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(TBB REQUIRED_VARS TBB_LIBRARIES TBB_LINK)

cmake/toolchain/intel_clang-cl-toolchain.cmake

@@ -71,7 +71,7 @@ macro(config_compiler_and_linker)
     set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J -Zi")
     set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32")
     set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN")
-    set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")
+    set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1 -DGTEST_HAS_SEH=0")
     set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0")
     set(cxx_no_rtti_flags "-GR-")
     # Suppress "unreachable code" warning