CVS commit: pkgsrc/math

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/math
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 23 Nov 2021 22:45:02 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Nov 23 22:45:01 UTC 2021

Modified Files:
        pkgsrc/math/blas64: Makefile
        pkgsrc/math/cblas: Makefile PLIST
        pkgsrc/math/cblas64: PLIST
        pkgsrc/math/lapack: Makefile distinfo version.mk
        pkgsrc/math/lapack/patches: patch-CMakeLists.txt
        pkgsrc/math/lapacke: Makefile
Added Files:
        pkgsrc/math/lapack/patches: patch-CBLAS_CMakeLists.txt

Log Message:
lapack: update lapack*, cblas*, and blas* to 3.10.0

This is a major release and also addressing multiple bug fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/blas64/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/cblas/Makefile pkgsrc/math/cblas/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/cblas64/PLIST
cvs rdiff -u -r1.44 -r1.45 pkgsrc/math/lapack/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/math/lapack/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/lapack/version.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/math/lapack/patches/patch-CBLAS_CMakeLists.txt
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/lapack/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/lapacke/Makefile

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

Modified files:

Index: pkgsrc/math/blas64/Makefile
diff -u pkgsrc/math/blas64/Makefile:1.1 pkgsrc/math/blas64/Makefile:1.2
--- pkgsrc/math/blas64/Makefile:1.1     Tue Jun 15 04:41:51 2021
+++ pkgsrc/math/blas64/Makefile Tue Nov 23 22:45:01 2021
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/06/15 04:41:51 thor Exp $
-
+# $NetBSD: Makefile,v 1.2 2021/11/23 22:45:01 wiz Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
 COMMENT=       Reference Basic Linear Algebra System with 64 bit indices

Index: pkgsrc/math/cblas/Makefile
diff -u pkgsrc/math/cblas/Makefile:1.3 pkgsrc/math/cblas/Makefile:1.4
--- pkgsrc/math/cblas/Makefile:1.3      Tue Jun 15 04:41:52 2021
+++ pkgsrc/math/cblas/Makefile  Tue Nov 23 22:45:01 2021
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2021/06/15 04:41:52 thor Exp $
+# $NetBSD: Makefile,v 1.4 2021/11/23 22:45:01 wiz Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
 COMMENT=       C interface to the reference BLAS library
-PKGREVISION=   1
 
 LAPACK_COMPONENT=      cblas
 LAPACK_COMPONENT_CMAKE_ARGS=   \
Index: pkgsrc/math/cblas/PLIST
diff -u pkgsrc/math/cblas/PLIST:1.3 pkgsrc/math/cblas/PLIST:1.4
--- pkgsrc/math/cblas/PLIST:1.3 Tue Jun 15 04:41:52 2021
+++ pkgsrc/math/cblas/PLIST     Tue Nov 23 22:45:01 2021
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2021/06/15 04:41:52 thor Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/11/23 22:45:01 wiz Exp $
 include/cblas.h
 include/cblas_f77.h
 include/cblas_mangling.h
-include/cblas_test.h
 include/netlib/cblas.h
 include/netlib/cblas_f77.h
 include/netlib/cblas_mangling.h
-include/netlib/cblas_test.h
 lib/libcblas.a
 lib/libcblas.so
 lib/libcblas.so.3

Index: pkgsrc/math/cblas64/PLIST
diff -u pkgsrc/math/cblas64/PLIST:1.1 pkgsrc/math/cblas64/PLIST:1.2
--- pkgsrc/math/cblas64/PLIST:1.1       Tue Jun 15 04:41:52 2021
+++ pkgsrc/math/cblas64/PLIST   Tue Nov 23 22:45:01 2021
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2021/06/15 04:41:52 thor Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/11/23 22:45:01 wiz Exp $
 include/netlib64/cblas.h
 include/netlib64/cblas_f77.h
 include/netlib64/cblas_mangling.h
-include/netlib64/cblas_test.h
 lib/libcblas64.a
 lib/libcblas64.so
 lib/libcblas64.so.3

Index: pkgsrc/math/lapack/Makefile
diff -u pkgsrc/math/lapack/Makefile:1.44 pkgsrc/math/lapack/Makefile:1.45
--- pkgsrc/math/lapack/Makefile:1.44    Thu Jun 10 00:18:52 2021
+++ pkgsrc/math/lapack/Makefile Tue Nov 23 22:45:01 2021
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2021/06/10 00:18:52 thor Exp $
+# $NetBSD: Makefile,v 1.45 2021/11/23 22:45:01 wiz Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
 COMMENT=       Linear Algebra PACKage (Netlib reference implementation)
