8000 Merge pull request #1113 from asmorkalov:as/linux_blas_fix · opencv/opencv-python@ef4ca3f · GitHub
[go: up one dir, main page]
Skip to content

Commit ef4ca3f

Browse files
asmorkalovasmorkalov
authored
Merge pull request #1113 from asmorkalov:as/linux_blas_fix
BLAS search fix on Linux after chanages in main OpenCV.
2 parents d2b8df1 + fa50138 commit ef4ca3f

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

‎.github/workflows/build_wheels_linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
MB_ML_VER: 2014
4242
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4343
CONFIG_PATH: travis_config.sh
44-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20250611
44+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20250630
4545
USE_CCACHE: 0
4646
UNICODE_WIDTH: 32
4747
PLAT: x86_64
@@ -134,7 +134,7 @@ jobs:
134134
NP_TEST_DEP: numpy==1.19.4
135135
TRAVIS_BUILD_DIR: ${{ github.workspace }}
136136
CONFIG_PATH: travis_config.sh
137-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20250611
137+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20250630
138138
USE_CCACHE: 1
139139
UNICODE_WIDTH: 32
140140
SDIST: ${{ matrix.build_sdist || 0 }}

‎.github/workflows/build_wheels_linux_arm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
MB_ML_VER: 2014
4343
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4444
CONFIG_PATH: travis_config.sh
45-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20250611
45+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20250630
4646
USE_CCACHE: 0
4747
UNICODE_WIDTH: 32
4848
SDIST: ${{ matrix.build_sdist || 0 }}

‎docker/manylinux2014/Dockerfile_aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version: 20250611
1+
# Version: 20250630
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
33

44
FROM quay.io/pypa/manylinux2014_aarch64:latest
@@ -21,7 +21,7 @@ ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
2121
RUN yum install zlib-devel curl-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 && \
2222
yum install openblas-devel dejavu-sans-fonts -y && \
2323
cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
24-
curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
24+
cp /usr/include/openblas/*.h /usr/include/ && \
2525
# libpng will be built from source
2626
yum remove libpng -y
2727

‎docker/manylinux2014/Dockerfile_x86_64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version: 20250611
1+
# Version: 20250630
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
33

44
FROM quay.io/pypa/manylinux2014_x86_64:latest
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
2020
# epel-release need for aarch64 to get openblas packages
2121
RUN yum install zlib-devel curl-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 && \
2222
yum install openblas-devel dejavu-sans-fonts -y && \
23+
cp /usr/include/openblas/*.h /usr/include/ && \
2324
cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
24-
curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
2525
# libpng will be built from source
2626
yum remove libpng -y
2727

0 commit comments

Comments
 (0)
0