Skip to content

Commit

Permalink
Linux dependencies update (#1052)
Browse files Browse the repository at this point in the history
* Base manylinux2014 image update.
* Use command line git to checkout repo instead of actions step.
* Qt and others update.
* Updated submodules to current 4.x branch.
  • Loading branch information
asmorkalov authored Dec 3, 2024
1 parent c0fe8eb commit 3f50d32
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 40 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/build_wheels_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
MB_ML_VER: 2014
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20240524
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20241202
USE_CCACHE: 0
UNICODE_WIDTH: 32
PLAT: x86_64
Expand All @@ -58,10 +58,10 @@ jobs:
echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
fi
- name: Checkout
uses: actions/checkout@v3
with:
submodules: false
fetch-depth: 0
run: |
echo "Source branch name: ${{ github.head_ref }}"
echo "Target branch name: ${{ github.base_ref }}"
git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}"
- name: Build a package
run: source scripts/build.sh
- name: Saving all wheels
Expand Down Expand Up @@ -101,10 +101,10 @@ jobs:
run: find . -mindepth 1 -delete
working-directory: ${{ github.workspace }}
- name: Checkout
uses: actions/checkout@v3
with:
submodules: true
fetch-depth: 0
run: |
echo "Source branch name: ${{ github.head_ref }}"
echo "Target branch name: ${{ github.base_ref }}"
git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}"
- name: Setup Environment variables
run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
- name: Download a wheel accordingly to matrix
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
NP_TEST_DEP: numpy==1.19.4
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20240524
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20241202
USE_CCACHE: 1
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0 }}
Expand All @@ -155,10 +155,10 @@ jobs:
echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
fi
- name: Checkout
uses: actions/checkout@v3
with:
submodules: false
fetch-depth: 0
run: |
echo "Source branch name: ${{ github.head_ref }}"
echo "Target branch name: ${{ github.base_ref }}"
git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}"
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/build_wheels_linux_arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
MB_ML_VER: 2014
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20240524
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20241202
USE_CCACHE: 0
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0 }}
Expand All @@ -58,10 +58,10 @@ jobs:
echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
fi
- name: Checkout
uses: actions/checkout@v3
with:
submodules: false
fetch-depth: 0
run: |
echo "Source branch name: ${{ github.head_ref }}"
echo "Target branch name: ${{ github.base_ref }}"
git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}"
- name: Build a package
run: source scripts/build.sh
- name: Saving all wheels
Expand Down Expand Up @@ -103,10 +103,10 @@ jobs:
run: find . -mindepth 1 -delete
working-directory: ${{ github.workspace }}
- name: Checkout
uses: actions/checkout@v3
with:
submodules: true
fetch-depth: 0
run: |
echo "Source branch name: ${{ github.head_ref }}"
echo "Target branch name: ${{ github.base_ref }}"
git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}"
- name: Setup Environment variables
run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
- name: Download a wheel accordingly to matrix
Expand Down
12 changes: 6 additions & 6 deletions docker/manylinux2014/Dockerfile_aarch64
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Version: 20240524
# Version: 20241202
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64

FROM quay.io/pypa/manylinux2014_aarch64:latest

ARG CCACHE_VERSION=3.7.9
ARG FFMPEG_VERSION=5.1.4
ARG FREETYPE_VERSION=2.13.2
ARG LIBPNG_VERSION=1.6.43
ARG VPX_VERSION=v1.14.0
ARG FFMPEG_VERSION=5.1.6
ARG FREETYPE_VERSION=2.13.3
ARG LIBPNG_VERSION=1.6.44
ARG VPX_VERSION=v1.15.0
ARG NASM_VERSION=2.15.04
ARG OPENSSL_VERSION=1_1_1w
ARG QT_VERSION=5.15.13
ARG QT_VERSION=5.15.16
ARG YASM_VERSION=1.3.0

ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
Expand Down
12 changes: 6 additions & 6 deletions docker/manylinux2014/Dockerfile_x86_64
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Version: 20240524
# Version: 20241202
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64

FROM quay.io/pypa/manylinux2014_x86_64:latest

