CVS commit: pkgsrc/math

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/math
From: "Dr. Thomas Orgis" <thor%netbsd.org@localhost>
Date: Mon, 8 Jan 2024 21:28:57 +0000

Module Name:    pkgsrc
Committed By:   thor
Date:           Mon Jan  8 21:28:57 UTC 2024

Modified Files:
        pkgsrc/math/blas: PLIST
        pkgsrc/math/blas64: PLIST
        pkgsrc/math/cblas: Makefile PLIST
        pkgsrc/math/cblas64: Makefile
        pkgsrc/math/lapack: Makefile Makefile.common PLIST distinfo version.mk
        pkgsrc/math/lapack64: Makefile PLIST
        pkgsrc/math/lapacke: Makefile PLIST
        pkgsrc/math/lapacke64: Makefile PLIST
Added Files:
        pkgsrc/math/lapack/patches: patch-buildsystem-upstreamed
Removed Files:
        pkgsrc/math/lapack/patches: patch-BLAS_SRC_CMakeLists.txt
            patch-CBLAS_CMakeLists.txt patch-CBLAS_cblas.pc.in
            patch-CBLAS_src_CMakeLists.txt patch-CMakeLists.txt
            patch-LAPACKE_CMakeLists.txt patch-LAPACKE_lapacke.pc.in
            patch-SRC_CMakeLists.txt patch-TESTING_MATGEN_CMakeLists.txt

Log Message:
math/{lapack*,cblas*}: update netlib BLAS to 3.12.0

This drops the static libraries along with the custom patches for those. Also,
the hack of linking CBLAS as Fortran library as opposed to C is gone. If this
breaks some NetBSD install, it should be investigated and fixed properly.

The only patch now is one unified one I already submitted for inclusion
upstream. Maybe soon we can drop any patches. Yay!

Here is a list of upstream changes:

LAPACK 3.12.0: What’s new

    Download: lapack-3.12.0.tar.gz

This is a major release and also addressing multiple bug fixes.
Dynamic Mode Decomposition (DMD)

    xGEDMD computes the Dynamic Mode Decomposition (DMD) for a pair of
    data snapshot matrices. For the input matrices X and Y such that Y =
    A*X with an inaccessible matrix A, xGEDMD computes a certain number
    of Ritz pairs of A using the standard Rayleigh-Ritz extraction from
    a subspace of range(X) that is determined using the leading left
    singular vectors of X. Optionally, xGEDMD returns the residuals of
    the computed Ritz pairs, the information needed for a refinement of
    the Ritz vectors, or the eigenvectors of the Exact DMD.

    xGEDMDQ does the same as xGEDMD but uses a QR factorization based
    compression of the data.

    See: Z. Drmac: A LAPACK implementation of the Dynamic Mode
    Decomposition I. Technical report. AIMDyn Inc. and LAPACK Working
    Note 298.

    Developed and coded by Zlatko Drmac, Faculty of Science, University
    of Zagreb. In cooperation with AIMdyn Inc., Santa Barbara, CA. And
    supported by (1) DARPA SBIR project "Koopman Operator-Based
    Forecasting for Nonstationary Processes from Near-Term, Limited
    Observational Data", Contract No: W31P4Q-21-C-0007; (2) DARPA PAI
    project "Physics-Informed Machine Learning Methodologies", Contract
    No: HR0011-18-9-0033; (3) DARPA MoDyL project "A Data-Driven,
    Operator-Theoretic Framework for Space-Time Analysis of Process
    Dynamics", Contract No: HR0011-16-C-0116. Any opinions, findings and
    conclusions or recommendations expressed in this material are those of
    the author and do not necessarily reflect the views of the DARPA SBIR
    Program Office. Distribution Statement A: Approved for Public Release,
    Distribution Unlimited. Cleared by DARPA on September 29, 2022

    Adding Dynamic Mode Decomposition (DMD) into LAPACK by @dbielich in
    PR 736

    Update C prototypes and LAPACKE interfaces for ?GEDMD/?GEDMDQ by
    @martin-frbg in PR 880

