From 02a74f2e8898a36d8a3025f8504d9b62aee5ead4 Mon Sep 17 00:00:00 2001 From: eplankin Date: Mon, 15 Apr 2024 12:03:44 +0200 Subject: [PATCH] Merge pull request #25377 from eplankin:3.4 * Update IPP integration * Updated packages and hashes --- 3rdparty/ippicv/ippicv.cmake | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake index 1c711d8847..744c45882e 100644 --- a/3rdparty/ippicv/ippicv.cmake +++ b/3rdparty/ippicv/ippicv.cmake @@ -2,9 +2,10 @@ function(download_ippicv root_var) set(${root_var} "" PARENT_SCOPE) # Commit SHA in the opencv_3rdparty repo - set(IPPICV_COMMIT "c7c6d527dde5fee7cb914ee9e4e20f7436aab3a1") + set(IPPICV_COMMIT "fd27188235d85e552de31425e7ea0f53ba73ba53") # Define actual ICV versions if(APPLE) + set(IPPICV_COMMIT "0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a") set(OPENCV_ICV_PLATFORM "macosx") set(OPENCV_ICV_PACKAGE_SUBDIR "ippicv_mac") set(OPENCV_ICV_NAME "ippicv_2021.9.1_mac_intel64_20230919_general.tgz") @@ -13,21 +14,21 @@ function(download_ippicv root_var) set(OPENCV_ICV_PLATFORM "linux") set(OPENCV_ICV_PACKAGE_SUBDIR "ippicv_lnx") if(X86_64) - set(OPENCV_ICV_NAME "ippicv_2021.10.1_lnx_intel64_20231206_general.tgz") - set(OPENCV_ICV_HASH "90884d3b9508f31f6a154165591b8b0b") + set(OPENCV_ICV_NAME "ippicv_2021.11.0_lnx_intel64_20240201_general.tgz") + set(OPENCV_ICV_HASH "0f2745ff705ecae31176dad437608f6f") else() - set(OPENCV_ICV_NAME "ippicv_2021.10.1_lnx_ia32_20231206_general.tgz") - set(OPENCV_ICV_HASH "d9510f3ce08f6074aac472a5c19a3b53") + set(OPENCV_ICV_NAME "ippicv_2021.11.0_lnx_ia32_20240201_general.tgz") + set(OPENCV_ICV_HASH "63e381bf08076ca34fd5264203043a45") endif() elseif(WIN32 AND NOT ARM) set(OPENCV_ICV_PLATFORM "windows") set(OPENCV_ICV_PACKAGE_SUBDIR "ippicv_win") if(X86_64) - set(OPENCV_ICV_NAME "ippicv_2021.10.1_win_intel64_20231206_general.zip") - set(OPENCV_ICV_HASH "2d5f137d4dd8a5205cc1edb5616fb3da") + set(OPENCV_ICV_NAME "ippicv_2021.11.0_win_intel64_20240201_general.zip") + set(OPENCV_ICV_HASH "59d154bf54a1e3eea20d7248f81a2a8e") else() - set(OPENCV_ICV_NAME "ippicv_2021.10.1_win_ia32_20231206_general.zip") - set(OPENCV_ICV_HASH "63c41a943e93ca87541b71ab67f207b5") + set(OPENCV_ICV_NAME "ippicv_2021.11.0_win_ia32_20240201_general.zip") + set(OPENCV_ICV_HASH "7a6d8ac5825c02fea6cbfc1201b521b5") endif() else() return()