Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[intel-mkl] Fixed usage error under x64-windows-static-md triplet #43780

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

[intel-mkl] Fixed usage error under x64-windows-static-md triplet #43780

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9fb03de
add MKL_LINK=static
jimwang118 Feb 12, 2025
791344f
update version
jimwang118 Feb 12, 2025
7349dae
modify check
jimwang118 Feb 13, 2025
01d7f64
udpate version
jimwang118 Feb 13, 2025
ab446c3
udpate version
jimwang118 Feb 13, 2025
1d109da
udpate version
jimwang118 Feb 13, 2025
db40d9f
modified
jimwang118 Feb 13, 2025
306ea15
update version
jimwang118 Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ports/intel-mkl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,11 @@ 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")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "define_param(MKL_LINK DEFAULT_MKL_LINK MKL_LINK_LIST)"
[[define_param(MKL_LINK DEFAULT_MKL_LINK MKL_LINK_LIST)
if(NOT BUILD_SHARED_LIBS)
jimwang118 marked this conversation as resolved.
Show resolved Hide resolved
set(MKL_LINK "static")
endif()]])
#TODO: Hardcode settings from portfile in config.cmake
#TODO: Give lapack/blas information about the correct BLA_VENDOR depending on settings.

Expand Down
2 changes: 1 addition & 1 deletion ports/intel-mkl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "intel-mkl",
"version": "2023.0.0",
"port-version": 4,
"port-version": 5,
"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",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3754,7 +3754,7 @@
},
"intel-mkl": {
"baseline": "2023.0.0",
"port-version": 4
"port-version": 5
},
"intelrdfpmathlib": {
"baseline": "20U2",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/intel-mkl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "adf55bc00720c423a9083b3d92ad738b6cc202ce",
"version": "2023.0.0",
"port-version": 5
},
{
"git-tree": "ca06d4f88eaf67a10c1b988c5a2e3d8a74741d66",
"version": "2023.0.0",
Expand Down