-PKGREVISION=   1
 
 LAPACK_COMPONENT=      lapack
 LAPACK_COMPONENT_CMAKE_ARGS= \

Index: pkgsrc/math/lapack/distinfo
diff -u pkgsrc/math/lapack/distinfo:1.30 pkgsrc/math/lapack/distinfo:1.31
--- pkgsrc/math/lapack/distinfo:1.30    Tue Oct 26 10:55:46 2021
+++ pkgsrc/math/lapack/distinfo Tue Nov 23 22:45:01 2021
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.30 2021/10/26 10:55:46 nia Exp $
+$NetBSD: distinfo,v 1.31 2021/11/23 22:45:01 wiz Exp $
 
-BLAKE2s (lapack-3.9.1.tar.gz) = fe6fd47467781dfd9da6c1e521c9f4810b79874bb4df83f0f723a286f555f214
-SHA512 (lapack-3.9.1.tar.gz) = 1c70892ce22eb1f5c0be1e0384d00dc876622e6254e853616eb7c0379c5d1ecf2f1f94d06389dbfba06b78484daf625d899306a9dc0b31a0646320c814022fdb
-Size (lapack-3.9.1.tar.gz) = 7543209 bytes
+BLAKE2s (lapack-3.10.0.tar.gz) = 57d4953533000589bcf9a478d827dbd5fd0dca18094d30e02b9bd67a21197f00
+SHA512 (lapack-3.10.0.tar.gz) = 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf
+Size (lapack-3.10.0.tar.gz) = 7630775 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) = 3c8e9125f164625198fb7197982746f43bf4aab5
+SHA1 (patch-CMakeLists.txt) = de1d623f2571752a8ac70fa9d65734ba39770fc5
 SHA1 (patch-LAPACKE_CMakeLists.txt) = 13e4662585088aa53f61f7079d103fdfcf985c4e
 SHA1 (patch-LAPACKE_lapacke.pc.in) = 6bbd72205120501cd60daf0b22b00ef7979fb329
 SHA1 (patch-SRC_CMakeLists.txt) = c0e22574e0c7ff6535c95a6f1f85903bbc1751b0

Index: pkgsrc/math/lapack/version.mk
diff -u pkgsrc/math/lapack/version.mk:1.2 pkgsrc/math/lapack/version.mk:1.3
--- pkgsrc/math/lapack/version.mk:1.2   Wed May 12 14:32:51 2021
+++ pkgsrc/math/lapack/version.mk       Tue Nov 23 22:45:01 2021
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.2 2021/05/12 14:32:51 thor Exp $
+# $NetBSD: version.mk,v 1.3 2021/11/23 22:45:01 wiz Exp $
 
-NETLIB_BLAS_VERSION=   3.9.1
+NETLIB_BLAS_VERSION=   3.10.0

Index: pkgsrc/math/lapack/patches/patch-CMakeLists.txt
diff -u pkgsrc/math/lapack/patches/patch-CMakeLists.txt:1.4 pkgsrc/math/lapack/patches/patch-CMakeLists.txt:1.5
--- pkgsrc/math/lapack/patches/patch-CMakeLists.txt:1.4 Mon May 17 11:31:29 2021
+++ pkgsrc/math/lapack/patches/patch-CMakeLists.txt     Tue Nov 23 22:45:01 2021
@@ -1,12 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2021/05/17 11:31:29 thor Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2021/11/23 22:45:01 wiz Exp $
 
 Avoid installation of LAPACK CMake and pkg-config files when not installing
 LAPACK, also allowing explicitly to switch off LAPACK build for BLAS-only
 packaging.
 
---- CMakeLists.txt.orig        2021-03-25 18:25:15.000000000 +0000
+--- CMakeLists.txt.orig        2021-06-28 16:39:12.000000000 +0000
 +++ CMakeLists.txt
-@@ -160,6 +160,9 @@ endif()
+@@ -157,6 +157,9 @@ endif()
  
  
  # --------------------------------------------------
@@ -16,7 +16,7 @@ packaging.
  set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets)
  
  macro(lapack_install_library lib)
