Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Update 3.4 branch with latest updates in master#669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
asenyaev merged 14 commits intoopencv:3.4fromasenyaev:asen/update_3.4_branch
Jun 1, 2022
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
14 commits
Select commitHold shift + click to select a range
b4ff4f4
Added pylint test
asenyaevMar 22, 2022
f15990c
Pinned pylint version
asenyaevMar 23, 2022
b01f2cf
Changed using custom test for pylint to opencv sample
asenyaevMar 23, 2022
5946584
Added pre-downloaded 3rdparty files to source packages
asenyaevMar 24, 2022
7a76aee
Revert changes for pre-downloaded files
asenyaevMar 25, 2022
83fdc76
Skip only gapi if it was not found
asenyaevMar 25, 2022
79819ba
Synchronize with scikit-build
Mar 21, 2022
fabee7f
add support for building windows/arm64 package
niyas-saitMar 28, 2022
2485652
Pinned versions for dependencies
asenyaevApr 7, 2022
d563f74
Downgraded cmake version
asenyaevApr 8, 2022
31701ff
Downgraded cmake version to 3.1
asenyaevApr 8, 2022
d87183f
Updated dependecies for the next release
asenyaevMay 30, 2022
ac615ea
Updated dependecies for the next release
asenyaevMay 31, 2022
964ad08
Check changes on 3.4 branch in PRs
asenyaevMay 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions.github/workflows/build_wheels_linux.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ on:
pull_request:
branches:
- master
- 3.4
paths-ignore:
- '.github/workflows/build_wheels_linux_arm.yml'
- '.github/workflows/build_wheels_windows*'
Expand DownExpand Up@@ -39,7 +40,7 @@ jobs:
MB_ML_VER: 2014
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014:${PLAT}
USE_CCACHE: 1
UNICODE_WIDTH: 32
PLAT: x86_64
Expand DownExpand Up@@ -102,7 +103,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
submodules:false
submodules:true
fetch-depth: 0

- name: Setup Environment variables
Expand DownExpand Up@@ -145,7 +146,7 @@ jobs:
NP_TEST_DEP: numpy==1.19.4
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014:${PLAT}
USE_CCACHE: 1
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0 }}
Expand DownExpand Up@@ -176,7 +177,7 @@ jobs:
set -x
python -m pip install --upgrade pip
python -m pip install scikit-build
python setup.py sdist
python setup.py sdist --formats=xztar
set +x
# Install and run tests
set -x
Expand All@@ -186,7 +187,7 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: wheels
path: dist/opencv*.tar.gz
path: dist/opencv*.tar.xz

test_release_opencv_python:
if: github.event_name == 'release' && github.event.release.prerelease
Expand Down
3 changes: 2 additions & 1 deletion.github/workflows/build_wheels_linux_arm.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ on:
pull_request:
branches:
- master
- 3.4
paths-ignore:
- '.github/workflows/build_wheels_linux.yml'
- '.github/workflows/build_wheels_windows*'
Expand DownExpand Up@@ -40,7 +41,7 @@ jobs:
MB_ML_VER: 2014
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014:${PLAT}
USE_CCACHE: 0
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0 }}
Expand Down
8 changes: 8 additions & 0 deletions.github/workflows/build_wheels_macos.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ on:
pull_request:
branches:
- master
- 3.4
paths-ignore:
- '.github/workflows/build_wheels_linux*'
- '.github/workflows/build_wheels_windows*'
Expand DownExpand Up@@ -137,6 +138,7 @@ jobs:
CONFIG_PATH: travis_config.sh
PLAT: x86_64
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
PYLINT_TEST_FILE: ${{ github.workspace }}/opencv/samples/python/squares.py

steps:
- name: Checkout
Expand DownExpand Up@@ -171,6 +173,12 @@ jobs:
cd ${{ github.workspace }}/opencv
python modules/python/test/test.py -v --repo .

- name: Pylint test
run: |
python -m pip install pylint==2.12.2
cd ${{ github.workspace }}/tests
python -m pylint $PYLINT_TEST_FILE