ARG CCACHE_VERSION=3.7.9
ARG FFMPEG_VERSION=5.1.4
ARG FREETYPE_VERSION=2.13.2
ARG LIBPNG_VERSION=1.6.43
ARG VPX_VERSION=v1.14.0
ARG FFMPEG_VERSION=5.1.6
ARG FREETYPE_VERSION=2.13.3
ARG LIBPNG_VERSION=1.6.44
ARG VPX_VERSION=v1.15.0
ARG NASM_VERSION=2.15.04
ARG OPENSSL_VERSION=1_1_1w
ARG QT_VERSION=5.15.13
ARG QT_VERSION=5.15.16
ARG YASM_VERSION=1.3.0

ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
Expand Down
2 changes: 1 addition & 1 deletion opencv
Submodule opencv updated 692 files
2 changes: 1 addition & 1 deletion opencv_contrib
Submodule opencv_contrib updated 122 files
2 changes: 1 addition & 1 deletion opencv_extra
Submodule opencv_extra updated 90 files
+ testdata/cv/cameracalibration/checkerboard_marker_black.png
+ testdata/cv/cameracalibration/checkerboard_marker_white.png
+10 −1 testdata/dnn/download_models.py
+ testdata/dnn/onnx/conformance/node/test_dequantizelinear_blocked/model.onnx
+1 −0 testdata/dnn/onnx/conformance/node/test_dequantizelinear_blocked/test_data_set_0/input_0.pb
+ testdata/dnn/onnx/conformance/node/test_dequantizelinear_blocked/test_data_set_0/input_1.pb
+ testdata/dnn/onnx/conformance/node/test_dequantizelinear_blocked/test_data_set_0/input_2.pb
+ testdata/dnn/onnx/conformance/node/test_dequantizelinear_blocked/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_elu_default_expanded_ver18/model.onnx
+1 −0 testdata/dnn/onnx/conformance/node/test_elu_default_expanded_ver18/test_data_set_0/input_0.pb
+1 −0 testdata/dnn/onnx/conformance/node/test_elu_default_expanded_ver18/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_elu_example_expanded_ver18/model.onnx
+ testdata/dnn/onnx/conformance/node/test_elu_example_expanded_ver18/test_data_set_0/input_0.pb
+ testdata/dnn/onnx/conformance/node/test_elu_example_expanded_ver18/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_elu_expanded_ver18/model.onnx
+1 −0 testdata/dnn/onnx/conformance/node/test_elu_expanded_ver18/test_data_set_0/input_0.pb
+1 −0 testdata/dnn/onnx/conformance/node/test_elu_expanded_ver18/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_default_1/model.onnx
+ testdata/dnn/onnx/conformance/node/test_gelu_default_1/test_data_set_0/input_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_default_1/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_default_1_expanded/model.onnx
+ testdata/dnn/onnx/conformance/node/test_gelu_default_1_expanded/test_data_set_0/input_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_default_1_expanded/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_default_2/model.onnx
+1 −0 testdata/dnn/onnx/conformance/node/test_gelu_default_2/test_data_set_0/input_0.pb
+3 −0 testdata/dnn/onnx/conformance/node/test_gelu_default_2/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_default_2_expanded/model.onnx
+1 −0 testdata/dnn/onnx/conformance/node/test_gelu_default_2_expanded/test_data_set_0/input_0.pb
+3 −0 testdata/dnn/onnx/conformance/node/test_gelu_default_2_expanded/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_tanh_1/model.onnx
+ testdata/dnn/onnx/conformance/node/test_gelu_tanh_1/test_data_set_0/input_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_tanh_1/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_tanh_1_expanded/model.onnx
+ testdata/dnn/onnx/conformance/node/test_gelu_tanh_1_expanded/test_data_set_0/input_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_tanh_1_expanded/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_tanh_2/model.onnx
+1 −0 testdata/dnn/onnx/conformance/node/test_gelu_tanh_2/test_data_set_0/input_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_tanh_2/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_tanh_2_expanded/model.onnx
+1 −0 testdata/dnn/onnx/conformance/node/test_gelu_tanh_2_expanded/test_data_set_0/input_0.pb
+ testdata/dnn/onnx/conformance/node/test_gelu_tanh_2_expanded/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_mish/model.onnx
+ testdata/dnn/onnx/conformance/node/test_mish/test_data_set_0/input_0.pb
+ testdata/dnn/onnx/conformance/node/test_mish/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_mish_expanded/model.onnx
+ testdata/dnn/onnx/conformance/node/test_mish_expanded/test_data_set_0/input_0.pb
+ testdata/dnn/onnx/conformance/node/test_mish_expanded/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_quantizelinear_blocked/model.onnx
+ testdata/dnn/onnx/conformance/node/test_quantizelinear_blocked/test_data_set_0/input_0.pb
+ testdata/dnn/onnx/conformance/node/test_quantizelinear_blocked/test_data_set_0/input_1.pb
+ testdata/dnn/onnx/conformance/node/test_quantizelinear_blocked/test_data_set_0/input_2.pb
+1 −0 testdata/dnn/onnx/conformance/node/test_quantizelinear_blocked/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_selu_default_expanded_ver18/model.onnx
+1 −0 testdata/dnn/onnx/conformance/node/test_selu_default_expanded_ver18/test_data_set_0/input_0.pb
+1 −0 testdata/dnn/onnx/conformance/node/test_selu_default_expanded_ver18/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_selu_example_expanded_ver18/model.onnx
+ testdata/dnn/onnx/conformance/node/test_selu_example_expanded_ver18/test_data_set_0/input_0.pb
+ testdata/dnn/onnx/conformance/node/test_selu_example_expanded_ver18/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/conformance/node/test_selu_expanded_ver18/model.onnx
+1 −0 testdata/dnn/onnx/conformance/node/test_selu_expanded_ver18/test_data_set_0/input_0.pb
+2 −0 testdata/dnn/onnx/conformance/node/test_selu_expanded_ver18/test_data_set_0/output_0.pb
+ testdata/dnn/onnx/data/input_matmul_bcast.npy
+ testdata/dnn/onnx/data/input_pytorch_attention_single_head.npy
+ testdata/dnn/onnx/data/input_top_k.pb
+ testdata/dnn/onnx/data/input_top_k_negative_axis.pb
+ testdata/dnn/onnx/data/input_top_k_smallest.pb
+ testdata/dnn/onnx/data/input_unflatten.npy
+ testdata/dnn/onnx/data/output_matmul_bcast.npy
+ testdata/dnn/onnx/data/output_pytorch_attention_single_head.npy
+ testdata/dnn/onnx/data/output_top_k_0.pb
+ testdata/dnn/onnx/data/output_top_k_1.pb
+ testdata/dnn/onnx/data/output_top_k_negative_axis_0.pb
+ testdata/dnn/onnx/data/output_top_k_negative_axis_1.pb
+ testdata/dnn/onnx/data/output_top_k_smallest_0.pb
+ testdata/dnn/onnx/data/output_top_k_smallest_1.pb
+ testdata/dnn/onnx/data/output_unflatten.npy
+41 −0 testdata/dnn/onnx/generate_onnx_models.py
+72 −9 testdata/dnn/onnx/generate_onnx_models_with_onnxscript.py
+ testdata/dnn/onnx/models/matmul_bcast.onnx
+ testdata/dnn/onnx/models/pytorch_attention_single_head.onnx
+ testdata/dnn/onnx/models/top_k.onnx
+ testdata/dnn/onnx/models/top_k_negative_axis.onnx
+ testdata/dnn/onnx/models/top_k_smallest.onnx
+ testdata/dnn/onnx/models/unflatten.onnx
+7 −0 testdata/dnn/tflite/generate.py
+ testdata/dnn/tflite/leakyRelu.tflite
+ testdata/dnn/tflite/leakyRelu_inp.npy
+ testdata/dnn/tflite/leakyRelu_out_Identity.npy
+449 −0 testdata/perf/core.xml
+26,239 −19,655 testdata/perf/imgproc.xml
2 changes: 1 addition & 1 deletion patches/patchQtPlugins
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ index 4c0b3880fc..dffa0a4caa 100644
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
+ endif()
+ if(UNIX AND NOT APPLE)
+ install(DIRECTORY /opt/Qt5.15.13/plugins DESTINATION lib/qt)
+ install(DIRECTORY /opt/Qt5.15.16/plugins DESTINATION lib/qt)
+ install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
+ endif()
if(HAVE_QT_OPENGL)
Expand Down
2 changes: 1 addition & 1 deletion travis_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if [ -n "$IS_OSX" ]; then
export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"
else
echo " > Linux environment "
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.13/lib
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.16/lib
export MAKEFLAGS="-j$(grep -E '^processor[[:space:]]*:' /proc/cpuinfo | wc -l)"
CURRENT_ARCH=$(uname -m)
if [[ $CURRENT_ARCH == 'aarch64' ]]; then
Expand Down

0 comments on commit 3f50d32

Please sign in to comment.