https://bugs.kde.org/show_bug.cgi?id=431115
caulier.gil...@gmail.com changed:
What |Removed |Added
----------------------------------------------------------------------------
Summary|Enable CUDA support for |Enable GPU optimizations
|OpenCV |support for OpenCV.
Latest Commit| |https://invent.kde.org/grap
| |hics/digikam/commit/1e1a075
| |f2cbb5160cff28f453a4a3693a9
| |7388df
--- Comment #2 from caulier.gil...@gmail.com ---
Git commit 1e1a075f2cbb5160cff28f453a4a3693a97388df by Gilles Caulier.
Committed on 03/04/2023 at 12:45.
Pushed by cgilles into branch 'master'.
enable OpenCL compilation options in bundles.
OpenCL support still disabled by default
M +9 -11 project/bundles/3rdparty/ext_opencv/CMakeLists.txt
D +0 -12 project/bundles/3rdparty/ext_opencv/opencv-mmpause-linux.patch
https://invent.kde.org/graphics/digikam/commit/1e1a075f2cbb5160cff28f453a4a3693a97388df
diff --git a/project/bundles/3rdparty/ext_opencv/CMakeLists.txt
b/project/bundles/3rdparty/ext_opencv/CMakeLists.txt
index 1371da72d6c..e8172314ccc 100644
--- a/project/bundles/3rdparty/ext_opencv/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_opencv/CMakeLists.txt
@@ -78,17 +78,18 @@ set(Opencv_Conf -DBUILD_EXAMPLES=OFF
-DWITH_IMGCODEC_HDR=OFF
-DWITH_IMGCODEC_SUNRASTER=OFF
-DWITH_IMGCODEC_PXM=OFF
+ -DCV_TRACE=OFF
+ -DCV_ENABLE_INTRINSICS=OFF
+ -DCV_DISABLE_OPTIMIZATION=ON
-DWITH_CUDA=OFF
-DWITH_CUFFT=OFF
-DWITH_CUBLAS=OFF
-DWITH_NVCUVID=OFF
- -DWITH_OPENCL=OFF
- -DWITH_OPENCL_SVM=OFF
- -DWITH_OPENCLAMDFFT=OFF
- -DWITH_OPENCLAMDBLAS=OFF
- -DCV_ENABLE_INTRINSICS=OFF
- -DCV_DISABLE_OPTIMIZATION=ON
- -DCV_TRACE=OFF
+ -DWITH_OPENCL=ON
+ -DWITH_OPENCL_SVM=ON
+ -DWITH_OPENCLAMDFFT=ON
+ -DWITH_OPENCLAMDBLAS=ON
+ -DWITH_OPENCL_D3D11_NV=ON
)
JoinListAsString("${Opencv_Conf}" " " BASH_OPTIONS)
@@ -132,7 +133,7 @@ elseif(APPLE)
ALWAYS 0
)
-else() #Linux
+else() # Linux
ExternalProject_Add(ext_opencv
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
@@ -142,9 +143,6 @@ else() #Linux
INSTALL_DIR ${EXTPREFIX_opencv}
- # To fix broken compilation under Linux 32 bits
- PATCH_COMMAND ${PATCH_COMMAND} -p1 -i
${CMAKE_CURRENT_SOURCE_DIR}/opencv-mmpause-linux.patch
-
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_opencv}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
diff --git a/project/bundles/3rdparty/ext_opencv/opencv-mmpause-linux.patch
b/project/bundles/3rdparty/ext_opencv/opencv-mmpause-linux.patch
deleted file mode 100644
index 7bda6d1d1aa..00000000000
--- a/project/bundles/3rdparty/ext_opencv/opencv-mmpause-linux.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/modules/core/src/parallel_impl.cpp
b/modules/core/src/parallel_impl.cpp
-index bc64fce7a..e80ebc3d1 100644
---- a/modules/core/src/parallel_impl.cpp
-+++ b/modules/core/src/parallel_impl.cpp
-@@ -44,6 +44,7 @@ DECLARE_CV_YIELD
- # endif
- #endif // CV_YIELD
-
-+#include <xmmintrin.h>
- // Spin lock's CPU-level yield (required for Hyper-Threading)
- #ifdef DECLARE_CV_PAUSE
- DECLARE_CV_PAUSE
--
You are receiving this mail because:
You are watching all bug changes.
