Disable obsolete GHA pipelines for 3.4 (#26792 )

Merge pull request #25377 from eplankin:3.4
* Update IPP integration * Updated packages and hashes
2026-07-22 20:03:03 +04:00 · 2025-01-18 16:12:41 +03:00 · 2024-04-15 10:03:44 +00:00 · 2024-02-27 08:05:04 +03:00 · 2024-02-26 17:08:47 +01:00 · 2024-02-12 18:06:23 +00:00
6 changed files with 16 additions and 17 deletions
@@ -9,9 +9,6 @@ jobs:
  Ubuntu2004-ARM64:
    uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-3.4-ARM64.yaml@main

-  Ubuntu1404-x64:
-    uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-3.4-U14.yaml@main
-
  Ubuntu2004-x64:
    uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-3.4-U20.yaml@main

@@ -2,32 +2,33 @@ function(download_ippicv root_var)
  set(${root_var} "" PARENT_SCOPE)

  # Commit SHA in the opencv_3rdparty repo
-  set(IPPICV_COMMIT "1224f78da6684df04397ac0f40c961ed37f79ccb")
+  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.8_mac_intel64_20230330_general.tgz")
-    set(OPENCV_ICV_HASH "d2b234a86af1b616958619a4560356d9")
+    set(OPENCV_ICV_NAME "ippicv_2021.9.1_mac_intel64_20230919_general.tgz")
+    set(OPENCV_ICV_HASH "14f01c5a4780bfae9dde9b0aaf5e56fc")
  elseif((UNIX AND NOT ANDROID) OR (UNIX AND ANDROID_ABI MATCHES "x86"))
    set(OPENCV_ICV_PLATFORM "linux")
    set(OPENCV_ICV_PACKAGE_SUBDIR "ippicv_lnx")
    if(X86_64)
-      set(OPENCV_ICV_NAME "ippicv_2021.8_lnx_intel64_20230330_general.tgz")
-      set(OPENCV_ICV_HASH "43219bdc7e3805adcbe3a1e2f1f3ef3b")
+      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.8_lnx_ia32_20230330_general.tgz")
-      set(OPENCV_ICV_HASH "165875443d72faa3fd2146869da90d07")
+      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.8_win_intel64_20230330_general.zip")
-      set(OPENCV_ICV_HASH "71e4f58de939f0348ec7fb58ffb17dbf")
+      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.8_win_ia32_20230330_general.zip")
-      set(OPENCV_ICV_HASH "57fd4648cfe64eae9e2ad9d50173a553")
+      set(OPENCV_ICV_NAME "ippicv_2021.11.0_win_ia32_20240201_general.zip")
+      set(OPENCV_ICV_HASH "7a6d8ac5825c02fea6cbfc1201b521b5")
    endif()
  else()
    return()
@@ -2360,7 +2360,7 @@ W
 x \\
 y \\
 \texttt{disparity} (x,y) \\
-z
+1
 \end{bmatrix}.\f]

@sa
@@ -8,7 +8,7 @@
 #define CV_VERSION_MAJOR    3
 #define CV_VERSION_MINOR    4
 #define CV_VERSION_REVISION 20
-#define CV_VERSION_STATUS   ""
+#define CV_VERSION_STATUS   "-dev"

 #define CVAUX_STR_EXP(__A)  #__A
 #define CVAUX_STR(__A)      CVAUX_STR_EXP(__A)
@@ -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) ) );
@@ -11,6 +11,7 @@

 #ifdef HAVE_HALIDE
 #include <HalideRuntimeOpenCL.h>
+#include <thread>
 #endif  // HAVE_HALIDE

 namespace cv
Author	SHA1	Message	Date
Maksim Shabunin	af32659937	Disable obsolete GHA pipelines for 3.4 (#26792 )	2025-01-18 16:12:41 +03:00
eplankin	02a74f2e88	Merge pull request #25377 from eplankin:3.4 * Update IPP integration * Updated packages and hashes	2024-04-15 10:03:44 +00:00
Alexander Smorkalov	843c09bcb0	Merge pull request #25107 from catree:fix_mistake_reprojectImageTo3D_doc Fix mistake into the reprojectImageTo3D doc. Backport from #25083 PR.	2024-02-27 08:05:04 +03:00
catree	1c664ff673	Fix mistake into the reprojectImageTo3D doc. Backport from #25083 PR.	2024-02-26 17:08:47 +01:00
Alexander Alekhin	d5ef86c9a4	Merge pull request #24984 from eplankin:3.4	2024-02-12 18:06:23 +00:00
eplankin	3c73557dac	Update IPPICV binaries (20231206)	2024-02-09 04:05:17 -08:00
Alexander Smorkalov	565bc3aeed	Merge pull request #24574 from ajithvallabai:3.4 cudaMemset2D fix: Correct buffer height parameter	2023-11-23 15:53:11 +03:00
ajithvallabai	258b062295	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.	2023-11-22 15:57:19 +05:30
Alexander Alekhin	52c33f4af3	Merge pull request #24451 from eplankin:3.4	2023-10-27 10:57:03 +00:00
eplankin	cac1695099	Update IPPICV binaries (20230919)	2023-10-25 10:01:19 -07:00
autoantwort	4761c28143	Merge pull request #24168 from autoantwort:missing-include-3 * add missing include * Apply CR	2023-08-17 09:34:50 +00:00
Alexander Smorkalov	7f6c95f2d7	Switch to version 3.4.20-dev	2023-06-28 18:40:55 +03:00
Alexander Smorkalov	49ee4d4ade	Merge pull request #23879 from asmorkalov/release_3.4.20 Release OpenCV 3.4.20	2023-06-27 15:59:24 +03:00