lukasplevac/easyconfigs-it4i
1
0
Fork 0
mirror of https://code.it4i.cz/sccs/easyconfigs-it4i.git synced 2025-04-07 15:32:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
easyconfigs-it4i/o/OpenCV/OpenCV-4.2.0_disable-AVX512-CascadeLake.patch
Josef 7b3449095d new file: a/ATK/ATK-2.34.1-GCCcore-8.3.0.eb 
new file:   a/at-spi2-atk/at-spi2-atk-2.34.1-GCCcore-8.3.0.eb
	new file:   a/at-spi2-core/at-spi2-core-2.34.0-GCCcore-8.3.0.eb
	modified:   b/Boost/Boost-1.72.0-intel-2020a.eb
	modified:   b/binutils/binutils-2.32-GCCcore-8.3.0.eb
	new file:   b/bzip2/bzip2-1.0.8-GCCcore-8.3.0.eb
	new file:   c/CMake/CMake-3.16.2-GCCcore-8.3.0.eb
	new file:   c/cairo/cairo-1.17.2-GCCcore-8.3.0.eb
	new file:   d/DBus/DBus-1.13.8-GCCcore-8.3.0.eb
	new file:   f/FFmpeg/FFmpeg-4.2.2-GCCcore-8.3.0.eb
	new file:   f/FriBidi/FriBidi-1.0.9-GCCcore-8.3.0.eb
	new file:   f/fontconfig/fontconfig-2.12.6-GCCcore-8.3.0.eb
	new file:   g/GLib/GLib-2.64.0-GCCcore-8.3.0.eb
	new file:   g/GObject-Introspection/GObject-Introspection-1.63.1-GCCcore-8.3.0-Py-3.7.eb
	modified:   g/GTK+/GTK+-3.24.13-GCCcore-8.3.0.eb
	new file:   g/Gdk-Pixbuf/Gdk-Pixbuf-2.38.2-GCCcore-8.3.0.eb
	new file:   g/gettext/gettext-0.19.8.1-GCCcore-8.3.0.eb
	modified:   h/HDF5/HDF5-1.10.6-intel-2020a.eb
	new file:   h/HarfBuzz/HarfBuzz-2.6.4-GCCcore-8.3.0.eb
	new file:   i/ICU/ICU-64.2-GCCcore-8.3.0.eb
	new file:   j/JasPer/JasPer-2.0.14-GCCcore-8.3.0.eb
	new file:   l/LibTIFF/LibTIFF-4.1.0-GCCcore-8.3.0.eb
	new file:   l/libffi/libffi-3.3-GCCcore-8.3.0.eb
	new file:   l/libjpeg-turbo/libjpeg-turbo-2.0.4-GCCcore-8.3.0.eb
	modified:   m/Mesa/Mesa-19.2.1-GCCcore-8.3.0.eb
	new file:   n/ncurses/ncurses-6.1-GCCcore-8.3.0.eb
	modified:   n/netCDF/netCDF-4.7.3-intel-2020a.eb
	modified:   n/numpy/numpy-1.18.1-Py-3.7.eb
	modified:   o/OpenCV/OpenCV-3.4.7-intel-2020a-Py-3.7.eb
	new file:   o/OpenCV/OpenCV-4.2.0-intel-2020a-Py-3.7.eb
	new file:   o/OpenCV/OpenCV-4.2.0_disable-AVX512-CascadeLake.patch
	new file:   p/Pango/Pango-1.44.7-GCCcore-8.3.0.eb
	modified:   p/Py/Py-3.6.eb
	modified:   p/Py/Py-3.7.eb
	modified:   p/Py/Py-3.8.eb
	new file:   p/Python/Python-3.6.10-GCCcore-8.3.0-base.eb
	new file:   p/Python/Python-3.7.7-GCCcore-8.3.0-base.eb
	modified:   p/Python/Python-3.8.2-GCC-8.3.0-2.32-base.eb
	new file:   p/Python/Python-3.8.2-GCCcore-8.3.0-base.eb
	new file:   s/SQLite/SQLite-3.30.1-GCCcore-8.3.0.eb
	new file:   t/Tcl/Tcl-8.6.10-GCCcore-8.3.0.eb
	modified:   v/VTK/VTK-8.2.0-foss-2019b-Python-3.7.4.eb
	modified:   v/VTK/VTK-8.2.0-intel-2020a-Py-3.7.eb
	modified:   x/X11/X11-20190717-GCCcore-8.3.0.eb
	modified:   x/XZ/XZ-5.2.4-GCCcore-8.3.0.eb
	new file:   x/x264/x264-20190925-GCCcore-8.3.0.eb
	new file:   x/x265/x265-3.2-GCCcore-8.3.0.eb
	deleted:    o/OpenCV/OpenCV-4.2.0-Py-3.7.eb
