From a1fbcb380f56486aef18a8c29aa1f0edf2aa637f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Thu, 8 Aug 2024 23:17:47 +0100 Subject: [PATCH] openblas: update to 0.3.28 --- ...-exhaustive-register-search-to-clang.patch | 43 ------------------- mingw-w64-openblas/PKGBUILD | 29 +++++-------- 2 files changed, 11 insertions(+), 61 deletions(-) delete mode 100644 mingw-w64-openblas/001-do-not-pass-exhaustive-register-search-to-clang.patch diff --git a/mingw-w64-openblas/001-do-not-pass-exhaustive-register-search-to-clang.patch b/mingw-w64-openblas/001-do-not-pass-exhaustive-register-search-to-clang.patch deleted file mode 100644 index fa02389eac8ec..0000000000000 --- a/mingw-w64-openblas/001-do-not-pass-exhaustive-register-search-to-clang.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/cmake/system.cmake -+++ b/cmake/system.cmake -@@ -172,9 +172,9 @@ if (DEFINED TARGET) - endif() - elseif (${CMAKE_C_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_C_COMPILER_ID} STREQUAL "AppleClang") - if (${CMAKE_C_COMPILER_VERSION} VERSION_GREATER 8.99) -- set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=cooperlake -exhaustive-register-search") -+ set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=cooperlake -mllvm -exhaustive-register-search") - else() -- set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=skylake-avx512 -exhaustive-register-search") -+ set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=skylake-avx512 -mllvm -exhaustive-register-search") - endif() - endif() - endif() -@@ -188,16 +188,16 @@ if (DEFINED TARGET) - endif() - elseif (${CMAKE_C_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_C_COMPILER_ID} STREQUAL "AppleClang") - if (${CMAKE_C_COMPILER_VERSION} VERSION_GREATER 12.0) -- set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=sapphirerapids -exhaustive-register-search") -+ set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=sapphirerapids -mllvm -exhaustive-register-search") - else() -- set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=skylake-avx512 -exhaustive-register-search") -+ set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=skylake-avx512 -mllvm -exhaustive-register-search") - endif() - endif() - endif() - if (${TARGET} STREQUAL SKYLAKEX AND NOT NO_AVX512) - set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=skylake-avx512") - if (${CMAKE_C_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_C_COMPILER_ID} STREQUAL "AppleClang") -- set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -exhaustive-register-search") -+ set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -mllvm -exhaustive-register-search") - endif() - endif() - -@@ -215,7 +215,7 @@ if (DEFINED TARGET) - else() - set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=skylake-avx512") - endif() -- set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -exhaustive-register-search") -+ set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -mllvm -exhaustive-register-search") - endif() - endif() - diff --git a/mingw-w64-openblas/PKGBUILD b/mingw-w64-openblas/PKGBUILD index 7429399452dbb..7b96d87683807 100644 --- a/mingw-w64-openblas/PKGBUILD +++ b/mingw-w64-openblas/PKGBUILD @@ -5,7 +5,7 @@ _realname=OpenBLAS pkgbase=mingw-w64-openblas pkgname=("${MINGW_PACKAGE_PREFIX}-openblas" $([[ "${CARCH}" == "i686" ]] || echo "${MINGW_PACKAGE_PREFIX}-openblas64")) -pkgver=0.3.27 +pkgver=0.3.28 pkgrel=1 pkgdesc="An optimized BLAS library based on GotoBLAS2 1.13 BSD, providing optimized blas, lapack, and cblas (mingw-w64)" arch=('any') @@ -17,10 +17,6 @@ msys2_references=( "cpe: cpe:/a:openblas_project:openblas" ) license=('spdx:BSD-3-Clause') -provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") -conflicts=("${MINGW_PACKAGE_PREFIX}-openblas-git") -replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-git") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libwinpthread" $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran") @@ -32,12 +28,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "dos2unix") options=('!buildflags') source=(https://github.com/OpenMathLib/OpenBLAS/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz - 001-do-not-pass-exhaustive-register-search-to-clang.patch 002-lgfortran-requires-lquadmath.patch 004-aarch64-detection.patch 005-fix-pkgconfig-files.patch) -sha256sums=('aa2d68b1564fe2b13bc292672608e9cdeeeb6dc34995512e65c3b10f4599e897' - '26d1e24f6172702156a02efe49e18c8a33321466ff25c324a02e8983dfdc1711' +sha256sums=('f1003466ad074e9b0c8d421a204121100b0751c96fc6fcf3d1456bd12f8a00a1' 'c147ec053bdf0387d499372472365aa829db0d8200b6828b0ebce5209e8603fd' '70ce007ff4f6c2a127f9835ce9cd85081707cf3bcccddcfaa06817b06f69c941' 'a5c94f3c089a85c691ce67f0ad2e090d7d4ef951beee040248a5eaf0ee12b33d') @@ -46,8 +40,8 @@ sha256sums=('aa2d68b1564fe2b13bc292672608e9cdeeeb6dc34995512e65c3b10f4599e897' apply_patch_with_msg() { for _patch in "$@" do - msg2 "Applying $_patch" - patch -Np1 -i "${srcdir}/$_patch" + msg2 "Applying ${_patch}" + patch -Np1 -i "${srcdir}"/${_patch} done } @@ -55,7 +49,6 @@ prepare() { cd "${srcdir}"/${_realname}-${pkgver} apply_patch_with_msg \ - 001-do-not-pass-exhaustive-register-search-to-clang.patch \ 002-lgfortran-requires-lquadmath.patch \ 004-aarch64-detection.patch \ 005-fix-pkgconfig-files.patch @@ -100,13 +93,13 @@ _build_openblas() { } build() { - mkdir -p "${srcdir}/build-${MSYSTEM}-32" && cd "${srcdir}/build-${MSYSTEM}-32" + mkdir -p "${srcdir}"/build-${MSYSTEM}-32 && cd "${srcdir}"/build-${MSYSTEM}-32 msg2 "Build OpenBLAS with 32-bit indexing" _build_openblas "" if [ "${CARCH}" != "i686" ]; then - mkdir -p "${srcdir}/build-${MSYSTEM}-64" && cd "${srcdir}/build-${MSYSTEM}-64" + mkdir -p "${srcdir}"/build-${MSYSTEM}-64 && cd "${srcdir}"/build-${MSYSTEM}-64 msg2 "Build OpenBLAS with 64-bit indexing" _build_openblas "-DBINARY=64 -DINTERFACE64=1" @@ -118,7 +111,7 @@ check() { ctest if [ "${CARCH}" != "i686" ]; then - cd "${srcdir}/build-${MSYSTEM}-64" + cd "${srcdir}"/build-${MSYSTEM}-64 ctest fi } @@ -131,8 +124,8 @@ package_openblas() { DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install . # Install License - install -Dm0644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE - install -Dm0644 ${srcdir}/${_realname}-${pkgver}/lapack-netlib/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE-lapack + install -Dm0644 "${srcdir}"/${_realname}-${pkgver}/LICENSE "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE + install -Dm0644 "${srcdir}"/${_realname}-${pkgver}/lapack-netlib/LICENSE "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE-lapack } package_openblas64() { @@ -146,8 +139,8 @@ package_openblas64() { DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install . # Install License - install -Dm0644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}64/LICENSE - install -Dm0644 ${srcdir}/${_realname}-${pkgver}/lapack-netlib/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}64/LICENSE-lapack + install -Dm0644 "${srcdir}"/${_realname}-${pkgver}/LICENSE "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}64/LICENSE + install -Dm0644 "${srcdir}"/${_realname}-${pkgver}/lapack-netlib/LICENSE "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}64/LICENSE-lapack } # template start; name=mingw-w64-splitpkg-wrappers; version=1.0;