-@@ -171,6 +174,18 @@ macro(lapack_install_library lib)
+@@ -168,6 +171,18 @@ macro(lapack_install_library lib)
    )
  endmacro()
  
@@ -35,7 +35,7 @@ packaging.
  set(PKG_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
  
  # --------------------------------------------------
-@@ -301,6 +316,10 @@ endif()
+@@ -298,6 +313,10 @@ endif()
  
  option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
  
@@ -46,7 +46,7 @@ packaging.
  # --------------------------------------------------
  # LAPACK
  # User did not provide a LAPACK Library but specified to search for one
-@@ -342,6 +361,8 @@ else()
+@@ -339,6 +358,8 @@ else()
      CACHE STRING "Linker flags for shared libs" FORCE)
  endif()
  
@@ -55,7 +55,7 @@ packaging.
  if(BUILD_TESTING)
    add_subdirectory(TESTING)
  endif()
-@@ -450,14 +471,18 @@ if(NOT BLAS_FOUND)
+@@ -464,10 +485,14 @@ if(NOT BLAS_FOUND)
    set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB})
  endif()
  
@@ -66,15 +66,11 @@ packaging.
 +endif()
  endif()
  
- if(BUILD_TESTING OR LAPACKE_WITH_TMG)
-   set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB})
- endif()
- 
 +if(LAPACK)
  # Export lapack targets, not including lapacke, from the
  # install tree, if any.
  set(_lapack_config_install_guard_target "")
-@@ -471,6 +496,7 @@ if(ALL_TARGETS)
+@@ -481,6 +506,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()
@@ -82,8 +78,8 @@ packaging.
  
  # Include cblas in targets exported from the build tree.
  if(CBLAS)
-@@ -482,6 +508,8 @@ if(LAPACKE)
-   set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKELIB})
+@@ -496,6 +522,8 @@ if(NOT LAPACK_WITH_TMGLIB_FOUND AND LAPA
+   set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB})
  endif()
  
 +if(BUILD_LAPACK)
@@ -91,7 +87,7 @@ packaging.
  # Export lapack and lapacke targets from the build tree, if any.
  set(_lapack_config_build_guard_target "")
  if(ALL_TARGETS)
-@@ -519,6 +547,9 @@ install(FILES
+@@ -533,6 +561,9 @@ install(FILES
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION}
    COMPONENT Development
    )

Index: pkgsrc/math/lapacke/Makefile
diff -u pkgsrc/math/lapacke/Makefile:1.3 pkgsrc/math/lapacke/Makefile:1.4
--- pkgsrc/math/lapacke/Makefile:1.3    Tue Jun 15 04:41:52 2021
+++ pkgsrc/math/lapacke/Makefile        Tue Nov 23 22:45:01 2021
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2021/06/15 04:41:52 thor Exp $
+# $NetBSD: Makefile,v 1.4 2021/11/23 22:45:01 wiz Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
 COMMENT=       C interface to the reference LAPACK library
-PKGREVISION=   2
 
 LAPACK_COMPONENT=      lapacke
 LAPACK_COMPONENT_CMAKE_ARGS=   \

Added files:

Index: pkgsrc/math/lapack/patches/patch-CBLAS_CMakeLists.txt
diff -u /dev/null pkgsrc/math/lapack/patches/patch-CBLAS_CMakeLists.txt:1.1
--- /dev/null   Tue Nov 23 22:45:02 2021
+++ pkgsrc/math/lapack/patches/patch-CBLAS_CMakeLists.txt       Tue Nov 23 22:45:01 2021
@@ -0,0 +1,19 @@
+$NetBSD: patch-CBLAS_CMakeLists.txt,v 1.1 2021/11/23 22:45:01 wiz Exp $
+
+Without this, math/cblas fails configuring with:
+CMake Error: INSTALL(EXPORT) given unknown export "cblas-targets"                                                                                     
+
+--- CBLAS/CMakeLists.txt.orig  2021-06-28 16:39:12.000000000 +0000
++++ CBLAS/CMakeLists.txt
+@@ -66,7 +66,7 @@ install(FILES
+   COMPONENT Development
+   )
+ 
+-install(EXPORT ${CBLASLIB}-targets
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
+-  COMPONENT Development
+-  )
++#install(EXPORT ${CBLASLIB}-targets
++#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
++#  COMPONENT Development
++#  )

Prev by Date: CVS commit: [pkgsrc-2021Q3] pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: [pkgsrc-2021Q3] pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index