Remove most special handling of MKL in CMake configuration

BUILD.md

@@ -95,7 +95,6 @@ CMake option | Values | Note
 `blaspp_DIR` | CMAKE:PATH | Location of the blaspp CMake-config file
 `lapackpp_DIR` | CMAKE:PATH | Location of the lapackpp CMake-config file
 `DLAF_WITH_MKL` | `{ON,OFF}` (default: `OFF`) | if blaspp/lapackpp is built with oneMKL
-`DLAF_WITH_LEGACY_MKL` | `{ON,OFF}` (default: `OFF`) | if blaspp/lapackpp is built with MKL (deprecated)
 `DLAF_WITH_SCALAPACK` | `{ON,OFF}` (default: `OFF`) | Enable ScaLAPACK-like API.
 `MKL_ROOT` | CMAKE:PATH | Location of the MKL library
 `DLAF_ASSERT_ENABLE` | `{ON,OFF}` (default: `ON`) | enable/disable cheap assertions

CMakeLists.txt

@@ -8,7 +8,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-cmake_minimum_required(VERSION 3.22)
+# TODO: Bump to 3.25 or keep 3.22?
+cmake_minimum_required(VERSION 3.25)
 
 project(DLAF VERSION 0.4.1)
 
@@ -34,8 +35,6 @@ endif()
 
 option(BUILD_SHARED_LIBS "Build shared libraries." ON)
 option(DLAF_WITH_OPENMP "${DLAF_WITH_OPENMP_DESCRIPTION}" ${DLAF_WITH_OPENMP_DEFAULT})
