From 6e5d37c2b7aa654971d611e276710e82b2254e09 Mon Sep 17 00:00:00 2001 From: RTChou67 <3023207450@tju.edu.cn> Date: Wed, 8 Jul 2026 00:39:37 +0800 Subject: [PATCH] toolchain: rely on CMake MKL detection --- tools/toolchain/build_cp2k.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/toolchain/build_cp2k.sh b/tools/toolchain/build_cp2k.sh index 34b273805f..8ebdd89c55 100755 --- a/tools/toolchain/build_cp2k.sh +++ b/tools/toolchain/build_cp2k.sh @@ -196,10 +196,7 @@ if [ "${math_mode}" = "mkl" ]; then if [ -z "${MKLROOT}" ]; then report_error ${LINENO} "math_mode is mkl, but MKLROOT is not set by ${TOOLCHAIN_INSTALL_DIR}/setup." fi - CMAKE_OPTIONS+=" -DMKL_ROOT=${MKLROOT} -DCP2K_BLAS_VENDOR=MKL -DCP2K_BLAS_THREADING=sequential" - if [ "${mpi_mode}" != "no" ] && [ "${MKL_SCALAPACK}" = "yes" ]; then - CMAKE_OPTIONS+=" -DCP2K_SCALAPACK_VENDOR=MKL" - fi + CMAKE_OPTIONS+=" -DCP2K_BLAS_VENDOR=MKL -DCP2K_BLAS_THREADING=sequential" fi if [ -n "$(grep -- "--install-all" "${TOOLCHAIN_ROOTDIR}/toolchain_settings")" ]; then CMAKE_OPTIONS+=" -DCP2K_USE_EVERYTHING=ON -DCP2K_USE_DLAF=OFF -DCP2K_USE_PEXSI=OFF -DCP2K_USE_OPENPMD=OFF"