Update pr-x86.yml, MKLConfig.cmake, MKLConfigVersion.cmake with 2025.2 related data (#696)

Co-authored-by: Dai-Ni Hsieh <dai-ni.hsieh@intel.com>

Author: itopinsk

.github/workflows/pr-x86.yml

@@ -68,13 +68,13 @@ jobs:
     - name: Install compiler
       if: steps.domain_check.outputs.result == 'true'
       run: |
-        wget --progress=dot:giga https://registrationcenter-download.intel.com/akdlm/IRC_NAS/cd63be99-88b0-4981-bea1-2034fe17f5cf/intel-dpcpp-cpp-compiler-2025.1.0.573_offline.sh
-        sudo bash intel-dpcpp-cpp-compiler-2025.1.0.573_offline.sh -s -a -s --action install --eula accept
+        wget --progress=dot:giga https://registrationcenter-download.intel.com/akdlm/IRC_NAS/39c79383-66bf-4f44-a6dd-14366e34e255/intel-dpcpp-cpp-compiler-2025.2.0.527_offline.sh
+        sudo bash intel-dpcpp-cpp-compiler-2025.2.0.527_offline.sh -s -a -s --action install --eula accept
     - name: Install Intel oneMKL
       if: steps.domain_check.outputs.result == 'true'
       run: |
-        wget --progress=dot:giga https://registrationcenter-download.intel.com/akdlm/IRC_NAS/dc93af13-2b3f-40c3-a41b-2bc05a707a80/intel-onemkl-2025.1.0.803_offline.sh
-        sudo bash intel-onemkl-2025.1.0.803_offline.sh -s -a -s --action install --eula accept
+        wget --progress=dot:giga https://registrationcenter-download.intel.com/akdlm/IRC_NAS/47c7d946-fca1-441a-b0df-b094e3f045ea/intel-onemkl-2025.2.0.629_offline.sh
+        sudo bash intel-onemkl-2025.2.0.629_offline.sh -s -a -s --action install --eula accept
     - name: Configure/Build for a domain
       if: steps.domain_check.outputs.result == 'true'
       run: |

cmake/mkl/MKLConfig.cmake

@@ -101,6 +101,8 @@
 #     Link line for ScaLAPACK and PBLAS API (includes MKL::MKL and MKL::MKL_BLACS)
 # MKL::MKL_BLACS
 #     Link line for BLACS and CPARDISO API (includes MKL::MKL)
+# MKL::MKL_SYCL_DISTRIBUTED_DFT
+#     Link line for SYCL Distributed DFT library (includes MKL::MKL_SYCL::DFT, Linux only)
 #
 # Note: For Device API, library linking is not required.
 #       Compile options can be added from the INTERFACE_COMPILE_OPTIONS property on MKL::MKL_SYCL
@@ -445,6 +447,17 @@ elseif(MKL_THREADING STREQUAL "gnu_thread")
 endif()
 
 # Define MKL_MPI
+if(SYCL_COMPILER)
+  set(MKL_SYCL_MPI_LIST intelmpi)
+  set(DEFAULT_MKL_SYCL_MPI intelmpi)
+  if(NOT DEFINED MKL_SYCL_MPI)
+    set(MKL_SYCL_MPI ${MKL_MPI})
+  endif()
+  define_param(MKL_SYCL_MPI DEFAULT_MKL_SYCL_MPI MKL_SYCL_MPI_LIST STATUS)
+  if(NOT MKL_SYCL_MPI)
+    mkl_message(STATUS "MKL::MKL_SYCL_DISTRIBUTED_DFT target will not be available.")
+  endif()
+endif()
 if(NOT MKL_LINK STREQUAL "sdl")
   set(DEFAULT_MKL_MPI intelmpi)
   if(UNIX)
@@ -624,6 +637,7 @@ else()
     set(MKL_SYCL         mkl_sycl)
   endif()
 endif()
+set(MKL_SYCL_DISTRIBUTED_DFT mkl_sycl_distributed_dft)
 
 set(MKL_IFACE_LIB   mkl_${MKL_INTERFACE_FULL})
 set(MKL_CORE        mkl_core)
@@ -662,7 +676,6 @@ endif()
 set(MKL_CDFT      mkl_cdft_core)
 set(MKL_SCALAPACK mkl_scalapack_${MKL_INTERFACE})
 
-
 if(UNIX)
   if(MKL_LINK STREQUAL "static" OR MKL_SYCL_LINK STREQUAL "static")
     set(START_GROUP "-Wl,--start-group")
@@ -691,6 +704,11 @@ endif()
 # Create a list of requested libraries, based on input options (MKL_LIBRARIES)
 # Create full link-line in MKL_LINK_LINE
 if(SYCL_COMPILER)
+  if(UNIX)
+    # SYCL MPI domain libraries
+    list(APPEND MKL_SYCL_LIBRARIES ${MKL_SYCL_DISTRIBUTED_DFT})
+  endif()
+  # Main SYCL libraries
   list(APPEND MKL_SYCL_LIBRARIES ${MKL_SYCL} ${MKL_SYCL_IFACE_LIB} ${MKL_SYCL_THREAD} ${MKL_CORE})
   list(TRANSFORM MKL_SYCL PREPEND MKL:: OUTPUT_VARIABLE MKL_SYCL_T)
   list(APPEND MKL_SYCL_LINK_LINE ${MKL_SYCL_LOPT} ${SYCL_EXPORT_DYNAMIC} ${NO_AS_NEEDED} ${MKL_SYCL_RPATH}
@@ -766,17 +784,21 @@ foreach(lib ${MKL_REQUESTED_LIBRARIES})
                   NO_DEFAULT_PATH)
     add_library(MKL::${lib} SHARED IMPORTED)
   endif()
-  if(NOT MKL_LINK STREQUAL "static" AND ${lib} MATCHES "mkl_sycl" AND ${${lib}_file} STREQUAL "${lib}_file-NOTFOUND")
+  if(NOT MKL_LINK STREQUAL "static" AND (${lib} MATCHES "mkl_sycl" AND NOT ${lib} STREQUAL "mkl_sycl_distributed_dft") AND ${${lib}_file} STREQUAL "${lib}_file-NOTFOUND")
     list(APPEND MISSED_MKL_SYCL_LIBS ${lib})
     set(MKL_SYCL_DOMAIN "")
     string(REGEX REPLACE "mkl_sycl_" "" MKL_SYCL_DOMAIN ${lib})
     if(WIN32 AND CMAKE_BUILD_TYPE MATCHES "Debug")
       string(REGEX REPLACE "d$" "" MKL_SYCL_DOMAIN ${MKL_SYCL_DOMAIN})
     endif()
     string(TOUPPER ${MKL_SYCL_DOMAIN} MKL_SYCL_DOMAIN)
-    mkl_message(WARNING "Could NOT find MKL ${lib} for target MKL::MKL_SYCL::${MKL_SYCL_DOMAIN}")
+    if(MKL_SYCL_DOMAIN STREQUAL "DFT")
+      mkl_message(STATUS "Could NOT find MKL ${lib} for targets MKL::MKL_SYCL::${MKL_SYCL_DOMAIN} and MKL::MKL_SYCL_DISTRIBUTED_DFT")
+    else()
+      mkl_message(STATUS "Could NOT find MKL ${lib} for target MKL::MKL_SYCL::${MKL_SYCL_DOMAIN}")
+    endif()
   else()
-    if(NOT USE_MPI AND (${lib} MATCHES "mkl_scalapack" OR ${lib} MATCHES "mkl_blacs" OR ${lib} MATCHES "mkl_cdft")
+    if(NOT USE_MPI AND (${lib} MATCHES "mkl_scalapack" OR ${lib} MATCHES "mkl_blacs" OR ${lib} MATCHES "mkl_cdft" OR ${lib} STREQUAL "mkl_sycl_distributed_dft")
             AND ${${lib}_file} STREQUAL "${lib}_file-NOTFOUND")
       if(${lib} MATCHES "mkl_scalapack")
         mkl_message(STATUS "Could NOT find MKL ${lib} for target MKL::MKL_SCALAPACK")
@@ -787,6 +809,9 @@ foreach(lib ${MKL_REQUESTED_LIBRARIES})
       if(${lib} MATCHES "mkl_blacs")
         mkl_message(STATUS "Could NOT find MKL ${lib} for targets MKL::MKL_SCALAPACK, MKL::MKL_CDFT, and MKL::MKL_BLACS")
       endif()
+      if(${lib} STREQUAL "mkl_sycl_distributed_dft")
+        mkl_message(STATUS "Could NOT find MKL ${lib} for target MKL::MKL_SYCL_DISTRIBUTED_DFT")
+      endif()
     else()
       check_required_vars(${lib}_file)
       mkl_message(STATUS "Found ${${lib}_file}")
@@ -820,7 +845,7 @@ foreach(lib ${MKL_REQUESTED_LIBRARIES})
         set_target_properties(MKL::${lib} PROPERTIES IMPORTED_LOCATION "${MKL_DLL_FILE}")
       else()
         if(${lib} MATCHES "mkl_sycl" AND ${${lib}_file} STREQUAL "${lib}_file-NOTFOUND")
-          mkl_message(WARNING "Could NOT find ${MKL_DLL_GLOB} for target MKL::MKL_SYCL::${MKL_SYCL_DOMAIN}")
+          mkl_message(STATUS "Could NOT find ${MKL_DLL_GLOB} for target MKL::MKL_SYCL::${MKL_SYCL_DOMAIN}")
         else()
           mkl_not_found_and_return("${MKL_DLL_GLOB} not found")
         endif()
@@ -837,8 +862,9 @@ endforeach()
 
 # Threading selection
 if(MKL_THREADING STREQUAL "tbb_thread" OR MKL_SYCL_THREADING STREQUAL "tbb_thread")
+  set(TBB_FIND_RELEASE_ONLY TRUE) # Do not use tbb_debug
   find_package(TBB CONFIG COMPONENTS tbb)
-  if(NOT TBB_FOUND)
+  if(NOT TBB_tbb_FOUND)
     if(MKL_THREADING STREQUAL "tbb_thread")
       if(NOT MKL_LINK STREQUAL "sdl")
         mkl_not_found_and_return("TBB not found for the specified MKL_THREADING: ${MKL_THREADING}")
@@ -1016,16 +1042,21 @@ if(SYCL_COMPILER)
     target_compile_options(MKL::MKL_SYCL::${MKL_SYCL_DOMAIN} INTERFACE $<$<COMPILE_LANGUAGE:CXX>:${MKL_SYCL_COPT}>)
     # Only dynamic link has domain specific libraries
     # Domain specific targets still use mkl_sycl for static
-    if(MKL_LINK STREQUAL "static")
-      target_link_libraries(MKL::MKL_SYCL::${MKL_SYCL_DOMAIN} INTERFACE ${MKL_SYCL_LINK_LINE} ${MKL_SYCL_THREAD_LIB} ${MKL_SYCL_SUPP_LINK})
-    else()
+    if(NOT MKL_LINK STREQUAL "static")
       list(TRANSFORM MKL_SYCL_LINK_LINE REPLACE ".*mkl_sycl.*" "TBD")
       list(REMOVE_DUPLICATES MKL_SYCL_LINK_LINE)
       list(TRANSFORM MKL_SYCL_LINK_LINE REPLACE "TBD" "MKL::${lib}")
-      target_link_libraries(MKL::MKL_SYCL::${MKL_SYCL_DOMAIN} INTERFACE ${MKL_SYCL_LINK_LINE} ${MKL_SYCL_THREAD_LIB} ${MKL_SYCL_SUPP_LINK})
     endif()
+    target_link_libraries(MKL::MKL_SYCL::${MKL_SYCL_DOMAIN} INTERFACE ${MKL_SYCL_LINK_LINE} ${MKL_SYCL_THREAD_LIB} ${MKL_SYCL_SUPP_LINK})
     list(APPEND LINK_TYPES MKL::MKL_SYCL::${MKL_SYCL_DOMAIN})
   endforeach(lib) # MKL_SYCL_LIBS
+  if(UNIX AND NOT TARGET MKL::MKL_SYCL_DISTRIBUTED_DFT AND TARGET MKL::MKL_SYCL::DFT AND MKL_SYCL_MPI
+    AND NOT ${${MKL_SYCL_DISTRIBUTED_DFT}_file} STREQUAL "${MKL_SYCL_DISTRIBUTED_DFT}_file-NOTFOUND")
+    add_library(MKL::MKL_SYCL_DISTRIBUTED_DFT INTERFACE IMPORTED GLOBAL)
+    target_compile_options(MKL::MKL_SYCL_DISTRIBUTED_DFT INTERFACE $<$<COMPILE_LANGUAGE:CXX>:${MKL_SYCL_COPT}>)
+    target_link_libraries(MKL::MKL_SYCL_DISTRIBUTED_DFT INTERFACE MKL::${MKL_SYCL_DISTRIBUTED_DFT} MKL::MKL_SYCL::DFT)
+    list(APPEND LINK_TYPES MKL::MKL_SYCL_DISTRIBUTED_DFT)
+  endif()
 endif()
 # Single target for all C, Fortran link-lines
 if(NOT TARGET MKL::MKL)

cmake/mkl/MKLConfigVersion.cmake

@@ -17,16 +17,16 @@
 # SPDX-License-Identifier: Apache-2.0
 #===============================================================================
 
-set(PACKAGE_VERSION "2025.1.0")
+set(PACKAGE_VERSION "2025.2.0")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("2025.1.0" MATCHES "^([0-9]+)\\.")
+  if("2025.2.0" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
   else()
-    set(CVF_VERSION_MAJOR "2025.1.0")
+    set(CVF_VERSION_MAJOR "2025.2.0")
   endif()
 
   if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)