-option(DLAF_WITH_MKL "Enable oneMKL as provider for BLAS and LAPACK" OFF)
-option(DLAF_WITH_MKL_LEGACY "Enable MKL as provider for BLAS and LAPACK" OFF)
 option(DLAF_WITH_CUDA "Enable CUDA support" OFF)
 option(DLAF_WITH_HIP "Enable HIP support" OFF)
 cmake_dependent_option(
@@ -55,11 +54,15 @@ option(DLAF_BUILD_DOC "Build documentation" OFF)
 option(DLAF_WITH_PRECOMPILED_HEADERS "Use precompiled headers." OFF)
 option(DLAF_WITH_SCALAPACK "Build ScaLAPACK-like C API (requires ScaLAPACK)" OFF)
 
-if(DLAF_WITH_MKL AND DLAF_WITH_MKL_LEGACY)
-  message(SEND_ERROR "DLAF_WITH_MKL and DLAF_WITH_MKL_LEGACY are mutually exclusive.")
-endif()
+try_compile(
+  DLAF_WITH_MKL_TRY_COMPILE SOURCES "${PROJECT_SOURCE_DIR}/cmake/tests/mkl_set_num_threads.cpp"
+  LINK_OPTIONS "${LAPACK_LIBRARY}"
+)
+# TODO: Maybe don't need to print this? Though maybe it's nice to have...
+message(WARNING "DLAF_WITH_MKL_TRY_COMPILE=${DLAF_WITH_MKL_TRY_COMPILE}")
+option(DLAF_WITH_MKL "Enable oneMKL as provider for BLAS and LAPACK" "${DLAF_WITH_MKL_TRY_COMPILE}")
 
-if(DLAF_WITH_MKL OR DLAF_WITH_MKL_LEGACY)
+if(DLAF_WITH_MKL)
   # When using MKL there is no need to set the number of threads with
   # omp_set_num_threads; it's sufficient to use MKL's own mechanisms.
   set(DLAF_WITH_OPENMP OFF CACHE BOOL "${DLAF_WITH_OPENMP_DESCRIPTION}" FORCE)
@@ -156,37 +159,6 @@ if(DLAF_WITH_MKL) # oneMKL
     set(SCALAPACK_FOUND TRUE)
     add_library(DLAF::SCALAPACK INTERFACE IMPORTED GLOBAL)
   endif()
-elseif(DLAF_WITH_MKL_LEGACY) # MKL (deprecated)
-  find_package(MKL MODULE REQUIRED)
-
-  set(MKL_LAPACK_TARGET "mkl::mkl_intel_32bit_seq_dyn"
-      CACHE STRING "MKL LAPACK target (see FindMKL for details)"
-  )
-
-  # Note:
-  # If specified targets are found, "standardize" them
-
-  if(TARGET ${MKL_LAPACK_TARGET})
-    set(LAPACK_FOUND TRUE)
-    add_library(DLAF::LAPACK INTERFACE IMPORTED GLOBAL)
-    target_link_libraries(DLAF::LAPACK INTERFACE ${MKL_LAPACK_TARGET})
-  else()
-    message(FATAL_ERROR "${MKL_LAPACK_TARGET} as LAPACK target has not been found")
-  endif()
-
-  if(DLAF_WITH_SCALAPACK)
-    set(MKL_SCALAPACK_TARGET "mkl::scalapack_intel_32bit_seq_dyn"
-        CACHE STRING "MKL ScaLAPACK target (see FindMKL for details)"
-    )
-
-    if(TARGET ${MKL_SCALAPACK_TARGET})
-      set(SCALAPACK_FOUND TRUE)
-      add_library(DLAF::SCALAPACK INTERFACE IMPORTED GLOBAL)
-      target_link_libraries(DLAF::SCALAPACK INTERFACE ${MKL_SCALAPACK_TARGET})
-    else()
-      message(FATAL_ERROR "${MKL_SCALAPACK_TARGET} as ScaLAPACK target has not been found")
-    endif()
-  endif()
 else()
   find_package(LAPACK REQUIRED)
   if(DLAF_WITH_SCALAPACK)

ci/.gitlab-ci.yml

@@ -1,18 +1,18 @@
 include:
-  - local: 'ci/cpu/asan_ubsan_lsan.yml'
-  - local: 'ci/cpu/clang12_release.yml'
-  - local: 'ci/cpu/clang13_release_cxx20.yml'
-  - local: 'ci/cpu/clang14_release_stdexec.yml'
-  - local: 'ci/cpu/clang15_release.yml'
-  - local: 'ci/cpu/clang16_release.yml'
-  - local: 'ci/cpu/gcc11_codecov.yml'
-  - local: 'ci/cpu/gcc11_release.yml'
-  - local: 'ci/cpu/gcc11_release_stdexec.yml'
-  - local: 'ci/cpu/gcc11_debug_stdexec.yml'
-  - local: 'ci/cpu/gcc12_release_cxx20.yml'
+#   - local: 'ci/cpu/asan_ubsan_lsan.yml'
+#   - local: 'ci/cpu/clang12_release.yml'
+#   - local: 'ci/cpu/clang13_release_cxx20.yml'
+#   - local: 'ci/cpu/clang14_release_stdexec.yml'
+#   - local: 'ci/cpu/clang15_release.yml'
+#   - local: 'ci/cpu/clang16_release.yml'
+#   - local: 'ci/cpu/gcc11_codecov.yml'
+#   - local: 'ci/cpu/gcc11_release.yml'
+#   - local: 'ci/cpu/gcc11_release_stdexec.yml'
+#   - local: 'ci/cpu/gcc11_debug_stdexec.yml'
+#   - local: 'ci/cpu/gcc12_release_cxx20.yml'
   - local: 'ci/cuda/gcc11_release.yml'
   - local: 'ci/cuda/gcc11_release_scalapack.yml'
   - local: 'ci/cuda/gcc11_codecov.yml'
-  - local: 'ci/cuda/gcc11_debug_scalapack.yml'
-  - local: 'ci/rocm/clang14_release.yml'
-  - local: 'ci/rocm/clang14_release_stdexec.yml'
+#   - local: 'ci/cuda/gcc11_debug_scalapack.yml'
+#   - local: 'ci/rocm/clang14_release.yml'
+#   - local: 'ci/rocm/clang14_release_stdexec.yml'

ci/common-ci.yml

@@ -34,7 +34,7 @@ stages:
     reports:
       dotenv: build.env
   variables:
-    SPACK_SHA: dcc4423a9d0219a26ceeb52e329ed956e41f4d2c
+    SPACK_SHA: fd3c18b6fd7eda8abbb72ee81b39aa81b053d9bd
     SPACK_DLAF_REPO: ./spack
     DOCKER_BUILD_ARGS: '[
         "BASE_IMAGE",

ci/docker/build.Dockerfile

@@ -15,7 +15,7 @@ RUN apt-get -yqq update && \
     apt-get -yqq install --no-install-recommends \
     software-properties-common \
     build-essential gfortran \
-    autoconf automake ninja-build pkg-config \
+    autoconf automake libssl-dev ninja-build pkg-config \
     ${EXTRA_APTGET} \
     gawk \
     python3 python3-distutils \