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

5.x merge 4.x#1056

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
asmorkalov merged 8 commits intoopencv:5.xfromasmorkalov:5.x-merge-4.x
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
28 changes: 14 additions & 14 deletions.github/workflows/build_wheels_linux.yml
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
4 changes: 2 additions & 2 deletions.github/workflows/build_wheels_macos.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ on:

jobs:
Build:
runs-on: macos-12
runs-on: macos-13
defaults:
run:
shell: bash
Expand DownExpand Up@@ -98,7 +98,7 @@ jobs:

Test:
needs: [Build]
runs-on: macos-12
runs-on: macos-13
defaults:
run:
shell: bash
Expand Down
12 changes: 6 additions & 6 deletionsdocker/manylinux2014/Dockerfile_aarch64
View file
Open in desktop
Original file line numberDiff line numberDiff 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 deletionsdocker/manylinux2014/Dockerfile_x86_64
View file
Open in desktop
Original file line numberDiff line numberDiff 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 deletionopencv
Open in desktop
Submoduleopencv updated 26 files
+35 −15 modules/core/doc/intro.markdown
+1 −1 modules/core/include/opencv2/core/hal/intrin_lasx.hpp
+29 −0 modules/core/include/opencv2/core/hal/intrin_rvv_scalable.hpp
+148 −148 modules/core/include/opencv2/core/hal/intrin_wasm.hpp
+4 −3 modules/core/include/opencv2/core/mat.hpp
+1 −1 modules/core/misc/objc/common/CvTypeExt.swift
+7 −1 modules/core/misc/objc/test/MatTestObjc.m
+1 −1 modules/core/perf/perf_arithm.cpp
+0 −42 modules/imgproc/perf/perf_warp.cpp
+9 −1 modules/imgproc/src/color_lab.cpp
+151 −6 modules/imgproc/src/imgwarp.cpp
+47 −55 modules/imgproc/src/opencl/remap.cl
+12 −14 modules/imgproc/src/opencl/warp_affine.cl
+10 −11 modules/imgproc/src/opencl/warp_perspective.cl
+105 −88 modules/imgproc/src/warp_common.scalar.hpp
+356 −249 modules/imgproc/src/warp_common.vector.hpp
+3,296 −802 modules/imgproc/src/warp_kernels.simd.hpp
+97 −39 modules/imgproc/test/test_imgwarp_strict.cpp
+5 −4 modules/objdetect/src/qrcode_encoder.cpp
+7 −2 modules/stitching/include/opencv2/stitching.hpp
+2 −0 platforms/js/build_js.py
+8 −1 samples/dnn/common.hpp
+6 −1 samples/dnn/common.py
+14 −4 samples/dnn/models.yml
+30 −35 samples/dnn/object_detection.cpp
+50 −31 samples/dnn/object_detection.py
2 changes: 1 addition & 1 deletionpatches/patchQtPlugins
View file
Open in desktop
Original file line numberDiff line numberDiff 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 deletiontravis_config.sh
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Loading
[8]ページ先頭
©2009-2025 Movatter.jp