From 9fb03de23dfc520c124110cf8962d6944e5143d7 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 12 Feb 2025 09:01:10 +0000 Subject: [PATCH 1/8] add MKL_LINK=static --- ports/intel-mkl/portfile.cmake | 5 +++++ ports/intel-mkl/vcpkg.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake index b32e5cf81db31a..9e671f7db0f91e 100644 --- a/ports/intel-mkl/portfile.cmake +++ b/ports/intel-mkl/portfile.cmake @@ -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) + 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. diff --git a/ports/intel-mkl/vcpkg.json b/ports/intel-mkl/vcpkg.json index 391acf9481629a..fc0a76ecb30b50 100644 --- a/ports/intel-mkl/vcpkg.json +++ b/ports/intel-mkl/vcpkg.json @@ -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, From 791344f0638d73f8b696f0b9b17a90cca80e2038 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 12 Feb 2025 09:01:34 +0000 Subject: [PATCH 2/8] update version --- versions/baseline.json | 2 +- versions/i-/intel-mkl.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 165bf8168be340..afe6179342ac70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3754,7 +3754,7 @@ }, "intel-mkl": { "baseline": "2023.0.0", - "port-version": 4 + "port-version": 5 }, "intelrdfpmathlib": { "baseline": "20U2", diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json index ee320e2539ef1f..3f33cb95d6ff8f 100644 --- a/versions/i-/intel-mkl.json +++ b/versions/i-/intel-mkl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "adf55bc00720c423a9083b3d92ad738b6cc202ce", + "version": "2023.0.0", + "port-version": 5 + }, { "git-tree": "ca06d4f88eaf67a10c1b988c5a2e3d8a74741d66", "version": "2023.0.0", From 7349dae6e081e83b33bc5ae2a1d8e44505bc711d Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 13 Feb 2025 06:43:26 +0000 Subject: [PATCH 3/8] modify check --- ports/intel-mkl/portfile.cmake | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake index 9e671f7db0f91e..1381df8c9283a6 100644 --- a/ports/intel-mkl/portfile.cmake +++ b/ports/intel-mkl/portfile.cmake @@ -237,11 +237,12 @@ 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") +if(NOT BUILD_SHARED_LIBS) 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) set(MKL_LINK "static") -endif()]]) +]]) +endif() #TODO: Hardcode settings from portfile in config.cmake #TODO: Give lapack/blas information about the correct BLA_VENDOR depending on settings. @@ -249,11 +250,11 @@ file(INSTALL "${mkl_dir}/licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/$ 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(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}") From 01d7f64bb2d6c18758eff0deff701c8272a37840 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 13 Feb 2025 06:43:59 +0000 Subject: [PATCH 4/8] udpate version --- versions/i-/intel-mkl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json index 3f33cb95d6ff8f..d61a74a50fa194 100644 --- a/versions/i-/intel-mkl.json +++ b/versions/i-/intel-mkl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "adf55bc00720c423a9083b3d92ad738b6cc202ce", + "git-tree": "e98b719b40bc8b36dc685ddf8f9f7a6abfff14dc", "version": "2023.0.0", "port-version": 5 }, From ab446c3b4378e95c8433258752f97cda76629cdb Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 13 Feb 2025 06:45:30 +0000 Subject: [PATCH 5/8] udpate version --- ports/intel-mkl/portfile.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake index 1381df8c9283a6..5f2392a48da196 100644 --- a/ports/intel-mkl/portfile.cmake +++ b/ports/intel-mkl/portfile.cmake @@ -250,11 +250,11 @@ file(INSTALL "${mkl_dir}/licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/$ 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(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}") From 1d109daf8bb3e3c87eec16ac842e43c7f3c0b58f Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 13 Feb 2025 06:45:38 +0000 Subject: [PATCH 6/8] udpate version --- versions/i-/intel-mkl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json index d61a74a50fa194..2d1d4e0e3b401b 100644 --- a/versions/i-/intel-mkl.json +++ b/versions/i-/intel-mkl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e98b719b40bc8b36dc685ddf8f9f7a6abfff14dc", + "git-tree": "04e191f07bb05f05dd21b71bdd6c7cd104e049ce", "version": "2023.0.0", "port-version": 5 }, From db40d9f2a28adffd0461022355c8ec959c388e0a Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 13 Feb 2025 08:02:41 +0000 Subject: [PATCH 7/8] modified --- ports/intel-mkl/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake index 5f2392a48da196..908a52815be66c 100644 --- a/ports/intel-mkl/portfile.cmake +++ b/ports/intel-mkl/portfile.cmake @@ -237,7 +237,7 @@ 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") -if(NOT BUILD_SHARED_LIBS) +if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "static") 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) set(MKL_LINK "static") From 306ea157a8cdee759a65b3eea5a616d470703bfc Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 13 Feb 2025 08:03:10 +0000 Subject: [PATCH 8/8] update version --- versions/i-/intel-mkl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json index 2d1d4e0e3b401b..8465767753e325 100644 --- a/versions/i-/intel-mkl.json +++ b/versions/i-/intel-mkl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "04e191f07bb05f05dd21b71bdd6c7cd104e049ce", + "git-tree": "4be49a487c0c55a67bb79fa1d90be6b515b99f67", "version": "2023.0.0", "port-version": 5 },