2020-03-31 13:10:58 +02:00

72 lines
4.6 KiB
Diff
Raw Permalink Blame History

--- opencv-4.2.0/cmake/OpenCVCompilerOptimizations.cmake.orig 2020-03-31 12:57:34.691679964 +0200
+++ opencv-4.2.0/cmake/OpenCVCompilerOptimizations.cmake 2020-03-31 13:01:52.155926840 +0200
@@ -45,7 +45,7 @@
# CPU_{opt}_ENABLED_DEFAULT=ON/OFF - has compiler support without additional flag (CPU_BASELINE_DETECT=ON only)
set(CPU_ALL_OPTIMIZATIONS "SSE;SSE2;SSE3;SSSE3;SSE4_1;SSE4_2;POPCNT;AVX;FP16;AVX2;FMA3;AVX_512F")
-list(APPEND CPU_ALL_OPTIMIZATIONS "AVX512_COMMON;AVX512_KNL;AVX512_KNM;AVX512_SKX;AVX512_CNL;AVX512_CLX;AVX512_ICL")
+list(APPEND CPU_ALL_OPTIMIZATIONS "AVX512_COMMON;AVX512_SKX;AVX512_CLX")
list(APPEND CPU_ALL_OPTIMIZATIONS NEON VFPV3 FP16)
list(APPEND CPU_ALL_OPTIMIZATIONS MSA)
list(APPEND CPU_ALL_OPTIMIZATIONS VSX VSX3)
@@ -165,15 +165,11 @@
endif()
if(X86 OR X86_64)
- ocv_update(CPU_KNOWN_OPTIMIZATIONS "SSE;SSE2;SSE3;SSSE3;SSE4_1;POPCNT;SSE4_2;FP16;FMA3;AVX;AVX2;AVX_512F;AVX512_COMMON;AVX512_KNL;AVX512_KNM;AVX512_SKX;AVX512_CNL;AVX512_CLX;AVX512_ICL")
+ ocv_update(CPU_KNOWN_OPTIMIZATIONS "SSE;SSE2;SSE3;SSSE3;SSE4_1;POPCNT;SSE4_2;FP16;FMA3;AVX;AVX2;AVX_512F;AVX512_COMMON;AVX512_SKX;AVX512_CLX")
ocv_update(CPU_AVX512_COMMON_GROUP "AVX_512F;AVX_512CD")
- ocv_update(CPU_AVX512_KNL_GROUP "AVX512_COMMON;AVX512_KNL_EXTRA")
- ocv_update(CPU_AVX512_KNM_GROUP "AVX512_KNL;AVX512_KNM_EXTRA;AVX_512VPOPCNTDQ")
ocv_update(CPU_AVX512_SKX_GROUP "AVX512_COMMON;AVX_512VL;AVX_512BW;AVX_512DQ")
- ocv_update(CPU_AVX512_CNL_GROUP "AVX512_SKX;AVX_512IFMA;AVX_512VBMI")
ocv_update(CPU_AVX512_CLX_GROUP "AVX512_SKX;AVX_512VNNI")
- ocv_update(CPU_AVX512_ICL_GROUP "AVX512_SKX;AVX_512IFMA;AVX_512VBMI;AVX_512VNNI;AVX_512VBMI2;AVX_512BITALG;AVX_512VPOPCNTDQ") # ? VPCLMULQDQ, GFNI, VAES
ocv_update(CPU_SSE_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_sse.cpp")
ocv_update(CPU_SSE2_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_sse2.cpp")
@@ -187,20 +183,12 @@
ocv_update(CPU_FP16_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_fp16.cpp")
ocv_update(CPU_AVX_512F_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_avx512.cpp")
ocv_update(CPU_AVX512_COMMON_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_avx512common.cpp")
- ocv_update(CPU_AVX512_KNL_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_avx512knl.cpp")
- ocv_update(CPU_AVX512_KNM_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_avx512knm.cpp")
ocv_update(CPU_AVX512_SKX_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_avx512skx.cpp")
- ocv_update(CPU_AVX512_CNL_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_avx512cnl.cpp")
ocv_update(CPU_AVX512_CLX_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_avx512clx.cpp")
- ocv_update(CPU_AVX512_ICL_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_avx512icl.cpp")
if(NOT OPENCV_CPU_OPT_IMPLIES_IGNORE)
- ocv_update(CPU_AVX512_ICL_IMPLIES "AVX512_SKX")
ocv_update(CPU_AVX512_CLX_IMPLIES "AVX512_SKX")
- ocv_update(CPU_AVX512_CNL_IMPLIES "AVX512_SKX")
ocv_update(CPU_AVX512_SKX_IMPLIES "AVX512_COMMON")
- ocv_update(CPU_AVX512_KNM_IMPLIES "AVX512_KNL")
- ocv_update(CPU_AVX512_KNL_IMPLIES "AVX512_COMMON")
ocv_update(CPU_AVX512_COMMON_IMPLIES "AVX_512F")
ocv_update(CPU_AVX_512F_IMPLIES "AVX2")
ocv_update(CPU_AVX_512F_FORCE "") # Don't force other optimizations
@@ -249,12 +237,8 @@
endif()
ocv_intel_compiler_optimization_option(AVX_512F "-xCOMMON-AVX512" "/Qx:COMMON-AVX512")
ocv_intel_compiler_optimization_option(AVX512_COMMON "-xCOMMON-AVX512" "/Qx:COMMON-AVX512")
- ocv_intel_compiler_optimization_option(AVX512_KNL "-xKNL" "/Qx:KNL")
- ocv_intel_compiler_optimization_option(AVX512_KNM "-xKNM" "/Qx:KNM")
ocv_intel_compiler_optimization_option(AVX512_SKX "-xSKYLAKE-AVX512" "/Qx:SKYLAKE-AVX512")
- ocv_intel_compiler_optimization_option(AVX512_CNL "-xCANNONLAKE" "/Qx:CANNONLAKE")
ocv_intel_compiler_optimization_option(AVX512_CLX "-xCASCADELAKE" "/Qx:CASCADELAKE")
- ocv_intel_compiler_optimization_option(AVX512_ICL "-xICELAKE-CLIENT" "/Qx:ICELAKE-CLIENT")
elseif(CV_GCC OR CV_CLANG)
ocv_update(CPU_AVX2_FLAGS_ON "-mavx2")
ocv_update(CPU_FP16_FLAGS_ON "-mf16c")
@@ -270,8 +254,6 @@
if(NOT (CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0")) # GCC >= 5.0
ocv_update(CPU_AVX_512F_FLAGS_ON "-mavx512f")
ocv_update(CPU_AVX_512CD_FLAGS_ON "-mavx512cd")
- ocv_update(CPU_AVX512_KNL_EXTRA_FLAGS_ON "-mavx512er -mavx512pf")
- ocv_update(CPU_AVX512_KNM_EXTRA_FLAGS_ON "-mavx5124fmaps -mavx5124vnniw")
ocv_update(CPU_AVX_512BW_FLAGS_ON "-mavx512bw")
ocv_update(CPU_AVX_512DQ_FLAGS_ON "-mavx512dq")
ocv_update(CPU_AVX_512VL_FLAGS_ON "-mavx512vl")
Reference in New Issue View Git Blame Copy Permalink