From 0e74ac0496071dcd1b598ddfa1826d26414f3217a1795bee119d8c5eeeda1e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Mon, 4 Jan 2021 19:56:22 +0000 Subject: [PATCH] Accepting request 860308 from home:StefanBruens:branches:science MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - update to 4.5.1, highlights below, for details check https://github.com/opencv/opencv/wiki/ChangeLog#version451 * Continued merging of GSoC 2020 results: + Develop OpenCV.js DNN modules for promising web use cases together with their tutorials + OpenCV.js: WASM SIMD optimization 2.0 + High Level API and Samples for Scene Text Detection and Recognition + SIFT: SIMD optimization of GaussianBlur 16U * DNN module: + Improved layers / activations / supported more models: - optimized: 1D convolution, 1D pool - fixed: Resize, ReduceMean, Gather with multiple outputs, importing of Faster RCNN ONNX model - added support: INT32 ONNX tensors + Intel® Inference Engine backend (OpenVINO): - added support for OpenVINO 2021.2 release - added preview support for HDDL + Fixes and optimizations in DNN CUDA backend (thanks to @YashasSamaga) * G-API Framework: + Introduced serialization for cv::RMat, including serialization for user-defined memory adapters + Introduced desync, a new Operation for in-graph asynchronous execution - to allow different parts of the graph run with a different latency + Introduced a notion of "in-graph metadata", now various media-related information can be accessed in graph directly (currently only limited to timestamps and frame IDs) + Introduced a new generic task-based executor, based on Threading Building Blocks (TBB) + Extended infer<>() API to accept a new cv::GFrame data structure to allow handling of various media formats without changes in the graph structure + Made copy() an intrinsic where real copy may not happen (optimized out) based on graph structure, extended it to support cv::GFrame + Various fixes, including addressig static analysis, documentation, and test issues * G-API Operations: + Introduced new operations morphologyEx, boundingRect, fitLine, kmeans, Background Subtractor, Kalman filter * G-API Intel® Inference Engine backend (OpenVINO): + Extended cv::gapi::ie::Params<> to import CNN networks (e.g. pre-compiled ones) instead of passing .XML and .BIN files; also enabled configuring Inference Engine plugins via this structure + Added a new overload to infer<>() to run inference over a single region of interest + Added support for cv::MediaFrame input data type (projected from cv::GFrame) and handling for NV12 input image format * G-API Python bindings: + Exposed G-API's Inference and Streaming APIs in the OpenCV Python bindings + Added initial Python support for cv::GArray data structure * Significant progress on RISC-V port. - Updated constraints, bump memory to 5 GB - Cleaned up spec file OBS-URL: https://build.opensuse.org/request/show/860308 OBS-URL: https://build.opensuse.org/package/show/science/opencv?expand=0&rev=23 --- _constraints | 4 +-- opencv-4.5.0.tar.gz | 3 -- opencv-4.5.1.tar.gz | 3 ++ opencv.changes | 62 +++++++++++++++++++++++++++++++++++++ opencv.spec | 31 ++++++++++++------- opencv_contrib-4.5.0.tar.gz | 3 -- opencv_contrib-4.5.1.tar.gz | 3 ++ 7 files changed, 90 insertions(+), 19 deletions(-) delete mode 100644 opencv-4.5.0.tar.gz create mode 100644 opencv-4.5.1.tar.gz delete mode 100644 opencv_contrib-4.5.0.tar.gz create mode 100644 opencv_contrib-4.5.1.tar.gz diff --git a/_constraints b/_constraints index 822bc2e..c77b874 100644 --- a/_constraints +++ b/_constraints @@ -5,10 +5,10 @@ 13 - 3000 + 5000 - 1000 + 1400 diff --git a/opencv-4.5.0.tar.gz b/opencv-4.5.0.tar.gz deleted file mode 100644 index ac25520..0000000 --- a/opencv-4.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dde4bf8d6639a5d3fe34d5515eab4a15669ded609a1d622350c7ff20dace1907 -size 90116240 diff --git a/opencv-4.5.1.tar.gz b/opencv-4.5.1.tar.gz new file mode 100644 index 0000000..c271994 --- /dev/null +++ b/opencv-4.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e27fe5b168918ab60d58d7ace2bd82dd14a4d0bd1d3ae182952c2113f5637513 +size 88245766 diff --git a/opencv.changes b/opencv.changes index 9ab1c05..9777861 100644 --- a/opencv.changes +++ b/opencv.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Sat Jan 2 16:30:59 UTC 2021 - Stefan Brüns + +- update to 4.5.1, highlights below, for details check + https://github.com/opencv/opencv/wiki/ChangeLog#version451 + * Continued merging of GSoC 2020 results: + + Develop OpenCV.js DNN modules for promising web use cases + together with their tutorials + + OpenCV.js: WASM SIMD optimization 2.0 + + High Level API and Samples for Scene Text Detection and + Recognition + + SIFT: SIMD optimization of GaussianBlur 16U + * DNN module: + + Improved layers / activations / supported more models: + - optimized: 1D convolution, 1D pool + - fixed: Resize, ReduceMean, Gather with multiple outputs, + importing of Faster RCNN ONNX model + - added support: INT32 ONNX tensors + + Intel® Inference Engine backend (OpenVINO): + - added support for OpenVINO 2021.2 release + - added preview support for HDDL + + Fixes and optimizations in DNN CUDA backend (thanks to + @YashasSamaga) + * G-API Framework: + + Introduced serialization for cv::RMat, including + serialization for user-defined memory adapters + + Introduced desync, a new Operation for in-graph asynchronous + execution - to allow different parts of the graph run with + a different latency + + Introduced a notion of "in-graph metadata", now various + media-related information can be accessed in graph directly + (currently only limited to timestamps and frame IDs) + + Introduced a new generic task-based executor, based on + Threading Building Blocks (TBB) + + Extended infer<>() API to accept a new cv::GFrame data + structure to allow handling of various media formats without + changes in the graph structure + + Made copy() an intrinsic where real copy may not happen + (optimized out) based on graph structure, extended it to + support cv::GFrame + + Various fixes, including addressig static analysis, + documentation, and test issues + * G-API Operations: + + Introduced new operations morphologyEx, boundingRect, + fitLine, kmeans, Background Subtractor, Kalman filter + * G-API Intel® Inference Engine backend (OpenVINO): + + Extended cv::gapi::ie::Params<> to import CNN networks (e.g. + pre-compiled ones) instead of passing .XML and .BIN files; + also enabled configuring Inference Engine plugins via + this structure + + Added a new overload to infer<>() to run inference over a + single region of interest + + Added support for cv::MediaFrame input data type (projected + from cv::GFrame) and handling for NV12 input image format + * G-API Python bindings: + + Exposed G-API's Inference and Streaming APIs in the OpenCV + Python bindings + + Added initial Python support for cv::GArray data structure + * Significant progress on RISC-V port. +- Updated constraints, bump memory to 5 GB +- Cleaned up spec file + ------------------------------------------------------------------- Mon Nov 2 20:16:43 UTC 2020 - Stefan Brüns diff --git a/opencv.spec b/opencv.spec index fef618d..98f02df 100644 --- a/opencv.spec +++ b/opencv.spec @@ -1,7 +1,7 @@ # # spec file for package opencv # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + # Build failure with LTO enabled on ppc64le boo#1146096 %ifarch ppc64le %define _lto_cflags %{nil} @@ -23,7 +24,7 @@ %define libname lib%{name} %define soname 4_5 # disabled by default as many fail -%bcond_with tests +%bcond_with tests %bcond_without gapi %bcond_without ffmpeg %if %{suse_version} < 1550 @@ -34,7 +35,7 @@ %bcond_without python3 %bcond_without openblas Name: opencv -Version: 4.5.0 +Version: 4.5.1 Release: 0 Summary: Collection of algorithms for computer vision # GPL-2.0 AND Apache-2.0 files are in 3rdparty/ittnotify which is not build @@ -268,11 +269,15 @@ cp opencv_contrib-%{version}/LICENSE LICENSE.contrib rm -f doc/packaging.txt %build +# openCV does not understand the standard RelWithDebinfo, +# but has a separate variable for it # Dynamic dispatch: https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options # x86: disable SSE on 32bit, do not dispatch AVX and later - SSE3 # is the highest extension available on any non-64bit x86 CPU # ARM: ARMv6, e.g. RPi1, only has VFPv2 %cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_WITH_DEBUG_INFO=ON \ %if %{with tests} -DBUILD_TESTS=ON \ %endif @@ -314,23 +319,16 @@ rm -f doc/packaging.txt -DCPU_BASELINE=NEON \ -DCPU_DISPATCH=FP16 \ %endif -%if 0%{?suse_version} >= 1500 -DPYTHON_DEFAULT_EXECUTABLE=%{_bindir}/python3 \ -%endif -DOPENCV_SKIP_PYTHON_LOADER=ON \ -DOPENCV_PYTHON2_INSTALL_PATH=%{python2_sitearch} \ -DOPENCV_PYTHON3_INSTALL_PATH=%{python3_sitearch} \ -DOPENCV_DOWNLOAD_TRIES_LIST:STRING="" \ -DWITH_JASPER=OFF \ + %{nil} %cmake_build -%check -%if %{with tests} -export LD_LIBRARY_PATH=$(pwd)/build/lib:$LD_LIBRARY_PATH -%ctest -%endif - %install %cmake_install mkdir -p %{buildroot}%{_docdir}/%{name}-doc @@ -348,6 +346,17 @@ sed -i -e 's|//usr||g' %{buildroot}%{_libdir}/pkgconfig/opencv4.pc %fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples %fdupes -s %{buildroot}%{_includedir} +%check +%if %{with tests} +export LD_LIBRARY_PATH=$(pwd)/build/lib:$LD_LIBRARY_PATH +%ctest + +# Diagnostics: +%{buildroot}%{_bindir}/opencv_version -v +%{buildroot}%{_bindir}/opencv_version -hw +grep -E 'model|stepping|flags' /proc/cpuinfo | head -n4 +%endif + %post -n %{libname}%{soname} -p /sbin/ldconfig %postun -n %{libname}%{soname} -p /sbin/ldconfig %post -n libopencv_face%{soname} -p /sbin/ldconfig diff --git a/opencv_contrib-4.5.0.tar.gz b/opencv_contrib-4.5.0.tar.gz deleted file mode 100644 index d726d23..0000000 --- a/opencv_contrib-4.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a65f1f0b98b2c720abbf122c502044d11f427a43212d85d8d2402d7a6339edda -size 60115063 diff --git a/opencv_contrib-4.5.1.tar.gz b/opencv_contrib-4.5.1.tar.gz new file mode 100644 index 0000000..68803e2 --- /dev/null +++ b/opencv_contrib-4.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12c3b1ddd0b8c1a7da5b743590a288df0934e5cef243e036ca290c2e45e425f5 +size 60602431