Properly define and export COMPLEX and USM cmake options

Author: rafbiels

onemath/sycl/blas/CMakeLists.txt

@@ -63,13 +63,18 @@ set(ONEMATH_SYCL_BLAS_INSTALL_SRC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/
 
 option(BLAS_ENABLE_EXTENSIONS "Whether to enable BLAS extensions" ON)
 option(BLAS_ENABLE_COMPLEX "Whether to enable complex data type for GEMM" ON)
+option(BLAS_ENABLE_USM "Whether to enable USM API" ON)
 option(BLAS_ENABLE_HALF "Whether to enable sycl::half data type for supported operators" ON)
 
 if (SYCL_COMPILER MATCHES "adaptivecpp" OR ${CMAKE_CXX_COMPILER} MATCHES "acpp|syclcc")
   if(BLAS_ENABLE_COMPLEX)
     message(STATUS "SYCL Complex data is not supported on AdaptiveCpp/hipSYCL. Complex data type is disabled")
     set(BLAS_ENABLE_COMPLEX OFF)
   endif()
+  if (BLAS_ENABLE_USM)
+    message(STATUS "USM API is not supported on AdaptiveCpp/hipSYCL. USM API is disabled")
+    set(BLAS_ENABLE_USM OFF)
+  endif()
 endif()
 
 add_library(onemath_sycl_blas INTERFACE)
@@ -78,7 +83,6 @@ set_target_properties(onemath_sycl_blas PROPERTIES
 include(CheckCXXCompilerFlag)
 check_cxx_compiler_flag("-fsycl" is_dpcpp)
 if(is_dpcpp)
-  target_compile_definitions(onemath_sycl_blas INTERFACE "SB_ENABLE_USM")
   check_cxx_compiler_flag("-mllvm=-enable-global-offset=false" support_disable_global_offset)
   if (${support_disable_global_offset})
     if ((${CMAKE_CXX_COMPILER_ID} STREQUAL "IntelLLVM"
@@ -94,6 +98,9 @@ endif()
 if(${BLAS_ENABLE_COMPLEX})
   target_compile_definitions(onemath_sycl_blas INTERFACE "BLAS_ENABLE_COMPLEX")
 endif()
+if(${BLAS_ENABLE_USM})
+  target_compile_definitions(onemath_sycl_blas INTERFACE "SB_ENABLE_USM")
+endif()
 target_compile_definitions(onemath_sycl_blas INTERFACE ${TUNING_TARGET})
 target_compile_options(onemath_sycl_blas INTERFACE -Wno-deprecated-declarations)
 target_compile_options(onemath_sycl_blas INTERFACE -Wno-deprecated-copy-with-user-provided-copy)
@@ -107,14 +114,23 @@ endif()
 
 include(CMakePackageConfigHelpers)
 set(version_file "${CMAKE_CURRENT_BINARY_DIR}/cmake/onemath_sycl_blas-version.cmake")
+set(config_file "${CMAKE_CURRENT_BINARY_DIR}/cmake/onemath_sycl_blas-config.cmake")
+set(targets_name "onemath_sycl_blas-targets")
 write_basic_package_version_file(${version_file}
   VERSION ${PROJECT_VERSION}
   COMPATIBILITY AnyNewerVersion
 )
+configure_package_config_file(
+  cmake/config.cmake.in
+  ${config_file}
+  INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX}
+)
+install(FILES ${version_file} ${config_file}
+  DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 include(GNUInstallDirs)
 install(TARGETS onemath_sycl_blas
-  EXPORT onemath_sycl_blas
+  EXPORT ${targets_name}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -131,16 +147,9 @@ install(DIRECTORY ${ONEMATH_SYCL_BLAS_INCLUDE}
     FILES_MATCHING PATTERN "*.hpp"
   )
 
-install(FILES ${version_file} DESTINATION ${CMAKE_INSTALL_PREFIX})
-install(EXPORT onemath_sycl_blas
+install(EXPORT ${targets_name}
   DESTINATION ${CMAKE_INSTALL_PREFIX}
   NAMESPACE ONEMATH_SYCL_BLAS::
-  FILE onemath_sycl_blas-config.cmake
-)
-
-export(EXPORT onemath_sycl_blas
-  NAMESPACE ONEMATH_SYCL_BLAS::
-  FILE onemath_sycl_blas-config.cmake
 )
 
 option(BLAS_ENABLE_CONST_INPUT "Whether to enable kernel instantiation with const input buffer" ON)

onemath/sycl/blas/cmake/config.cmake.in

@@ -0,0 +1,5 @@
+@PACKAGE_INIT@
+set(BLAS_ENABLE_COMPLEX "@BLAS_ENABLE_COMPLEX@")
+set(BLAS_ENABLE_USM "@BLAS_ENABLE_USM@")
+
+include("${CMAKE_CURRENT_LIST_DIR}/@targets_name@.cmake")