[LAPACK] Dynamically load reference lapack library for tests. (#701)

Author: adegomme

CMakeLists.txt

@@ -316,9 +316,9 @@ else()
   endif()
 endif()
 
-if(DEFINED REF_BLAS_ROOT)
-  find_file(ONEMATH_REF_BLAS_LIBNAME NAMES blas.dll libblas.so HINTS ${REF_BLAS_ROOT} PATH_SUFFIXES lib lib64)
-  find_file(ONEMATH_REF_CBLAS_LIBNAME NAMES cblas.dll libcblas.so HINTS ${REF_BLAS_ROOT} PATH_SUFFIXES lib lib64)
+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)
 endif()
 
 # Add source directory and output to bin/

cmake/FindCBLAS.cmake

@@ -19,13 +19,13 @@
 
 include_guard()
 
-find_library(CBLAS_file NAMES cblas.dll.lib cblas.lib cblas HINTS ${REF_BLAS_ROOT} PATH_SUFFIXES lib lib64)
+find_library(CBLAS_file NAMES cblas.dll.lib cblas.lib cblas HINTS ${REF_BLAS_ROOT} ${REF_LAPACK_ROOT} PATH_SUFFIXES lib lib64)
 find_package_handle_standard_args(CBLAS REQUIRED_VARS CBLAS_file)
-find_library(BLAS_file NAMES blas.dll.lib blas.lib blas HINTS ${REF_BLAS_ROOT} PATH_SUFFIXES lib lib64)
+find_library(BLAS_file NAMES blas.dll.lib blas.lib blas HINTS ${REF_BLAS_ROOT} ${REF_LAPACK_ROOT} PATH_SUFFIXES lib lib64)
 find_package_handle_standard_args(CBLAS REQUIRED_VARS BLAS_file)
 
 get_filename_component(CBLAS_LIB_DIR ${CBLAS_file} DIRECTORY)
-find_path(CBLAS_INCLUDE cblas.h HINTS ${REF_BLAS_ROOT} PATH_SUFFIXES include)
+find_path(CBLAS_INCLUDE cblas.h HINTS ${REF_BLAS_ROOT} ${REF_LAPACK_ROOT} PATH_SUFFIXES include)
 
 if(UNIX)
   list(APPEND CBLAS_LINK "-Wl,-rpath,${CBLAS_LIB_DIR}")

examples/lapack/compile_time_dispatching/CMakeLists.txt

@@ -30,6 +30,11 @@ set(EXAMPLE_TARGET example_lapack_getrs_usm_mklcpu_cusolver)
 # Create a CMake target with one source file
 add_executable(${EXAMPLE_TARGET} getrs_usm_mklcpu_cusolver.cpp)
 
+# May be needed to compile source files with SYCL kernels
+if(USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+  add_sycl_to_target(TARGET ${EXAMPLE_TARGET} SOURCES getrs_usm_mklcpu_cusolver.cpp)
+endif()
+
 # Linking against onemath_lapack_mklcpu and onemath_lapack_cusolver in CMake will add the required include directories and dependencies.
 # One can also link against `onemath_lapack` to link against all the lapack backends built.
 # These targets should only be used for compile-time dispatching.
@@ -44,4 +49,4 @@ target_include_directories(${EXAMPLE_TARGET} PUBLIC
 )
 
 # Register example as ctest
-add_test(NAME lapack/EXAMPLE/CT/getrs_usm_mklcpu_cusolver COMMAND ${EXAMPLE_TARGET})
+add_test(NAME lapack/EXAMPLE/CT/getrs_usm_mklcpu_cusolver COMMAND ${EXAMPLE_TARGET})

examples/lapack/run_time_dispatching/CMakeLists.txt

@@ -39,13 +39,17 @@ endif()
 message(STATUS "ONEAPI_DEVICE_SELECTOR will be set to the following value(s): [${DEVICE_FILTERS}] for run-time dispatching examples")
 
 set(EXAMPLE_TARGET example_lapack_getrs_usm)
-
 # External applications should use find_package or FetchContent to include oneMath first.
 # See https://github.com/uxlfoundation/oneMath/blob/develop/docs/using_onemath_with_cmake.rst
 
 # Create a CMake target with one source file
 add_executable(${EXAMPLE_TARGET} getrs_usm.cpp)
 
+# May be needed to compile source files with SYCL kernels
+if(USE_ADD_SYCL_TO_TARGET_INTEGRATION)
+  add_sycl_to_target(TARGET ${EXAMPLE_TARGET} SOURCES getrs_usm.cpp)
+endif()
+
 # Linking against onemath in CMake will add the required include directories and dependencies.
 # This target should only be used for runtime dispatching.
 target_link_libraries(${EXAMPLE_TARGET} PUBLIC onemath)

include/oneapi/math/lapack/detail/armpl/onemath_lapack_armpl.hpp

@@ -23,7 +23,8 @@
 
 #include <complex>
 #include <cstdint>
-
+//this may have been defined in complex.h and conflicts with enums in types.hpp
+#undef I
 #include "oneapi/math/types.hpp"
 namespace oneapi {
 namespace math {

tests/unit_tests/CMakeLists.txt

@@ -19,12 +19,12 @@
 
 set(TEST_TARGET_DOMAINS ${TARGET_DOMAINS})
 
-if("blas" IN_LIST TEST_TARGET_DOMAINS)
+if(("blas" IN_LIST TEST_TARGET_DOMAINS) OR ("lapack" IN_LIST TEST_TARGET_DOMAINS))
   find_package(CBLAS)
   if(NOT CBLAS_FOUND)
     # TODO: add list of tests without Netlib dependency
-    message(WARNING "Netlib CBLAS headers or libraries are not found, BLAS unit tests will be skipped")
-    list(REMOVE_ITEM TEST_TARGET_DOMAINS "blas")
+    message(WARNING "Netlib CBLAS headers or libraries are not found, BLAS/LAPACK unit tests will be skipped")
+    list(REMOVE_ITEM TEST_TARGET_DOMAINS "blas" "lapack")
   endif()
 endif()
 
@@ -67,7 +67,7 @@ set(lapack_TEST_LIST
         lapack_source)
 
 if(LAPACKE_FOUND)
-  set(lapack_TEST_LINK ${LAPACKE_LINK})
+  set(lapack_TEST_LINK "")
 endif()
 
 # RNG config
@@ -245,6 +245,8 @@ foreach(domain ${TEST_TARGET_DOMAINS})
 
   if(domain STREQUAL "blas" AND CBLAS_FOUND)
     set(TEST_LD_LIBRARY_PATH ${CMAKE_BINARY_DIR}/lib:${CBLAS_LIB_DIR}:$ENV{LD_LIBRARY_PATH})
+  elseif(domain STREQUAL "lapack" AND LAPACKE_FOUND)
+    set(TEST_LD_LIBRARY_PATH ${CMAKE_BINARY_DIR}/lib:${LAPACKE64_LIB_DIR}:${CBLAS_LIB_DIR}:$ENV{LD_LIBRARY_PATH})
   else()
     set(TEST_LD_LIBRARY_PATH ${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH})
   endif()

tests/unit_tests/lapack/CMakeLists.txt

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