Added openblas to build to unblock USAC.

opencv · Sep 20, 2023 · 1685f2d · 1685f2d
1 parent 705bb5d
commit 1685f2d
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 3 deletions.
diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml
@@ -61,14 +61,25 @@ jobs:
       uses: microsoft/setup-msbuild@v1.1
     - name: Build a package
       # CMake 3.25 regression fix. See https://stackoverflow.com/questions/74162633/problem-compiling-from-source-opencv-with-mvsc2019-in-64-bit-version
+      # OpenBLAS package bug on Windows: https://github.com/xianyi/OpenBLAS/issues/4227
       run: |
+        mkdir openblas
+        cd openblas
+        curl -o OpenBLAS-0.3.24.zip https://altushost-swe.dl.sourceforge.net/project/openblas/v0.3.24/OpenBLAS-0.3.24-${{ matrix.platform }}.zip
+        unzip OpenBLAS-0.3.24.zip
+        cp bin/libopenblas.dll libopenblas.exp.dll
+        set OpenBLAS_HOME=${{ github.workspace }}\openblas
+        set PATH=${{ github.workspace }}\openblas\bin;%PATH%
+        set
+        cd ..
         python --version
         python -m pip install --upgrade pip
         python -m pip install --upgrade setuptools
         python -m pip install cmake==3.24.2
         python -m pip install toml && python -c "import toml; c = toml.load('pyproject.toml'); print('\n'.join(c['build-system']['requires']))" >> requirements.txt | python -m pip install -r requirements.txt
         set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=%cd%\wheelhouse -v
       shell: cmd
+      working-directory: ${{ github.workspace }}
     - name: Saving all wheels
       uses: actions/upload-artifact@v3
       with:

diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt
@@ -2985,3 +2985,36 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+------------------------------------------------------------------------------
+OpenBLAS library is redistributed within all opencv-python packages.
+
+Copyright (c) 2011-2014, The OpenBLAS Project
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the
+      distribution.
+   3. Neither the name of the OpenBLAS project nor the names of
+      its contributors may be used to endorse or promote products
+      derived from this software without specific prior written
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/opencv b/opencv
diff --git a/opencv_contrib b/opencv_contrib
diff --git a/opencv_extra b/opencv_extra
diff --git a/setup.py b/setup.py
@@ -108,13 +108,20 @@ def main():
 
     # Files from CMake output to copy to package.
     # Path regexes with forward slashes relative to CMake install dir.
+    # OpenBLAS package bug on Windows: https://github.com/xianyi/OpenBLAS/issues/4227
     rearrange_cmake_output_data = {
         "cv2": (
             [r"bin/opencv_videoio_ffmpeg\d{3}%s\.dll" % ("_64" if is64 else "")]
             if os.name == "nt"
             else []
         )
         +
+        (
+            [os.path.join(os.environ["OpenBLAS_HOME"], "libopenblas.exp.dll")]
+            if os.name == "nt" and "OpenBLAS_HOME" in os.environ
+            else []
+        )
+        +
         # In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/.
         # Naming conventions vary so widely between versions and OSes
         # had to give up on checking them.
+3 −0		.github/workflows/PR-4.x.yaml
+6 −6		modules/bioinspired/src/transientareassegmentationmodule.cpp
+1 −1		modules/ccalib/src/omnidir.cpp
+38 −11		modules/cudacodec/include/opencv2/cudacodec.hpp
+35 −12		modules/cudacodec/misc/python/test/test_cudacodec.py
+38 −17		modules/cudacodec/src/video_decoder.cpp
+3 −1		modules/cudacodec/src/video_decoder.hpp
+20 −19		modules/cudacodec/src/video_parser.cpp
+50 −15		modules/cudacodec/src/video_reader.cpp
+2 −1		modules/cudacodec/src/video_source.cpp
+54 −0		modules/cudacodec/test/test_video.cpp
+6 −6		modules/cudaoptflow/misc/python/test/test_nvidiaopticalflow.py
+2 −2		modules/dnn_superres/CMakeLists.txt
+14 −0		modules/dnn_superres/misc/java/test/DnnSuperresTest.java
+5 −1		modules/face/samples/landmarks_demo.py
+17 −17		modules/ximgproc/src/find_ellipses.cpp
+1 −1		modules/ximgproc/src/lsc.cpp
+1 −1		modules/ximgproc/src/run_length_morphology.cpp
+1 −1		modules/ximgproc/src/sparse_match_interpolators.cpp
+56 −63		testdata/dnn/download_models.py
+2 −2		testdata/dnn/tensorflow/generate_tf2_models.py
+ −		testdata/dnn/tensorflow/tf2_prelu_in.npy
+ −		testdata/dnn/tensorflow/tf2_prelu_net.pb
+ −		testdata/dnn/tensorflow/tf2_prelu_out.npy
+30 −0		testdata/dnn/tflite/generate.py
+ −		testdata/dnn/tflite/replicate_by_pack.tflite
+ −		testdata/dnn/tflite/replicate_by_pack_inp.npy
+ −		testdata/dnn/tflite/replicate_by_pack_out_Identity.npy