[arch-commits] Commit in opencv/trunk (PKGBUILD opencv-lapack-3.10.patch)
Antonio Rojas
arojas at gemini.archlinux.org
Wed Dec 22 20:34:56 UTC 2021
Date: Wednesday, December 22, 2021 @ 20:34:55
Author: arojas
Revision: 432927
protobuf 3.19 rebuild, disable lto for cuda, use upstream lapack patch
Modified:
opencv/trunk/PKGBUILD
Deleted:
opencv/trunk/opencv-lapack-3.10.patch
--------------------------+
PKGBUILD | 7 +-
opencv-lapack-3.10.patch | 108 ---------------------------------------------
2 files changed, 4 insertions(+), 111 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-22 19:58:12 UTC (rev 432926)
+++ PKGBUILD 2021-12-22 20:34:55 UTC (rev 432927)
@@ -5,7 +5,7 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv opencv-cuda)
pkgver=4.5.4
-pkgrel=10
+pkgrel=11
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
@@ -21,12 +21,12 @@
'java-runtime: Java interface')
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
- opencv-lapack-3.10.patch
+ opencv-lapack-3.10.patch::https://github.com/opencv/opencv/commit/54c18009.patch
fix-cvv-build.patch::https://github.com/opencv/opencv_contrib/commit/2a4348e0.patch
vtk9.patch)
sha256sums=('c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d'
'ad74b440b4539619dc9b587995a16b691246023d45e34097c73e259f72de9f81'
- 'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199'
+ 'fec670f7d1f7f6a92db9f871d73d736775c6e5875a7d9cd9894b9753d073f9a1'
'a992cbdfe40730c584df41b9d18ab6c799bf060a67cf4332e5e3301b95720369'
'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
@@ -69,6 +69,7 @@
cmake -B build -S $pkgname-$pkgver $_opts
cmake --build build
+ CFLAGS="${CFLAGS} -fno-lto" CXXFLAGS="${CXXFLAGS} -fno-lto" LDFLAGS="${LDFLAGS} -fno-lto" \
cmake -B build-cuda -S $pkgname-$pkgver $_opts \
-DWITH_CUDA=ON \
-DWITH_CUDNN=ON
Deleted: opencv-lapack-3.10.patch
===================================================================
--- opencv-lapack-3.10.patch 2021-12-22 19:58:12 UTC (rev 432926)
+++ opencv-lapack-3.10.patch 2021-12-22 20:34:55 UTC (rev 432927)
@@ -1,108 +0,0 @@
-diff --git a/modules/core/src/hal_internal.cpp b/modules/core/src/hal_internal.cpp
-index 483281d1f7..05239e98f4 100644
---- a/modules/core/src/hal_internal.cpp
-+++ b/modules/core/src/hal_internal.cpp
-@@ -163,9 +163,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype* b, size_t b_step, int n
- if(n == 1 && b_step == sizeof(fptype))
- {
- if(typeid(fptype) == typeid(float))
-- sposv_(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus);
-+ LAPACK_sposv(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus);
- else if(typeid(fptype) == typeid(double))
-- dposv_(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus);
-+ LAPACK_dposv(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus);
- }
- else
- {
-@@ -174,9 +174,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype* b, size_t b_step, int n
- transpose(b, ldb, tmpB, m, m, n);
-
- if(typeid(fptype) == typeid(float))
-- sposv_(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus);
-+ LAPACK_sposv(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus);
- else if(typeid(fptype) == typeid(double))
-- dposv_(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus);
-+ LAPACK_dposv(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus);
-
- transpose(tmpB, m, b, ldb, n, m);
- delete[] tmpB;
-@@ -185,9 +185,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype* b, size_t b_step, int n
- else
- {
- if(typeid(fptype) == typeid(float))
-- spotrf_(L, &m, (float*)a, &lda, &lapackStatus);
-+ LAPACK_spotrf(L, &m, (float*)a, &lda, &lapackStatus);
- else if(typeid(fptype) == typeid(double))
-- dpotrf_(L, &m, (double*)a, &lda, &lapackStatus);
-+ LAPACK_dpotrf(L, &m, (double*)a, &lda, &lapackStatus);
- }
-
- if(lapackStatus == 0) *info = true;
-@@ -227,17 +227,17 @@ lapack_SVD(fptype* a, size_t a_step, fptype *w, fptype* u, size_t u_step, fptype
- }
-
- if(typeid(fptype) == typeid(float))
-- sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info);
-+ LAPACK_sgesdd(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info);
- else if(typeid(fptype) == typeid(double))
-- dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info);
-+ LAPACK_dgesdd(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info);
-
- lwork = (int)round(work1); //optimal buffer size
- fptype* buffer = new fptype[lwork + 1];
-
- if(typeid(fptype) == typeid(float))
-- sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info);
-+ LAPACK_sgesdd(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info);
- else if(typeid(fptype) == typeid(double))
-- dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info);
-+ LAPACK_dgesdd(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info);
-
- if(!(flags & CV_HAL_SVD_NO_UV))
- transpose_square_inplace(vt, ldv, n);
-@@ -288,18 +288,18 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k, fptype* b, size_t b_ste
- if (k == 1 && b_step == sizeof(fptype))
- {
- if (typeid(fptype) == typeid(float))
-- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info);
-+ LAPACK_sgels(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info);
- else if (typeid(fptype) == typeid(double))
-- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info);
-+ LAPACK_dgels(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info);
-
- lwork = cvRound(work1); //optimal buffer size
- std::vector<fptype> workBufMemHolder(lwork + 1);
- fptype* buffer = &workBufMemHolder.front();
-
- if (typeid(fptype) == typeid(float))
-- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info);
-+ LAPACK_sgels(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info);
- else if (typeid(fptype) == typeid(double))
-- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info);
-+ LAPACK_dgels(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info);
- }
- else
- {
-@@ -309,18 +309,18 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k, fptype* b, size_t b_ste
- transpose(b, ldb, tmpB, m, m, k);
-
- if (typeid(fptype) == typeid(float))
-- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info);
-+ LAPACK_sgels(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info);
- else if (typeid(fptype) == typeid(double))
-- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info);
-+ LAPACK_dgels(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info);
-
- lwork = cvRound(work1); //optimal buffer size
- std::vector<fptype> workBufMemHolder(lwork + 1);
- fptype* buffer = &workBufMemHolder.front();
-
- if (typeid(fptype) == typeid(float))
-- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info);
-+ LAPACK_sgels(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info);
- else if (typeid(fptype) == typeid(double))
-- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info);
-+ LAPACK_dgels(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info);
-
- transpose(tmpB, m, b, ldb, k, m);
- }
More information about the arch-commits
mailing list