test_release_opencv_python:
if: github.event_name == 'release' && github.event.release.prerelease
needs: [build, test]
Expand Down
8 changes: 8 additions & 0 deletions.github/workflows/build_wheels_macos_m1.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ on:
pull_request:
branches:
- master
- 3.4
paths-ignore:
- '.github/workflows/build_wheels_linux*'
- '.github/workflows/build_wheels_windows*'
Expand DownExpand Up@@ -81,6 +82,7 @@ jobs:

env:
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
PYLINT_TEST_FILE: ${{ github.workspace }}/opencv/samples/python/squares.py

steps:
- name: Checkout
Expand All@@ -106,6 +108,12 @@ jobs:
cd ${{ github.workspace }}/opencv
arch -arm64 python${{ matrix.python-version }} modules/python/test/test.py -v --repo .

- name: Pylint test
run: |
arch -arm64 python${{ matrix.python-version }} -m pip install pylint==2.12.2
cd ${{ github.workspace }}/tests
arch -arm64 python${{ matrix.python-version }} -m pylint $PYLINT_TEST_FILE

test_release_opencv_python:
if: github.event_name == 'release' && github.event.release.prerelease
needs: [build, test]
Expand Down
9 changes: 9 additions & 0 deletions.github/workflows/build_wheels_windows.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ on:
pull_request:
branches:
- master
- 3.4
paths-ignore:
- '.github/workflows/build_wheels_linux*'
- '.github/workflows/build_wheels_macos*'
Expand DownExpand Up@@ -96,6 +97,7 @@ jobs:
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}\opencv_extra\testdata
PYLINT_TEST_FILE: ${{ github.workspace }}\opencv\samples\python\squares.py

steps:
- name: Checkout
Expand DownExpand Up@@ -130,6 +132,13 @@ jobs:
python modules\python\test\test.py -v --repo .
shell: cmd

- name: Pylint test
run: |
python -m pip install pylint==2.12.2
cd ${{ github.workspace }}\tests
python -m pylint $PYLINT_TEST_FILE
shell: cmd

test_release_opencv_python:
if: github.event_name == 'release' && github.event.release.prerelease
needs: [build-windows-x86_64, test]
Expand Down
85 changes: 67 additions & 18 deletionsdocker/manylinux2014/Dockerfile_aarch64
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,61 +2,103 @@ FROM quay.io/pypa/manylinux2014_aarch64:latest

ARG CCACHE_VERSION=3.7.9
ARG FFMPEG_VERSION=4.4.1
ARG FREETYPE_VERSION=2.12.1
ARG LIBPNG_VERSION=1.6.37
ARG NASM_VERSION=2.15.04
ARG OPENSSL_VERSION=1_1_1m
ARG OPENSSL_VERSION=1_1_1o
ARG QT_VERSION=5.15.0
ARG YASM_VERSION=1.3.0

RUN yum install bzip2-devel curl-devel zlib-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel libXi-devel freetype-devel -y
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH

# epel-release need for aarch64 to get openblas packages
RUN yum install bzip2-devel curl-devel zlib-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel libXi-devel lapack-devel epel-release -y && \
yum install openblas-devel -y && \
cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
# libpng will be built from source
yum remove libpng -y

RUN mkdir ~/libpng_sources && \
cd ~/libpng_sources && \
curl -O -L https://download.sourceforge.net/libpng/libpng-${LIBPNG_VERSION}.tar.gz && \
tar -xf libpng-${LIBPNG_VERSION}.tar.gz && \
cd libpng-${LIBPNG_VERSION} && \
./configure --prefix=/usr/local && \
make && \
make install && \
cd .. && \
rm -rf ~/libpng_sources

RUN mkdir ~/freetype_sources && \
cd ~/freetype_sources && \
curl -O -L https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \
tar -xf freetype-${FREETYPE_VERSION}.tar.gz && \
cd freetype-${FREETYPE_VERSION} && \
./configure --prefix="$HOME/ffmpeg_build" --enable-freetype-config && \
make && \
make install && \
cd .. && \
rm -rf ~/freetype_sources

RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
cd qt-everywhere* && \
cd qt-everywhere-src-${QT_VERSION} && \
export MAKEFLAGS=-j$(nproc) && \
./configure -prefix /opt/Qt${QT_VERSION} -release -opensource -confirm-license -qtnamespace QtOpenCVPython -xcb -xcb-xlib -bundled-xcb-xinput -no-openssl -no-dbus -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmultimedia -skip qtpurchasing -skip qtqa -skip qtremoteobjects -skip qtrepotools -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttranslations -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip xmlpatterns -skip declarative -make libs && \
make && \
make install && \
cd .. && \
rm -rf qt-everywhere-src-${QT_VERSION} && \
rm qt-everywhere-src-${QT_VERSION}.tar.xz
rm -rf qt-everywhere*

ENV QTDIR /opt/Qt${QT_VERSION}
ENV PATH "$QTDIR/bin:$PATH"

RUN mkdir ~/ffmpeg_sources && \
cd ~/ffmpeg_sources && \
RUN mkdir ~/openssl_sources && \
cd ~/openssl_sources && \
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION}.tar.gz && \
tar -xf OpenSSL_${OPENSSL_VERSION}.tar.gz && \
cd openssl-OpenSSL_${OPENSSL_VERSION} && \
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
make -j$(getconf _NPROCESSORS_ONLN) && \
# skip installing documentation
make install_sw && \
rm -rf ~/openssl_build
cd .. && \
rm -rf ~/openssl_build ~/openssl_sources

RUN cd ~/ffmpeg_sources && \
RUN mkdir ~/nasm_sources && \
cd ~/nasm_sources && \
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2 && \
tar -xf nasm-${NASM_VERSION}.tar.bz2 && cd nasm-${NASM_VERSION} && ./autogen.sh && \
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
make -j$(getconf _NPROCESSORS_ONLN) && \
make install
make install && \
cd .. && \
rm -rf ~/nasm_sources

RUN cd ~/ffmpeg_sources && \
RUN mkdir ~/yasm_sources && \
cd ~/yasm_sources && \
curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-${YASM_VERSION}.tar.gz && \
tar -xf yasm-${YASM_VERSION}.tar.gz && \
cd yasm-${YASM_VERSION} && \
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
make -j$(getconf _NPROCESSORS_ONLN) && \
make install
make install && \
cd .. && \
rm -rf ~/yasm_sources

RUN cd ~/ffmpeg_sources && \
git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git && \
RUN mkdir ~/libvpx_sources && \
cd ~/libvpx_sources && \
git clone --depth 1 https://github.com/webmproject/libvpx.git && \
cd libvpx && \
./configure --prefix="$HOME/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
make -j$(getconf _NPROCESSORS_ONLN) && \
make install
make install && \
cd .. && \
rm -rf ~/libvpx_sources

RUN cd ~/ffmpeg_sources && \
RUN mkdir ~/ffmpeg_sources && \
cd ~/ffmpeg_sources && \
curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
tar -xf ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
cd ffmpeg-${FFMPEG_VERSION} && \
Expand All@@ -66,14 +108,21 @@ RUN cd ~/ffmpeg_sources && \
make install && \
echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
ldconfig && \
rm -rf ~/ffmpeg_sources
rm -rf ~/ffmpeg_sources && \
yum remove bzip2-devel -y

RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz && \
tar -xf ccache-${CCACHE_VERSION}.tar.gz && \
cd ccache-${CCACHE_VERSION} && \
linux32 ./configure && \
make -j$(getconf _NPROCESSORS_ONLN) && \
make install
make install && \
cd .. && \
rm -rf ccache-${CCACHE_VERSION}.tar.gz

# Git security vulnerability: https://github.blog/2022-04-12-git-security-vulnerability-announced
RUN mkdir /io && \
git config --global --add safe.directory /io

ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
ENV LDFLAGS -L/root/ffmpeg_build/lib
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp