From 258b06229504b2c411412067c74aa3c9edd0c9f1 Mon Sep 17 00:00:00 2001 From: ajithvallabai Date: Wed, 22 Nov 2023 15:52:51 +0530 Subject: [PATCH 1/2] cudaMemset2D fix: Correct buffer height parameter Changed the height parameter in the cudaMemset2D function call to use minSSD_buf.rows instead of disp.rows. This enures the correct buffer height is used for memory initialization. --- modules/cudastereo/src/cuda/stereobm.cu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cudastereo/src/cuda/stereobm.cu b/modules/cudastereo/src/cuda/stereobm.cu index 7c72f76e38..724dbfe633 100644 --- a/modules/cudastereo/src/cuda/stereobm.cu +++ b/modules/cudastereo/src/cuda/stereobm.cu @@ -391,7 +391,7 @@ namespace cv { namespace cuda { namespace device //cudaSafeCall( cudaFuncSetCacheConfig(&stereoKernel, cudaFuncCachePreferShared) ); cudaSafeCall( cudaMemset2D(disp.data, disp.step, 0, disp.cols, disp.rows) ); - cudaSafeCall( cudaMemset2D(minSSD_buf.data, minSSD_buf.step, 0xFF, minSSD_buf.cols * minSSD_buf.elemSize(), disp.rows) ); + cudaSafeCall( cudaMemset2D(minSSD_buf.data, minSSD_buf.step, 0xFF, minSSD_buf.cols * minSSD_buf.elemSize(), minSSD_buf.rows) ); cudaSafeCall( cudaMemcpyToSymbol( cwidth, &left.cols, sizeof(left.cols) ) ); cudaSafeCall( cudaMemcpyToSymbol( cheight, &left.rows, sizeof(left.rows) ) ); From 3c73557dac574a8e2f2bdd658e222f6538436f2f Mon Sep 17 00:00:00 2001 From: eplankin Date: Fri, 9 Feb 2024 04:00:06 -0800 Subject: [PATCH 2/2] Update IPPICV binaries (20231206) --- 3rdparty/ippicv/ippicv.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake index 380f65f8c6..1c711d8847 100644 --- a/3rdparty/ippicv/ippicv.cmake +++ b/3rdparty/ippicv/ippicv.cmake @@ -2,7 +2,7 @@ function(download_ippicv root_var) set(${root_var} "" PARENT_SCOPE) # Commit SHA in the opencv_3rdparty repo - set(IPPICV_COMMIT "0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a") + set(IPPICV_COMMIT "c7c6d527dde5fee7cb914ee9e4e20f7436aab3a1") # Define actual ICV versions if(APPLE) set(OPENCV_ICV_PLATFORM "macosx") @@ -13,21 +13,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.0_lnx_intel64_20230919_general.tgz") - set(OPENCV_ICV_HASH "606a19b207ebedfe42d59fd916cc4850") + set(OPENCV_ICV_NAME "ippicv_2021.10.1_lnx_intel64_20231206_general.tgz") + set(OPENCV_ICV_HASH "90884d3b9508f31f6a154165591b8b0b") else() - set(OPENCV_ICV_NAME "ippicv_2021.10.0_lnx_ia32_20230919_general.tgz") - set(OPENCV_ICV_HASH "ea08487b810baad2f68aca87b74a2db9") + set(OPENCV_ICV_NAME "ippicv_2021.10.1_lnx_ia32_20231206_general.tgz") + set(OPENCV_ICV_HASH "d9510f3ce08f6074aac472a5c19a3b53") 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.0_win_intel64_20230919_general.zip") - set(OPENCV_ICV_HASH "538a819ec84193a9c9f3c0f8df0be8b7") + set(OPENCV_ICV_NAME "ippicv_2021.10.1_win_intel64_20231206_general.zip") + set(OPENCV_ICV_HASH "2d5f137d4dd8a5205cc1edb5616fb3da") else() - set(OPENCV_ICV_NAME "ippicv_2021.10.0_win_ia32_20230919_general.zip") - set(OPENCV_ICV_HASH "8ff93c69415ab0835cc1e94dc5660f5d") + set(OPENCV_ICV_NAME "ippicv_2021.10.1_win_ia32_20231206_general.zip") + set(OPENCV_ICV_HASH "63c41a943e93ca87541b71ab67f207b5") endif() else() return()