Truncated QR with Column Pivoting

    The routine computes a truncated (rank K) or full rank Householder
    QR factorization with column pivoting of a real M-by-N matrix A
    using Level 3 BLAS.

    The truncation criteria (i.e. when to stop the factorization) can
    be any of the following: (1) The input parameter KMAX, the maximum
    number of columns KMAX to factorize; (2) The input parameter ABSTOL,
    the absolute tolerance for the maximum column 2-norm of the residual
    matrix R22(K); (3) The input parameter RELTOL, the tolerance for the
    maximum column 2-norm matrix of the residual matrix R22(K) divided by
    the maximum column 2-norm of the original matrix A, which is equal
    to abs(R(1,1)). The algorithm stops when any of these conditions is
    first satisfied, otherwise the whole matrix A is factorized.

    Truncated QR with Column Pivoting by @scr2016 in PR 891

Reciprocal Scaling of complex vectors

    [C/Z]RSCL multiplies an n-element complex vector x by the complex
    scalar 1/a. This is done without overflow or underflow as long as
    the final result x/a does not overflow or underflow.

    See: "An algorithm for scaling vectors by the reciprocal
    of a complex number", Weslley da Silva Pereira,
    [arXiv:2311.05736](https://arxiv.org/abs/2311.05736)

    Adds CRSCL by @weslleyspereira in PR 839

Improvements in the 64-bit API

    Fix CBLAS tests with 64-bit indexing by @svillemot in PR 767

    Add Index-64 API as extended API with _64 suffix for CBLAS by
    @mkrainiuk in PR 846

    Revert "Add Index-64 API as extended API with _64 suffix for CBLAS"
    by @langou in PR 856

    Add Index-64 API as extended API with _64 suffix for CBLAS by
    @mkrainiuk in PR 867

    Create DOCS/CBLAS.md by @mkrainiuk in PR 863

    Reduce number of macros in fortran compilation line for BLAS _64
    API by @mkrainiuk in PR 861

Bug fixes and other changes

    Windows build fix by @ACSimon33 in PR 760

    Added option to enable flat namespace on macOS by @ACSimon33 in PR 762

    Fix bug in new test case for LAPACK 3.11 SLATRS3 by @dklyuchinskiy
    in PR 755

    Check for NaNs in *GECON by @weslleyspereira in PR 765

    Fixed bug in array bounds in complex syl01 test by @dklyuchinskiyin
    PR 758

    Fix uninitialized M when quick return in DLARRD and SLARRD by
    @akobotov in PR 769

    In LAPACKE tgsen, allocate iwork when ijob = 0. Fixes #772. by
    @mgates3 in PR 773

    Fix SLATRS3 and CLATRS3 tests by @bartoldeman in PR 764

    Fix uninitialized out variables in LARR functions by @echeresh in
    PR 775

    Warnings supression in some LAPACKE functions by @jgpallero in PR 780

    Revert "Warnings supression in some LAPACKE functions" by @langou
    in PR 781

    Warnings supression and deletion of unnecessary check in some LAPACKE
    xLARFB functions by @jgpallero in PR 782

    remove redundant space from xerbla call sbgv/hbgv by @dklyuchinskiy
    in PR 792

    don’t subtract N_DEFLATED from istop twice by @thijssteel in PR 794

    fix rfp test for DIAG = U by @dklyuchinskiy in PR 796

    fix bug in complex precision tests (c|z)het21 by @EduardFedorenkov
    in PR 798

    CMake: Disable TEST_FORTRAN_COMPILER by @jschueller in PR 761

    Fix typos in documentation by @angsch in PR 750

    Add minimum permissions to workflows by @gabibguti in PR 804

    Add numerical tests for trevc3 by @angsch in PR 682

    Remove legacy function LABAD by @angsch in PR 805

    Refactor xGEBAL by @eprovst in PR 808

    Fix typos and errors in comments by @jip in PR 809

    cmake: allow setting a prefix for the library names by @joseeroman
    in PR 810

    Fix typos in comments by @jip in PR 811

    fix #813 by @langou in PR 814

    Replace the (partially defined) constant index variable INDIBL in
    ?SBGVX and related by @martin-frbg in PR 807

    CTGEVC, ZTGEVC: fix typo in description of VR argument by @svillemot
    in PR 812

    Add Security Policy by @gabibguti in PR 819

    typos by @musvaage in PR 820

    extend tests for error exit sysv sytd2 gehd2 by @dklyuchinskiy in
    PR 795

    CMake: avoid "make" in blas++ and lapack++ by @nim65s in PR 821

    appveyor: output test failures by @nim65s in PR 822

    Reference actions by commit SHA by @gabibguti in PR 829

    LAPACKE interfaces for [cz]unhr_col and [sd]orhr_col by @sknepper
    in PR 827

    fix segfault problem when executing LAPACKE_*geqrt on row major #766
    by @sbite0138 in PR 768

    Adds comment related to zero-sized matrix B in GELSY by
    @weslleyspereira in PR 833

    update brief descriptions of function purpose, Closes #230 by
    @weslleyspereira in PR 831

    Fix scaling in (S/D)TGSNA, fix #103, thanks to @elivanova by
    @weslleyspereira in PR 830

    Exits xLARUV when N < 1 by @weslleyspereira in PR 837

    Create GitHub action to test CMake build system on Windows by
    @weslleyspereira in PR 524

    Fix bug in lapacke_[s,d]geesx by @weslleyspereira in PR 836

    Removes unused SMIN from bdsqr by @weslleyspereira in PR 832

    Use a better (more informative) message when we say the compiler
    intr… by @weslleyspereira in PR 845

    Improve variants of Cholesky and QR by @angsch in PR 847

    fixes #848 by @jaganmn in PR 849

    Attempt to fix Appveyor on Windows by @angsch in PR 854

    fix dlasd0 / slasd0 documentation issue by @mtowara in PR 855

    Remove legacy warning for non IEEE 754 compliant machines by @angsch
    in PR 852

    Add verbose build to CI by @mkrainiuk in PR 858

    [cz]hetrd_hb2st.F, [sd]sytrd_sb2st.F OpenMP fixes by @chrwarm in
    PR 860

    new doxygen group structure by @mgates3 in PR 802

    Correct the order of returned eigenvalue and eigenvectors for 2x2
    matrices with IL=IU in C/D/S/Z/STEMR by @aravindh-krishnamoorthy in
    PR 867

    fix nrhs=0 case in ?gelss by @eaberendeev in PR 876

    Fix computation of uplo in LAPACKE_xlarfb by @vladimir-ch in PR 878

    Fix workspace query corner cases by @angsch in PR 883

    Fix actual arguments in some procedure calls by @mjacobse in PR 885

    Improve Cholesky variants by @angsch in PR 889

    Removes usage of Experimental (interactive) mode in ctest by
    @weslleyspereira in PR 892

    Updates the documentation of xGEMV and xGBMV related to when M=0
    and N=0 by @weslleyspereira in PR 843

    Add Scorecard by @gabibguti in PR 895

    Remove auxiliary GEQRS, GELQS by @angsch in PR 900

    CMake config for IntelLLVM (ifx) and NVIDIA HPC SDK (nvfortran)
    by @ACSimon33 in PR 898

    Fix build for CMake >= 3.27 by @scivision in PR 910

    allow absolute GNU install dirs by @chayleaf in PR 893

    dtgex2: add 2 to iwork length to prevent OOB interaction in Dtgsy2
    by @soypat in PR 907

    Adds OpenSSF Scorecard badge by @weslleyspereira in PR 896

    Fix issue #908 related to accumulation in xLASSQ by @weslleyspereira
    in PR 909

    Apply ROUNDUP_LWORK function in lapack by @kleineLi in PR 904

    Compilation of LAPACKE possibly independent from Fortran by
    @weslleyspereira in PR 834

    Always use C as linker language for CBLAS by @weslleyspereira in
    PR 920

    Uses Valgrind for ExperimentalMemCheck in ctest by @weslleyspereira
    in PR 844

    Adding in quotes in cmake for Intel ifx and linux build by @colleeneb
    in PR 922

    Fix complex BDSQR maxit by @pleshkovvli in PR 927

    xORBDB6/xUNBDB6: fix a constant by @christoph-conrads in PR 928

    Fixed Fortran preprocessor flag for NAG Fortran compiler by @ACSimon33
    in PR 939

    Fixed void main() for AppleClang by @ACSimon33 in PR 940


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/blas/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/blas64/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/cblas/Makefile pkgsrc/math/cblas/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/cblas64/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/math/lapack/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/math/lapack/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/lapack/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/math/lapack/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/lapack/version.mk
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/math/lapack/patches/patch-BLAS_SRC_CMakeLists.txt \
    pkgsrc/math/lapack/patches/patch-CBLAS_cblas.pc.in \
    pkgsrc/math/lapack/patches/patch-LAPACKE_CMakeLists.txt \
    pkgsrc/math/lapack/patches/patch-LAPACKE_lapacke.pc.in
cvs rdiff -u -r1.1 -r0 pkgsrc/math/lapack/patches/patch-CBLAS_CMakeLists.txt
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt \
    pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt
cvs rdiff -u -r1.5 -r0 pkgsrc/math/lapack/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/lapack/patches/patch-buildsystem-upstreamed
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/lapack64/Makefile \
    pkgsrc/math/lapack64/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/lapacke/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/lapacke/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/lapacke64/Makefile \
    pkgsrc/math/lapacke64/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/blas/PLIST
diff -u pkgsrc/math/blas/PLIST:1.6 pkgsrc/math/blas/PLIST:1.7
--- pkgsrc/math/blas/PLIST:1.6  Mon Oct 12 21:51:57 2020
+++ pkgsrc/math/blas/PLIST      Mon Jan  8 21:28:56 2024
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/10/12 21:51:57 bacon Exp $
-lib/libblas.a
+@comment $NetBSD: PLIST,v 1.7 2024/01/08 21:28:56 thor Exp $
 lib/libblas.so
 lib/libblas.so.3
 lib/libblas.so.${PKGVERSION}

Index: pkgsrc/math/blas64/PLIST
diff -u pkgsrc/math/blas64/PLIST:1.1 pkgsrc/math/blas64/PLIST:1.2
--- pkgsrc/math/blas64/PLIST:1.1        Tue Jun 15 04:41:51 2021
+++ pkgsrc/math/blas64/PLIST    Mon Jan  8 21:28:57 2024
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/06/15 04:41:51 thor Exp $
-lib/libblas64.a
+@comment $NetBSD: PLIST,v 1.2 2024/01/08 21:28:57 thor Exp $
 lib/libblas64.so
 lib/libblas64.so.3
 lib/libblas64.so.${PKGVERSION}

Index: pkgsrc/math/cblas/Makefile
diff -u pkgsrc/math/cblas/Makefile:1.4 pkgsrc/math/cblas/Makefile:1.5
--- pkgsrc/math/cblas/Makefile:1.4      Tue Nov 23 22:45:01 2021
+++ pkgsrc/math/cblas/Makefile  Mon Jan  8 21:28:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/11/23 22:45:01 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/01/08 21:28:57 thor Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
 COMMENT=       C interface to the reference BLAS library
@@ -11,6 +11,7 @@ LAPACK_COMPONENT_CMAKE_ARGS=  \
        -DCMAKE_VERBOSE=ON
 
 .include "../../math/blas/buildlink3.mk"
+BUILDLINK_API_DEPENDS.blas +=  blas>=${PKGVERSION_NOREV}
 
 .include "../../math/lapack/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/cblas/PLIST
diff -u pkgsrc/math/cblas/PLIST:1.4 pkgsrc/math/cblas/PLIST:1.5
--- pkgsrc/math/cblas/PLIST:1.4 Tue Nov 23 22:45:01 2021
+++ pkgsrc/math/cblas/PLIST     Mon Jan  8 21:28:57 2024
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2021/11/23 22:45:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2024/01/08 21:28:57 thor Exp $
 include/cblas.h
+include/cblas_64.h
 include/cblas_f77.h
 include/cblas_mangling.h
 include/netlib/cblas.h
+include/netlib/cblas_64.h
 include/netlib/cblas_f77.h
 include/netlib/cblas_mangling.h
-lib/libcblas.a
 lib/libcblas.so
 lib/libcblas.so.3
 lib/libcblas.so.${PKGVERSION}

Index: pkgsrc/math/cblas64/Makefile
diff -u pkgsrc/math/cblas64/Makefile:1.1 pkgsrc/math/cblas64/Makefile:1.2
--- pkgsrc/math/cblas64/Makefile:1.1    Tue Jun 15 04:41:52 2021
+++ pkgsrc/math/cblas64/Makefile        Mon Jan  8 21:28:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/06/15 04:41:52 thor Exp $
+# $NetBSD: Makefile,v 1.2 2024/01/08 21:28:57 thor Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
 COMMENT=       C interface to the reference BLAS with 64 bit indices
@@ -12,6 +12,7 @@ LAPACK_COMPONENT_CMAKE_ARGS=  \
        -DCMAKE_VERBOSE=ON
 
 .include "../../math/blas64/buildlink3.mk"
+BUILDLINK_API_DEPENDS.blas64   +=      blas64>=${PKGVERSION_NOREV}
 
 .include "../../math/lapack/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/lapack/Makefile
diff -u pkgsrc/math/lapack/Makefile:1.45 pkgsrc/math/lapack/Makefile:1.46
--- pkgsrc/math/lapack/Makefile:1.45    Tue Nov 23 22:45:01 2021
+++ pkgsrc/math/lapack/Makefile Mon Jan  8 21:28:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2021/11/23 22:45:01 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2024/01/08 21:28:55 thor Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
 COMMENT=       Linear Algebra PACKage (Netlib reference implementation)
@@ -14,5 +14,7 @@ LAPACK_COMPONENT_CMAKE_ARGS= \
 # their own LAPACK, hence cblas and lapacke packages use
 # mk/blas.buildlink3.mk instead.
 .include "../../math/blas/buildlink3.mk"
+# Always require the same current version of all netlib packages.
+BUILDLINK_API_DEPENDS.blas +=  blas>=${PKGVERSION_NOREV}
 .include "../../math/lapack/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/lapack/Makefile.common
diff -u pkgsrc/math/lapack/Makefile.common:1.18 pkgsrc/math/lapack/Makefile.common:1.19
--- pkgsrc/math/lapack/Makefile.common:1.18     Thu Aug  3 12:08:33 2023
+++ pkgsrc/math/lapack/Makefile.common  Mon Jan  8 21:28:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2023/08/03 12:08:33 tnn Exp $
+# $NetBSD: Makefile.common,v 1.19 2024/01/08 21:28:55 thor Exp $
 # used by math/blas/Makefile
 # used by math/cblas/Makefile
 # used by math/lapacke/Makefile
@@ -47,7 +47,6 @@ HEADERDIR=            netlib
 # shared libraries.
 CMAKE_ARGS=    -DBUILD_DEPRECATED=ON \
                -DBUILD_SHARED_LIBS=ON \
-               -DBUILD_STATIC_LIBS=ON \
                -DCMAKE_INSTALL_INCLUDEDIR=${PREFIX}/include/${HEADERDIR} \
                ${LAPACK_COMPONENT_CMAKE_ARGS}
 

Index: pkgsrc/math/lapack/PLIST
diff -u pkgsrc/math/lapack/PLIST:1.6 pkgsrc/math/lapack/PLIST:1.7
--- pkgsrc/math/lapack/PLIST:1.6        Thu Jun 10 00:18:52 2021
+++ pkgsrc/math/lapack/PLIST    Mon Jan  8 21:28:55 2024
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2021/06/10 00:18:52 thor Exp $
-lib/liblapack.a
+@comment $NetBSD: PLIST,v 1.7 2024/01/08 21:28:55 thor Exp $
 lib/liblapack.so
 lib/liblapack.so.3
 lib/liblapack.so.${PKGVERSION}

Index: pkgsrc/math/lapack/distinfo
diff -u pkgsrc/math/lapack/distinfo:1.34 pkgsrc/math/lapack/distinfo:1.35
--- pkgsrc/math/lapack/distinfo:1.34    Wed Jan  4 18:31:36 2023
+++ pkgsrc/math/lapack/distinfo Mon Jan  8 21:28:55 2024
@@ -1,14 +1,6 @@
-$NetBSD: distinfo,v 1.34 2023/01/04 18:31:36 wiz Exp $
+$NetBSD: distinfo,v 1.35 2024/01/08 21:28:55 thor Exp $
 
-BLAKE2s (lapack-3.11.0.tar.gz) = 6f24925d13cbaa1fd4c697bff222328d25314ec811a343302b1d9de9c219b382
-SHA512 (lapack-3.11.0.tar.gz) = fc3258b9d91a833149a68a89c5589b5113e90a8f9f41c3a73fbfccb1ecddd92d9462802c0f870f1c3dab392623452de4ef512727f5874ffdcba6a4845f78fc9a
-Size (lapack-3.11.0.tar.gz) = 7723808 bytes
-SHA1 (patch-BLAS_SRC_CMakeLists.txt) = 8773f93b1f907ed02d41677a3819f5bb655a331a
-SHA1 (patch-CBLAS_CMakeLists.txt) = e98060150ce7eec343e2465bcad2789be84016f9
-SHA1 (patch-CBLAS_cblas.pc.in) = cc97fbab08024220739929b5ad95c266965da06d
-SHA1 (patch-CBLAS_src_CMakeLists.txt) = 64abbfb4458943483fba8897df0c8bf62c3f949e
-SHA1 (patch-CMakeLists.txt) = de1d623f2571752a8ac70fa9d65734ba39770fc5
-SHA1 (patch-LAPACKE_CMakeLists.txt) = 13e4662585088aa53f61f7079d103fdfcf985c4e
-SHA1 (patch-LAPACKE_lapacke.pc.in) = 6bbd72205120501cd60daf0b22b00ef7979fb329
-SHA1 (patch-SRC_CMakeLists.txt) = 03bbccbd87334941650cab584469954153f610ed
-SHA1 (patch-TESTING_MATGEN_CMakeLists.txt) = 07946678945dba3a7752849791f12e0666345983
+BLAKE2s (lapack-3.12.0.tar.gz) = 825f0d9aa80ae124635784ef7801bf0e2232c27f4f1fec246fb978366ca41bf9
+SHA512 (lapack-3.12.0.tar.gz) = f8f3c733a0221be0b3f5618235408ac59cbd4e5f1c4eab5f509b831a6ec6a9ef14b8849aa6ea10810df1aff90186ca454d15e9438d1dd271c2449d42d3da9dda
+Size (lapack-3.12.0.tar.gz) = 7933607 bytes
+SHA1 (patch-buildsystem-upstreamed) = c1e59582c1344a3cb74cc682d9e8b7c10a4ebe61

Index: pkgsrc/math/lapack/version.mk
diff -u pkgsrc/math/lapack/version.mk:1.5 pkgsrc/math/lapack/version.mk:1.6
--- pkgsrc/math/lapack/version.mk:1.5   Wed Jan  4 18:31:36 2023
+++ pkgsrc/math/lapack/version.mk       Mon Jan  8 21:28:55 2024
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.5 2023/01/04 18:31:36 wiz Exp $
+# $NetBSD: version.mk,v 1.6 2024/01/08 21:28:55 thor Exp $
 
-NETLIB_BLAS_VERSION=   3.11.0
+NETLIB_BLAS_VERSION=   3.12.0

Index: pkgsrc/math/lapack64/Makefile
diff -u pkgsrc/math/lapack64/Makefile:1.1 pkgsrc/math/lapack64/Makefile:1.2
--- pkgsrc/math/lapack64/Makefile:1.1   Tue Jun 15 04:41:52 2021
+++ pkgsrc/math/lapack64/Makefile       Mon Jan  8 21:28:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/06/15 04:41:52 thor Exp $
+# $NetBSD: Makefile,v 1.2 2024/01/08 21:28:56 thor Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
 COMMENT=       Reference Linear Algebra PACKage with 64 bit indices
@@ -12,6 +12,7 @@ LAPACK_COMPONENT_CMAKE_ARGS= \
        -DCBLAS=OFF -DLAPACKE=OFF -DLAPACK=ON
 
 .include "../../math/blas64/buildlink3.mk"
+BUILDLINK_API_DEPENDS.blas64 +=        blas64>=${PKGVERSION_NOREV}
 
 .include "../../math/lapack/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/lapack64/PLIST
diff -u pkgsrc/math/lapack64/PLIST:1.1 pkgsrc/math/lapack64/PLIST:1.2
--- pkgsrc/math/lapack64/PLIST:1.1      Tue Jun 15 04:41:52 2021
+++ pkgsrc/math/lapack64/PLIST  Mon Jan  8 21:28:56 2024
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/06/15 04:41:52 thor Exp $
-lib/liblapack64.a
+@comment $NetBSD: PLIST,v 1.2 2024/01/08 21:28:56 thor Exp $
 lib/liblapack64.so
 lib/liblapack64.so.3
 lib/liblapack64.so.${PKGVERSION}

Index: pkgsrc/math/lapacke/Makefile
diff -u pkgsrc/math/lapacke/Makefile:1.4 pkgsrc/math/lapacke/Makefile:1.5
--- pkgsrc/math/lapacke/Makefile:1.4    Tue Nov 23 22:45:01 2021
+++ pkgsrc/math/lapacke/Makefile        Mon Jan  8 21:28:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/11/23 22:45:01 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/01/08 21:28:56 thor Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
 COMMENT=       C interface to the reference LAPACK library
@@ -12,6 +12,8 @@ LAPACK_COMPONENT_CMAKE_ARGS=  \
        -DCBLAS=OFF -DLAPACKE=ON
 
 .include "../../math/lapack/buildlink3.mk"
+BUILDLINK_API_DEPENDS.blas     +=      blas>=${PKGVERSION_NOREV}
+BUILDLINK_API_DEPENDS.lapack   +=      lapack>=${PKGVERSION_NOREV}
 
 .include "../../math/lapack/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/lapacke/PLIST
diff -u pkgsrc/math/lapacke/PLIST:1.3 pkgsrc/math/lapacke/PLIST:1.4
--- pkgsrc/math/lapacke/PLIST:1.3       Tue Jun 15 04:41:52 2021
+++ pkgsrc/math/lapacke/PLIST   Mon Jan  8 21:28:56 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/06/15 04:41:52 thor Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/01/08 21:28:56 thor Exp $
 include/lapack.h
 include/lapacke.h
 include/lapacke_config.h
@@ -9,7 +9,6 @@ include/netlib/lapacke.h
 include/netlib/lapacke_config.h
 include/netlib/lapacke_mangling.h
 include/netlib/lapacke_utils.h
-lib/liblapacke.a
 lib/liblapacke.so
 lib/liblapacke.so.3
 lib/liblapacke.so.${PKGVERSION}

Index: pkgsrc/math/lapacke64/Makefile
diff -u pkgsrc/math/lapacke64/Makefile:1.1 pkgsrc/math/lapacke64/Makefile:1.2
--- pkgsrc/math/lapacke64/Makefile:1.1  Tue Jun 15 04:41:52 2021
+++ pkgsrc/math/lapacke64/Makefile      Mon Jan  8 21:28:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/06/15 04:41:52 thor Exp $
+# $NetBSD: Makefile,v 1.2 2024/01/08 21:28:56 thor Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
 COMMENT=       C interface to the reference LAPACK with 64 bit indices
@@ -13,6 +13,8 @@ LAPACK_COMPONENT_CMAKE_ARGS=  \
        -DCBLAS=OFF -DLAPACKE=ON
 
 .include "../../math/lapack64/buildlink3.mk"
+BUILDLINK_API_DEPENDS.blas64   +=      blas64>=${PKGVERSION_NOREV}
+BUILDLINK_API_DEPENDS.lapack64 +=      lapack64>=${PKGVERSION_NOREV}
 
 .include "../../math/lapack/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/lapacke64/PLIST
diff -u pkgsrc/math/lapacke64/PLIST:1.1 pkgsrc/math/lapacke64/PLIST:1.2
--- pkgsrc/math/lapacke64/PLIST:1.1     Tue Jun 15 04:41:52 2021
+++ pkgsrc/math/lapacke64/PLIST Mon Jan  8 21:28:56 2024
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2021/06/15 04:41:52 thor Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/01/08 21:28:56 thor Exp $
 include/netlib64/lapack.h
 include/netlib64/lapacke.h
 include/netlib64/lapacke_config.h
 include/netlib64/lapacke_mangling.h
 include/netlib64/lapacke_utils.h
-lib/liblapacke64.a
 lib/liblapacke64.so
 lib/liblapacke64.so.3
 lib/liblapacke64.so.${PKGVERSION}

Added files:

Index: pkgsrc/math/lapack/patches/patch-buildsystem-upstreamed
diff -u /dev/null pkgsrc/math/lapack/patches/patch-buildsystem-upstreamed:1.1
--- /dev/null   Mon Jan  8 21:28:57 2024
+++ pkgsrc/math/lapack/patches/patch-buildsystem-upstreamed     Mon Jan  8 21:28:56 2024
@@ -0,0 +1,140 @@
+$NetBSD: patch-buildsystem-upstreamed,v 1.1 2024/01/08 21:28:56 thor Exp $
+
+A changeset that I pushed upstream in a PR, to enable separate libblas build,
+un-break standalone CBLAS build with included BLAS, not unconditionally
+require unnecessary C++ compiler.
+
+See: https://github.com/Reference-LAPACK/lapack/pull/972
+
+diff --git a/BLAS/CMakeLists.txt b/BLAS/CMakeLists.txt
+index a33f38f25..8e34fa858 100644
+--- BLAS/CMakeLists.txt
++++ BLAS/CMakeLists.txt
+@@ -14,3 +14,8 @@ install(FILES
+   DESTINATION ${PKG_CONFIG_DIR}
+   COMPONENT Development
+   )
++
++install(EXPORT ${BLASLIB}-targets
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${BLASLIB}-${LAPACK_VERSION}
++  COMPONENT Development
++  )
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c3818db5..279286393 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 3.6)
+ 
+-project(LAPACK)
++project(LAPACK Fortran C)
+ 
+ set(LAPACK_MAJOR_VERSION 3)
+ set(LAPACK_MINOR_VERSION 12)
+@@ -245,8 +245,12 @@ endif()
+ # Neither user specified or optimized BLAS libraries can be used
+ if(NOT BLAS_FOUND)
+   message(STATUS "Using supplied NETLIB BLAS implementation")
++  set(LAPACK_INSTALL_EXPORT_NAME_CACHE ${LAPACK_INSTALL_EXPORT_NAME})
++  set(LAPACK_INSTALL_EXPORT_NAME ${BLASLIB}-targets)
+   add_subdirectory(BLAS)
+   set(BLAS_LIBRARIES ${BLASLIB})
++  set(LAPACK_INSTALL_EXPORT_NAME ${LAPACK_INSTALL_EXPORT_NAME_CACHE})
++  unset(LAPACK_INSTALL_EXPORT_NAME_CACHE)
+ else()
+   set(CMAKE_EXE_LINKER_FLAGS
+     "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
+@@ -278,6 +282,10 @@ endif()
+ 
+ option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
+ 
++option(LAPACK "Whether to build or use LAPACK (to enable a BLAS-only build)")
++
++if(LAPACK)
++
+ # --------------------------------------------------
+ # LAPACK
+ # User did not provide a LAPACK Library but specified to search for one
+@@ -349,6 +357,8 @@ else()
+     CACHE STRING "Linker flags for shared libs" FORCE)
+ endif()
+ 
++endif()
++
+ if(BUILD_TESTING)
+   add_subdirectory(TESTING)
+ endif()
+@@ -414,6 +424,7 @@ function(_display_cpp_implementation_msg name)
+   message(STATUS "----------------")
+ endfunction()
+ if (BLAS++)
++  enable_language(CXX)
+   _display_cpp_implementation_msg("BLAS")
+   include(ExternalProject)
+   ExternalProject_Add(blaspp
+@@ -425,6 +436,7 @@ if (BLAS++)
+   ExternalProject_Add_StepDependencies(blaspp build ${BLAS_LIBRARIES})
+ endif()
+ if (LAPACK++)
++  enable_language(CXX)
+       message (STATUS "linking lapack++ against ${LAPACK_LIBRARIES}")
+   _display_cpp_implementation_msg("LAPACK")
+   include(ExternalProject)
+@@ -483,10 +495,14 @@ if(NOT BLAS_FOUND)
+   set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB})
+ endif()
+ 
++if(LAPACK)
+ if(NOT LATESTLAPACK_FOUND)
+   set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKLIB})
++  set(BUILD_LAPACK ON)
++endif()
+ endif()
+ 
++if(LAPACK)
+ # Export lapack targets, not including lapacke, from the
+ # install tree, if any.
+ set(_lapack_config_install_guard_target "")
+@@ -500,6 +516,7 @@ if(ALL_TARGETS)
+   # lapack-config.cmake to load targets from the install tree.
+   list(GET ALL_TARGETS 0 _lapack_config_install_guard_target)
+ endif()
++endif()
+ 
+ # Include cblas in targets exported from the build tree.
+ if(CBLAS)
+@@ -515,6 +532,8 @@ if(NOT LAPACK_WITH_TMGLIB_FOUND AND LAPACKE_WITH_TMG)
+   set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB})
+ endif()
+ 
++if(BUILD_LAPACK)
++
+ # Export lapack and lapacke targets from the build tree, if any.
+ set(_lapack_config_build_guard_target "")
+ if(ALL_TARGETS)
+@@ -552,6 +571,9 @@ install(FILES
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION}
+   COMPONENT Development
+   )
++
++endif() # BUILD_LAPACK
++
+ if (LAPACK++)
+   install(
+   DIRECTORY "${LAPACK_BINARY_DIR}/lib/"
+@@ -563,6 +585,7 @@ if (LAPACK++)
+     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+     FILES_MATCHING REGEX "\\.(h|hh)$"
+   )
++  include(CMakePackageConfigHelpers)
+   write_basic_package_version_file(
+     "lapackppConfigVersion.cmake"
+     VERSION 2020.10.02
+@@ -576,6 +599,7 @@ if (LAPACK++)
+ 
+ endif()
+ if (BLAS++)
++  include(CMakePackageConfigHelpers)
+   write_basic_package_version_file(
+     "blasppConfigVersion.cmake"
+     VERSION 2020.10.02

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index