mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 23:49:09 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[intel-mkl] Overhaul, install osx (#30483)

Browse Source 
* [intel-mkl] Install osx

* Do less work for --only-downloads

* Try harder to ensure DMG unmount

* Adjust port warning

* Always install usage

* Fix log names

* Merge copyright

* Revise pc file handling

* Cleanup

* More uniform staging and variables

* Update messages

* Update versions

* Typo

* More cleanup

* Do nothing for unsupported targets

The old code was already broken.

* Fix and simplify copy-from-dmg

* Change extract_0_dir

* Mount to tmp dir
This commit is contained in:
Kai Pastor 2023-05-11 21:39:22 +02:00 committed by GitHub
parent c43c007677
commit ed8fb07a8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 246 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ports/intel-mkl/copy-from-dmg.cmake Normal file
View File

@ -0,0 +1,53 @@
find_program(HDIUTIL NAMES hdiutil REQUIRED)
set(dmg_path "NOTFOUND" CACHE FILEPATH "Where to find the DMG")
set(output_dir "output_dir" CACHE FILEPATH "Where to put the packages")
if(NOT EXISTS "${dmg_path}")
message(FATAL_ERROR "'dmg_path' (${dmg_path}) does not exist.")
endif()
if(NOT IS_DIRECTORY "${output_dir}")
message(FATAL_ERROR "'output_dir' (${output_dir}) is not a directory.")
endif()
execute_process(
COMMAND mktemp -d
RESULT_VARIABLE mktemp_result
OUTPUT_VARIABLE mount_point
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(NOT mktemp_result STREQUAL "0")
message(FATAL_ERROR "mktemp -d failed: ${mktemp_result}")
elseif(NOT IS_DIRECTORY "${mount_point}")
message(FATAL_ERROR "'mount_point' (${mount_point}) is not a directory.")
endif()
execute_process(
COMMAND "${HDIUTIL}" attach "${dmg_path}" -mountpoint "${mount_point}" -readonly
RESULT_VARIABLE mount_result
)
if(mount_result STREQUAL "0")
set(dmg_packages_dir "${mount_point}/bootstrapper.app/Contents/Resources/packages")
file(GLOB packages
"${dmg_packages_dir}/intel.oneapi.mac.mkl.devel,*"
"${dmg_packages_dir}/intel.oneapi.mac.mkl.runtime,*"
"${dmg_packages_dir}/intel.oneapi.mac.mkl.product,*"
"${dmg_packages_dir}/intel.oneapi.mac.openmp,*"
)
# Using execute_process to avoid direct errors
execute_process(
COMMAND cp -R ${packages} "${output_dir}/"
RESULT_VARIABLE copy_result
)
endif()
execute_process(
COMMAND "${HDIUTIL}" detach "${mount_point}"
RESULT_VARIABLE unmount_result
)
if(NOT mount_result STREQUAL "0")
message(FATAL_ERROR "Mounting ${dmg_path} failed: ${mount_result}")
elseif(NOT copy_result STREQUAL "0")
message(FATAL_ERROR "Coyping packages failed: ${copy_result}")
elseif(NOT unmount_result STREQUAL "0")
message(FATAL_ERROR "Unounting ${dmg_path} failed: ${unmount_result}")
endif()

394
ports/intel-mkl/portfile.cmake
View File

@ -1,88 +1,83 @@
# This package installs Intel MKL on Linux and Windows for x64 and on other platforms tries to search for it. # This package installs Intel MKL on Linux, macOS and Windows for x64.
# The installation for the platforms are: # Configuration:
# - Windows: ilp64, intel_thread (!static_crt), sequential(static_crt) # - ilp64
# - Linux: ilp64, intel_thread # - dynamic CRT: intel_thread, static CRT: sequential
set(VCPKG_POLICY_EMPTY_PACKAGE enabled) set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
set(MKL_REQUIRED_VERSION "20200000")
# https://registrationcenter-download.intel.com/akdlm/IRC_NAS/19150/w_onemkl_p_2023.0.0.25930_offline.exe # windows # https://registrationcenter-download.intel.com/akdlm/IRC_NAS/19150/w_onemkl_p_2023.0.0.25930_offline.exe # windows
# https://registrationcenter-download.intel.com/akdlm/IRC_NAS/19116/m_onemkl_p_2023.0.0.25376_offline.dmg # macos # https://registrationcenter-download.intel.com/akdlm/IRC_NAS/19116/m_onemkl_p_2023.0.0.25376_offline.dmg # macos
# https://registrationcenter-download.intel.com/akdlm/irc_nas/19138/l_onemkl_p_2023.0.0.25398_offline.sh # linux # https://registrationcenter-download.intel.com/akdlm/irc_nas/19138/l_onemkl_p_2023.0.0.25398_offline.sh # linux
set(sha "") set(sha "")
if(VCPKG_TARGET_IS_WINDOWS) if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
# nop
elseif(VCPKG_TARGET_IS_WINDOWS)
set(filename w_onemkl_p_2023.0.0.25930_offline.exe) set(filename w_onemkl_p_2023.0.0.25930_offline.exe)
set(magic_number 19150) set(magic_number 19150)
set(sha a3eb6b75241a2eccb73ed73035ff111172c55d3fa51f545c7542277a155df84ff72fc826621711153e683f84058e64cb549c030968f9f964531db76ca8a3ed46) set(sha a3eb6b75241a2eccb73ed73035ff111172c55d3fa51f545c7542277a155df84ff72fc826621711153e683f84058e64cb549c030968f9f964531db76ca8a3ed46)
elseif(VCPKG_TARGET_IS_OSX AND 0) set(package_infix "win")
elseif(VCPKG_TARGET_IS_OSX)
set(filename m_onemkl_p_2023.0.0.25376_offline.dmg) set(filename m_onemkl_p_2023.0.0.25376_offline.dmg)
set(magic_number 19116) set(magic_number 19116)
set(sha 7b9b8c004054603e6830fb9b9c049d5a4cfc0990c224cb182ac5262ab9f1863775a67491413040e3349c590e2cca58edcfc704db9f3b9f9faa8b5b09022cd2af) set(sha 7b9b8c004054603e6830fb9b9c049d5a4cfc0990c224cb182ac5262ab9f1863775a67491413040e3349c590e2cca58edcfc704db9f3b9f9faa8b5b09022cd2af)
# This is a disk image: If somebody knows how to extract it please do so. set(package_infix "mac")
set(package_libdir "lib")
set(compiler_libdir "mac/compiler/lib")
elseif(VCPKG_TARGET_IS_LINUX) elseif(VCPKG_TARGET_IS_LINUX)
set(filename l_onemkl_p_2023.0.0.25398_offline.sh) set(filename l_onemkl_p_2023.0.0.25398_offline.sh)
set(magic_number 19138) set(magic_number 19138)
set(sha b5f2f464675f0fd969dde2faf2e622b834eb1cc406c4a867148116f6c24ba5c709d98b678840f4a89a1778e12cde0ff70ce2ef59faeef3d3f3aa1d0329c71af1) set(sha b5f2f464675f0fd969dde2faf2e622b834eb1cc406c4a867148116f6c24ba5c709d98b678840f4a89a1778e12cde0ff70ce2ef59faeef3d3f3aa1d0329c71af1)
else() set(package_infix "lin")
set(ProgramFilesx86 "ProgramFiles(x86)") set(package_libdir "lib/intel64")
set(INTEL_ROOT $ENV{${ProgramFilesx86}}/IntelSWTools/compilers_and_libraries/windows) set(compiler_libdir "linux/compiler/lib/intel64_lin")
set(ONEMKL_ROOT $ENV{${ProgramFilesx86}}/Intel/oneAPI/mkl/latest)
find_path(MKL_ROOT include/mkl.h
PATHS
$ENV{MKLROOT}
${INTEL_ROOT}/mkl
$ENV{ONEAPI_ROOT}/mkl/latest
${ONEMKL_ROOT}
DOC
"Folder contains MKL")
if (MKL_ROOT STREQUAL "MKL_ROOT-NOTFOUND")
message(FATAL_ERROR "Could not find MKL. Before continuing, please download and install MKL (${MKL_REQUIRED_VERSION} or higher) from:"
"\n https://registrationcenter.intel.com/en/products/download/3178/\n"
"\nAlso ensure vcpkg has been rebuilt with the latest version (v0.0.104 or later)")
endif()
file(STRINGS "${MKL_ROOT}/include/mkl_version.h" MKL_VERSION_DEFINITION REGEX "INTEL_MKL_VERSION")
string(REGEX MATCH "([0-9]+)" MKL_VERSION ${MKL_VERSION_DEFINITION})
if (MKL_VERSION LESS MKL_REQUIRED_VERSION)
message(FATAL_ERROR "MKL ${MKL_VERSION} is found but ${MKL_REQUIRED_VERSION} is required. Please download and install a more recent version of MKL from:"
"\n https://registrationcenter.intel.com/en/products/download/3178/\n")
endif()
endif() endif()
if(sha) if(NOT sha)
vcpkg_download_distfile(archive_path message(WARNING "${PORT} is empty for ${TARGET_TRIPLET}.")
URLS "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/${magic_number}/${filename}" return()
FILENAME "${filename}" endif()
SHA512 ${sha}
)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") vcpkg_download_distfile(installer_path
URLS "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/${magic_number}/${filename}"
FILENAME "${filename}"
SHA512 "${sha}"
)
# Note: intel_thread and lp64 are the defaults. # Note: intel_thread and lp64 are the defaults.
set(interface "ilp64") # or ilp64; ilp == 64 bit int api set(interface "ilp64") # or ilp64; ilp == 64 bit int api
#https://www.intel.com/content/www/us/en/develop/documentation/onemkl-linux-developer-guide/top/linking-your-application-with-onemkl/linking-in-detail/linking-with-interface-libraries/using-the-ilp64-interface-vs-lp64-interface.html #https://www.intel.com/content/www/us/en/develop/documentation/onemkl-linux-developer-guide/top/linking-your-application-with-onemkl/linking-in-detail/linking-with-interface-libraries/using-the-ilp64-interface-vs-lp64-interface.html
if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
set(threading "intel_thread") #sequential or intel_thread or tbb_thread or pgi_thread set(threading "intel_thread") #sequential or intel_thread or tbb_thread or pgi_thread
else() else()
set(threading "sequential") set(threading "sequential")
endif() endif()
if(threading STREQUAL "intel_thread") if(threading STREQUAL "intel_thread")
set(short_thread "iomp") set(short_thread "iomp")
else() else()
string(SUBSTRING "${threading}" "0" "3" short_thread) string(SUBSTRING "${threading}" "0" "3" short_thread)
endif() endif()
set(main_pc_file "mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc")
if(VCPKG_TARGET_IS_WINDOWS) # First extraction level: packages (from offline installer)
set(extract_0_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-extract")
file(REMOVE_RECURSE "${extract_0_dir}")
file(MAKE_DIRECTORY "${extract_0_dir}")
# Second extraction level: actual files (from packages)
set(extract_1_dir "${CURRENT_PACKAGES_DIR}/intel-extract")
file(REMOVE_RECURSE "${extract_1_dir}")
file(MAKE_DIRECTORY "${extract_1_dir}")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_find_acquire_program(7Z) vcpkg_find_acquire_program(7Z)
vcpkg_execute_in_download_mode( message(STATUS "Extracting offline installer")
COMMAND "${7Z}" x "${archive_path}" "-o${CURRENT_PACKAGES_DIR}/intel-extract" "-y" "-bso0" "-bsp0" vcpkg_execute_required_process(
WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}" COMMAND "${7Z}" x "${installer_path}" "-o${extract_0_dir}" "-y" "-bso0" "-bsp0"
) WORKING_DIRECTORY "${extract_0_dir}"
LOGNAME "extract-${TARGET_TRIPLET}-0"
)
set(packages set(packages
"intel.oneapi.win.mkl.devel,v=2023.0.0-25930/oneapi-mkl-devel-for-installer_p_2023.0.0.25930.msi" # has the required libs. "intel.oneapi.win.mkl.devel,v=2023.0.0-25930/oneapi-mkl-devel-for-installer_p_2023.0.0.25930.msi" # has the required libs.
@ -92,186 +87,167 @@ if(sha)
#"intel.oneapi.win.tbb.runtime,v=2021.8.0-25874" #TBB #"intel.oneapi.win.tbb.runtime,v=2021.8.0-25874" #TBB
) )
set(output_path "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") # vcpkg.cmake adds everything in /tools to CMAKE_PROGRAM_PATH. That is not desired
file(MAKE_DIRECTORY "${output_path}")
foreach(pack IN LISTS packages) foreach(pack IN LISTS packages)
set(archive_path "${CURRENT_PACKAGES_DIR}/intel-extract/packages/${pack}") set(package_path "${extract_0_dir}/packages/${pack}")
cmake_path(GET pack STEM LAST_ONLY packstem) cmake_path(GET pack STEM LAST_ONLY packstem)
cmake_path(NATIVE_PATH archive_path archive_path_native) cmake_path(NATIVE_PATH package_path package_path_native)
vcpkg_execute_in_download_mode( vcpkg_execute_required_process(
COMMAND "${LESSMSI}" x "${archive_path_native}" # Using output_path here does not work in bash COMMAND "${LESSMSI}" x "${package_path_native}"
WORKING_DIRECTORY "${output_path}" WORKING_DIRECTORY "${extract_1_dir}"
OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-out.log" LOGNAME "extract-${TARGET_TRIPLET}-${packstem}"
ERROR_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-err.log" )
RESULT_VARIABLE error_code file(COPY "${extract_1_dir}/${packstem}/SourceDir/" DESTINATION "${extract_1_dir}")
) file(REMOVE_RECURSE "${extract_1_dir}/${packstem}")
file(COPY "${output_path}/${packstem}/SourceDir/" DESTINATION "${output_path}")
file(REMOVE_RECURSE "${output_path}/${packstem}")
endforeach() endforeach()
set(basepath "${output_path}/Intel/Compiler/12.0/mkl/2023.0.0/") set(mkl_dir "${extract_1_dir}/Intel/Compiler/12.0/mkl/2023.0.0")
set(basepath2 "${output_path}/Intel/Compiler/12.0/compiler/2023.0.0/") file(COPY "${mkl_dir}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
file(REMOVE_RECURSE "${output_path}/Intel/shared files"
"${output_path}/Intel/Compiler/12.0/conda_channel"
"${basepath}tools"
"${basepath}interfaces"
"${basepath}examples"
"${basepath}bin"
"${basepath}benchmarks"
)
file(COPY "${basepath}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
# see https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl-link-line-advisor.html for linking # see https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl-link-line-advisor.html for linking
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(files "mkl_core_dll.lib" "mkl_${threading}_dll.lib" "mkl_intel_${interface}_dll.lib" "mkl_blas95_${interface}.lib" "mkl_lapack95_${interface}.lib") # "mkl_rt.lib" single dynamic lib with dynamic dispatch set(files "mkl_core_dll.lib" "mkl_${threading}_dll.lib" "mkl_intel_${interface}_dll.lib" "mkl_blas95_${interface}.lib" "mkl_lapack95_${interface}.lib") # "mkl_rt.lib" single dynamic lib with dynamic dispatch
file(COPY "${basepath}redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") # Could probably be reduced instead of copying all file(COPY "${mkl_dir}/redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") # Could probably be reduced instead of copying all
if(NOT VCPKG_BUILD_TYPE) if(NOT VCPKG_BUILD_TYPE)
file(COPY "${basepath}redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(COPY "${mkl_dir}/redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
endif() endif()
else() else()
set(files "mkl_core.lib" "mkl_${threading}.lib" "mkl_intel_${interface}.lib" "mkl_blas95_${interface}.lib" "mkl_lapack95_${interface}.lib") set(files "mkl_core.lib" "mkl_${threading}.lib" "mkl_intel_${interface}.lib" "mkl_blas95_${interface}.lib" "mkl_lapack95_${interface}.lib")
endif() endif()
foreach(file ${files}) foreach(file IN LISTS files)
file(COPY "${basepath}lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") # instead of manual-link keep normal structure file(COPY "${mkl_dir}/lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") # instead of manual-link keep normal structure
if(NOT VCPKG_BUILD_TYPE) if(NOT VCPKG_BUILD_TYPE)
file(COPY "${basepath}lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64") file(COPY "${mkl_dir}/lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64")
endif() endif()
endforeach() endforeach()
file(COPY_FILE "${mkl_dir}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}")
configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY) set(compiler_dir "${extract_1_dir}/Intel/Compiler/12.0/compiler/2023.0.0")
if(NOT VCPKG_BUILD_TYPE)
configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include")
endif()
if(threading STREQUAL "intel_thread") if(threading STREQUAL "intel_thread")
file(COPY "${basepath2}windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(COPY "${compiler_dir}/windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
file(COPY "${basepath2}windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") file(COPY "${compiler_dir}/windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" @ONLY) file(COPY_FILE "${compiler_dir}/lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/windows/compiler/lib/intel64_win/" "/lib/intel64/") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/windows/compiler/lib/intel64_win/" "/lib/intel64/")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "openmp" "libiomp5")
if(NOT VCPKG_BUILD_TYPE) if(NOT VCPKG_BUILD_TYPE)
file(COPY "${basepath2}windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(COPY "${compiler_dir}/windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
file(COPY "${basepath2}windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64") file(COPY "${compiler_dir}/windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64")
configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" @ONLY)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "/windows/compiler/lib/intel64_win/" "/lib/intel64/")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "")
endif()
configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" "openmp" "libiomp5")
if(NOT VCPKG_BUILD_TYPE)
configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "openmp" "libiomp5")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include")
endif() endif()
endif() endif()
else()
message(STATUS "Warning: This port is still a work on progress.
E.g. it is not correctly filtering the libraries in accordance with
VCPKG_LIBRARY_LINKAGE. It is using the default threading (Intel OpenMP)
which is known to segfault when used together with GNU OpenMP.
")
message(STATUS "Extracting offline installer")
file(COPY "${basepath}lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") if(VCPKG_TARGET_IS_LINUX)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../") vcpkg_execute_required_process(
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin") COMMAND "bash" "--verbose" "--noprofile" "${installer_path}" "--extract-only" "--extract-folder" "${extract_0_dir}"
#TODO: Hardcode settings from portfile in config.cmake WORKING_DIRECTORY "${extract_0_dir}"
#TODO. Give lapack/blas information about the correct BLA_VENDOR depending on settings. LOGNAME "extract-${TARGET_TRIPLET}-0"
file(INSTALL "${CURRENT_PACKAGES_DIR}/intel-extract/packages/intel.oneapi.win.mkl.product,v=2023.0.0-25930/licenses/license.htm" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${basepath}licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
elseif(VCPKG_TARGET_IS_LINUX)
message(WARNING "This port is still a work on progress on linux. E.g. it is not correctly filtering the libraries in accordance with VCPKG_LIBRARY_LINKAGE. Furthermore it is using the default threading which is Intel OpenMP which is known to segfault if GNU OpenMP is also used elsewhere!")
#./l_onemkl_p_2023.0.0.25398_offline.sh --extract-only -a -s
# cmake -E tar -xf <payload>
set(output_path "${CURRENT_PACKAGES_DIR}/intel-extract")
message(STATUS "${archive_path}")
file(MAKE_DIRECTORY "${output_path}")
vcpkg_execute_in_download_mode(
COMMAND "bash" "--verbose" "--noprofile" "${archive_path}" "--extract-only" "--extract-folder" "${output_path}"
WORKING_DIRECTORY "${output_path}"
OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/extract-${TARGET_TRIPLET}-out.log"
ERROR_FILE "${CURRENT_BUILDTREES_DIR}/extract-${TARGET_TRIPLET}-err.log"
)
set(packages
"intel.oneapi.lin.mkl.devel,v=2023.0.0-25398" # has the required staic libs.
"intel.oneapi.lin.mkl.runtime,v=2023.0.0-25398" # has the required dynamic so.
"intel.oneapi.lin.openmp,v=2023.0.0-25370" #OpenMP
) )
file(RENAME "${extract_0_dir}/l_onemkl_p_2023.0.0.25398_offline/packages" "${extract_0_dir}/packages")
elseif(VCPKG_TARGET_IS_OSX)
find_program(HDIUTIL NAMES hdiutil REQUIRED)
file(MAKE_DIRECTORY "${extract_0_dir}/packages")
message(STATUS "... Don't interrupt.")
vcpkg_execute_required_process(
COMMAND "${CMAKE_COMMAND}" "-Ddmg_path=${installer_path}"
"-Doutput_dir=${extract_0_dir}/packages"
"-DHDIUTIL=${HDIUTIL}"
-P "${CMAKE_CURRENT_LIST_DIR}/copy-from-dmg.cmake"
WORKING_DIRECTORY "${extract_0_dir}"
LOGNAME "extract-${TARGET_TRIPLET}-0"
)
message(STATUS "... Done.")
endif()
foreach(pack IN LISTS packages) file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.runtime,v=2023.0.0-*")
set(archive_path "${output_path}/l_onemkl_p_2023.0.0.25398_offline/packages/${pack}") cmake_path(GET package_path STEM LAST_ONLY packstem)
vcpkg_execute_in_download_mode( message(STATUS "Extracting ${packstem}")
COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${archive_path}/cupPayload.cup" vcpkg_execute_required_process(
WORKING_DIRECTORY "${output_path}" COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup"
OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/mkl-extract-${TARGET_TRIPLET}-out.log" "_installdir/mkl/2023.0.0/lib"
ERROR_FILE "${CURRENT_BUILDTREES_DIR}/mkl-extract-${TARGET_TRIPLET}-err.log" "_installdir/mkl/2023.0.0/licensing"
) WORKING_DIRECTORY "${extract_1_dir}"
endforeach() LOGNAME "extract-${TARGET_TRIPLET}-${packstem}"
)
set(basepath "${output_path}/_installdir/mkl/2023.0.0/") file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.devel,v=2023.0.0-*")
set(basepath2 "${output_path}/_installdir/compiler/2023.0.0/") cmake_path(GET package_path STEM LAST_ONLY packstem)
file(REMOVE_RECURSE "${basepath}../../conda_channel/" message(STATUS "Extracting ${packstem}")
"${basepath}tools" vcpkg_execute_required_process(
"${basepath}interfaces" COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup"
"${basepath}examples" "_installdir/mkl/2023.0.0/bin"
"${basepath}bin" "_installdir/mkl/2023.0.0/include"
"${basepath}benchmarks" "_installdir/mkl/2023.0.0/lib"
"${basepath}env" WORKING_DIRECTORY "${extract_1_dir}"
"${basepath}modulefiles" LOGNAME "extract-${TARGET_TRIPLET}-${packstem}"
) )
file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.openmp,v=2023.0.0-*")
file(COPY "${basepath}include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") cmake_path(GET package_path STEM LAST_ONLY packstem)
file(COPY "${basepath}lib/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") message(STATUS "Extracting ${packstem}")
vcpkg_execute_required_process(
COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup"
"_installdir/compiler/2023.0.0"
WORKING_DIRECTORY "${extract_1_dir}"
LOGNAME "extract-${TARGET_TRIPLET}-${packstem}"
)
set(mkl_dir "${extract_1_dir}/_installdir/mkl/2023.0.0")
file(COPY "${mkl_dir}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
file(COPY "${mkl_dir}/${package_libdir}/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(to_remove_suffix .a) set(to_remove_suffix .a)
elseif(VCPKG_TARGET_IS_OSX)
set(to_remove_suffix .dylib)
else() else()
set(to_remove_suffix .so) set(to_remove_suffix .so)
endif() endif()
file(GLOB_RECURSE files_to_remove "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}" "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}.?") file(GLOB_RECURSE files_to_remove
"${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}"
"${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}.?"
)
file(REMOVE ${files_to_remove}) file(REMOVE ${files_to_remove})
file(COPY_FILE "${mkl_dir}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}")
configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "\${exec_prefix}/${package_libdir}" "\${exec_prefix}/lib/intel64")
if(NOT VCPKG_BUILD_TYPE)
configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY) set(compiler_dir "${extract_1_dir}/_installdir/compiler/2023.0.0")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/lib/intel64" "/../lib/intel64")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include")
endif()
if(threading STREQUAL "intel_thread") if(threading STREQUAL "intel_thread")
file(COPY "${basepath2}linux/compiler/lib/intel64_lin/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") file(COPY "${compiler_dir}/${compiler_libdir}/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" @ONLY) file(COPY_FILE "${compiler_dir}/lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/linux/compiler/lib/intel64/" "/lib/intel64/") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/${compiler_libdir}/" "/lib/intel64/")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "openmp" "libiomp5")
if(NOT VCPKG_BUILD_TYPE)
configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" @ONLY)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "/linux/compiler/lib/intel64/" "/../lib/intel64/")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "")
endif()
configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" "openmp" "libiomp5")
if(NOT VCPKG_BUILD_TYPE)
configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "openmp" "libiomp5")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include")
endif()
endif() endif()
file(COPY "${basepath}lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin")
#TODO: Hardcode settings from portfile in config.cmake
file(INSTALL "${basepath}licensing/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${basepath}licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/intel-extract"
"${CURRENT_PACKAGES_DIR}/manual-tools"
)
endif() endif()
if(NOT sha) file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc")
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) if(NOT VCPKG_BUILD_TYPE)
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/mkl/vcpkg-cmake-wrapper.cmake" @ONLY) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "bin\${MKL_DLL_GLOB" "bin/\${MKL_DLL_GLOB") file(GLOB pc_files RELATIVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" [["../bincompiler" "../compiler/lib"]] [["bin" "../bincompiler" "../compiler/lib"]]) foreach(file IN LISTS pc_files)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${file}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}" "/include" "/../include")
if(NOT VCPKG_TARGET_IS_WINDOWS)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}" "/lib/intel64" "/../lib/intel64")
endif()
endforeach()
endif() endif()
file(COPY "${mkl_dir}/lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin")
#TODO: Hardcode settings from portfile in config.cmake
#TODO: Give lapack/blas information about the correct BLA_VENDOR depending on settings.
file(INSTALL "${mkl_dir}/licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.product,v=2023.0.0-*")
vcpkg_install_copyright(FILE_LIST "${package_path}/licenses/license.htm")
file(REMOVE_RECURSE
"${extract_0_dir}"
"${extract_1_dir}"
"${CURRENT_PACKAGES_DIR}/lib/intel64/cmake"
"${CURRENT_PACKAGES_DIR}/lib/intel64/pkgconfig"
)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

6
ports/intel-mkl/vcpkg-cmake-wrapper.cmake
View File

@ -1,6 +0,0 @@
set(MKL_THREADING "@threading@")
if("@VCPKG_TARGET_ARCHITECTURE@" STREQUAL "x64")
set(MKL_INTERFACE "@interface@")
endif()
_find_package(${ARGS})

1
ports/intel-mkl/vcpkg-port-config.cmake
View File

@ -1 +0,0 @@
set(ENV{MKLROOT} "${CURRENT_INSTALLED_DIR}")

3
ports/intel-mkl/vcpkg.json
View File

@ -1,10 +1,11 @@
{ {
"name": "intel-mkl", "name": "intel-mkl",
"version": "2023.0.0", "version": "2023.0.0",
"port-version": 1,
"description": "Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors.", "description": "Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors.",
"homepage": "https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html", "homepage": "https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html",
"license": null, "license": null,
"supports": "(windows | linux) & x64", "supports": "(windows | linux | osx) & x64",
"dependencies": [ "dependencies": [
{ {
"name": "vcpkg-tool-lessmsi", "name": "vcpkg-tool-lessmsi",

2
versions/baseline.json
View File

@ -3350,7 +3350,7 @@
}, },
"intel-mkl": { "intel-mkl": {
"baseline": "2023.0.0", "baseline": "2023.0.0",
"port-version": 0 "port-version": 1
}, },
"intelrdfpmathlib": { "intelrdfpmathlib": {
"baseline": "20U2", "baseline": "20U2",

5
versions/i-/intel-mkl.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "285fa0de9d6f05022ce06e53f7c8c21048ff586f",
"version": "2023.0.0",
"port-version": 1
},
{ {
"git-tree": "e5a15d03509e3eaf676a2e3ec935acff7fbb9285", "git-tree": "e5a15d03509e3eaf676a2e3ec935acff7fbb9285",
"version": "2023.0.0", "version": "2023.0.0",