[crux-commits] ports/contrib (3.7): suitesparse: 5.13.0 -> 6.0.0

commit acc53de5bc9b15c951495913f60a0cc219f6ac78 Author: Tim Biermann <tbier@posteo.de> Date: Sat Nov 12 11:27:34 2022 +0000 suitesparse: 5.13.0 -> 6.0.0 diff --git a/suitesparse/.footprint b/suitesparse/.footprint index 919665dca..2759c57e0 100644 --- a/suitesparse/.footprint +++ b/suitesparse/.footprint @@ -1,7 +1,11 @@ drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/mongoose drwxr-xr-x root/root usr/include/ +-rw-r--r-- root/root usr/include/GraphBLAS.h +-rw-r--r-- root/root usr/include/Mongoose.hpp -rw-r--r-- root/root usr/include/RBio.h --rw-r--r-- root/root usr/include/SLIP_LU.h +-rw-r--r-- root/root usr/include/SPEX.h -rw-r--r-- root/root usr/include/SuiteSparseQR.hpp -rw-r--r-- root/root usr/include/SuiteSparseQR_C.h -rw-r--r-- root/root usr/include/SuiteSparseQR_definitions.h @@ -11,100 +15,108 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/camd.h -rw-r--r-- root/root usr/include/ccolamd.h -rw-r--r-- root/root usr/include/cholmod.h --rw-r--r-- root/root usr/include/cholmod_blas.h --rw-r--r-- root/root usr/include/cholmod_camd.h --rw-r--r-- root/root usr/include/cholmod_check.h --rw-r--r-- root/root usr/include/cholmod_cholesky.h --rw-r--r-- root/root usr/include/cholmod_complexity.h --rw-r--r-- root/root usr/include/cholmod_config.h --rw-r--r-- root/root usr/include/cholmod_core.h --rw-r--r-- root/root usr/include/cholmod_function.h --rw-r--r-- root/root usr/include/cholmod_gpu.h --rw-r--r-- root/root usr/include/cholmod_gpu_kernels.h --rw-r--r-- root/root usr/include/cholmod_io64.h --rw-r--r-- root/root usr/include/cholmod_matrixops.h --rw-r--r-- root/root usr/include/cholmod_modify.h --rw-r--r-- root/root usr/include/cholmod_partition.h --rw-r--r-- root/root usr/include/cholmod_supernodal.h --rw-r--r-- root/root usr/include/cholmod_template.h -rw-r--r-- root/root usr/include/colamd.h -rw-r--r-- root/root usr/include/cs.h -rw-r--r-- root/root usr/include/klu.h +-rw-r--r-- root/root usr/include/klu_cholmod.h -rw-r--r-- root/root usr/include/ldl.h --rw-r--r-- root/root usr/include/spqr.hpp -rw-r--r-- root/root usr/include/umfpack.h --rw-r--r-- root/root usr/include/umfpack_col_to_triplet.h --rw-r--r-- root/root usr/include/umfpack_defaults.h --rw-r--r-- root/root usr/include/umfpack_free_numeric.h --rw-r--r-- root/root usr/include/umfpack_free_symbolic.h --rw-r--r-- root/root usr/include/umfpack_get_determinant.h --rw-r--r-- root/root usr/include/umfpack_get_lunz.h --rw-r--r-- root/root usr/include/umfpack_get_numeric.h --rw-r--r-- root/root usr/include/umfpack_get_symbolic.h --rw-r--r-- root/root usr/include/umfpack_global.h --rw-r--r-- root/root usr/include/umfpack_load_numeric.h --rw-r--r-- root/root usr/include/umfpack_load_symbolic.h --rw-r--r-- root/root usr/include/umfpack_numeric.h --rw-r--r-- root/root usr/include/umfpack_qsymbolic.h --rw-r--r-- root/root usr/include/umfpack_report_control.h --rw-r--r-- root/root usr/include/umfpack_report_info.h --rw-r--r-- root/root usr/include/umfpack_report_matrix.h --rw-r--r-- root/root usr/include/umfpack_report_numeric.h --rw-r--r-- root/root usr/include/umfpack_report_perm.h --rw-r--r-- root/root usr/include/umfpack_report_status.h --rw-r--r-- root/root usr/include/umfpack_report_symbolic.h --rw-r--r-- root/root usr/include/umfpack_report_triplet.h --rw-r--r-- root/root usr/include/umfpack_report_vector.h --rw-r--r-- root/root usr/include/umfpack_save_numeric.h --rw-r--r-- root/root usr/include/umfpack_save_symbolic.h --rw-r--r-- root/root usr/include/umfpack_scale.h --rw-r--r-- root/root usr/include/umfpack_solve.h --rw-r--r-- root/root usr/include/umfpack_symbolic.h --rw-r--r-- root/root usr/include/umfpack_tictoc.h --rw-r--r-- root/root usr/include/umfpack_timer.h --rw-r--r-- root/root usr/include/umfpack_transpose.h --rw-r--r-- root/root usr/include/umfpack_triplet_to_col.h --rw-r--r-- root/root usr/include/umfpack_wsolve.h -drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libamd.so -> libamd.so.2.4.6 -lrwxrwxrwx root/root usr/lib/libamd.so.2 -> libamd.so.2.4.6 --rwxr-xr-x root/root usr/lib/libamd.so.2.4.6 -lrwxrwxrwx root/root usr/lib/libbtf.so -> libbtf.so.1.2.6 -lrwxrwxrwx root/root usr/lib/libbtf.so.1 -> libbtf.so.1.2.6 --rwxr-xr-x root/root usr/lib/libbtf.so.1.2.6 -lrwxrwxrwx root/root usr/lib/libcamd.so -> libcamd.so.2.4.6 -lrwxrwxrwx root/root usr/lib/libcamd.so.2 -> libcamd.so.2.4.6 --rwxr-xr-x root/root usr/lib/libcamd.so.2.4.6 -lrwxrwxrwx root/root usr/lib/libccolamd.so -> libccolamd.so.2.9.6 -lrwxrwxrwx root/root usr/lib/libccolamd.so.2 -> libccolamd.so.2.9.6 --rwxr-xr-x root/root usr/lib/libccolamd.so.2.9.6 -lrwxrwxrwx root/root usr/lib/libcholmod.so -> libcholmod.so.3.0.14 -lrwxrwxrwx root/root usr/lib/libcholmod.so.3 -> libcholmod.so.3.0.14 --rwxr-xr-x root/root usr/lib/libcholmod.so.3.0.14 -lrwxrwxrwx root/root usr/lib/libcolamd.so -> libcolamd.so.2.9.6 -lrwxrwxrwx root/root usr/lib/libcolamd.so.2 -> libcolamd.so.2.9.6 --rwxr-xr-x root/root usr/lib/libcolamd.so.2.9.6 -lrwxrwxrwx root/root usr/lib/libcxsparse.so -> libcxsparse.so.3.2.0 -lrwxrwxrwx root/root usr/lib/libcxsparse.so.3 -> libcxsparse.so.3.2.0 --rwxr-xr-x root/root usr/lib/libcxsparse.so.3.2.0 -lrwxrwxrwx root/root usr/lib/libklu.so -> libklu.so.1.3.8 -lrwxrwxrwx root/root usr/lib/libklu.so.1 -> libklu.so.1.3.8 --rwxr-xr-x root/root usr/lib/libklu.so.1.3.8 -lrwxrwxrwx root/root usr/lib/libldl.so -> libldl.so.2.2.6 -lrwxrwxrwx root/root usr/lib/libldl.so.2 -> libldl.so.2.2.6 --rwxr-xr-x root/root usr/lib/libldl.so.2.2.6 -lrwxrwxrwx root/root usr/lib/librbio.so -> librbio.so.2.2.6 -lrwxrwxrwx root/root usr/lib/librbio.so.2 -> librbio.so.2.2.6 --rwxr-xr-x root/root usr/lib/librbio.so.2.2.6 -lrwxrwxrwx root/root usr/lib/libsliplu.so -> libsliplu.so.1.0.2 -lrwxrwxrwx root/root usr/lib/libsliplu.so.1 -> libsliplu.so.1.0.2 --rwxr-xr-x root/root usr/lib/libsliplu.so.1.0.2 -lrwxrwxrwx root/root usr/lib/libspqr.so -> libspqr.so.2.1.0 -lrwxrwxrwx root/root usr/lib/libspqr.so.2 -> libspqr.so.2.1.0 --rwxr-xr-x root/root usr/lib/libspqr.so.2.1.0 -lrwxrwxrwx root/root usr/lib/libsuitesparseconfig.so -> libsuitesparseconfig.so.5.13.0 -lrwxrwxrwx root/root usr/lib/libsuitesparseconfig.so.5 -> libsuitesparseconfig.so.5.13.0 --rwxr-xr-x root/root usr/lib/libsuitesparseconfig.so.5.13.0 -lrwxrwxrwx root/root usr/lib/libumfpack.so -> libumfpack.so.5.7.9 -lrwxrwxrwx root/root usr/lib/libumfpack.so.5 -> libumfpack.so.5.7.9 --rwxr-xr-x root/root usr/lib/libumfpack.so.5.7.9 +drwxr-xr-x root/root usr/lib64/ +drwxr-xr-x root/root usr/lib64/cmake/ +drwxr-xr-x root/root usr/lib64/cmake/SuiteSparse/ +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindAMD.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindBTF.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindCAMD.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindCCOLAMD.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindCHOLMOD.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindCHOLMOD_CUDA.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindCOLAMD.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindCXSparse.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindGPUQREngine.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindGraphBLAS.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindKLU.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindKLU_CHOLMOD.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindLDL.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindMongoose.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindRBio.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindSPEX.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindSPQR.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindSPQR_CUDA.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindSuiteSparse_GPURuntime.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindSuiteSparse_config.cmake +-rw-r--r-- root/root usr/lib64/cmake/SuiteSparse/FindUMFPACK.cmake +-rw-r--r-- root/root usr/lib64/libamd.a +lrwxrwxrwx root/root usr/lib64/libamd.so -> libamd.so.3 +lrwxrwxrwx root/root usr/lib64/libamd.so.3 -> libamd.so.3.0.0 +-rwxr-xr-x root/root usr/lib64/libamd.so.3.0.0 +-rw-r--r-- root/root usr/lib64/libbtf.a +lrwxrwxrwx root/root usr/lib64/libbtf.so -> libbtf.so.2 +lrwxrwxrwx root/root usr/lib64/libbtf.so.2 -> libbtf.so.2.0.0 +-rwxr-xr-x root/root usr/lib64/libbtf.so.2.0.0 +-rw-r--r-- root/root usr/lib64/libcamd.a +lrwxrwxrwx root/root usr/lib64/libcamd.so -> libcamd.so.3 +lrwxrwxrwx root/root usr/lib64/libcamd.so.3 -> libcamd.so.3.0.0 +-rwxr-xr-x root/root usr/lib64/libcamd.so.3.0.0 +-rw-r--r-- root/root usr/lib64/libccolamd.a +lrwxrwxrwx root/root usr/lib64/libccolamd.so -> libccolamd.so.3 +lrwxrwxrwx root/root usr/lib64/libccolamd.so.3 -> libccolamd.so.3.0.0 +-rwxr-xr-x root/root usr/lib64/libccolamd.so.3.0.0 +-rw-r--r-- root/root usr/lib64/libcholmod.a +lrwxrwxrwx root/root usr/lib64/libcholmod.so -> libcholmod.so.4 +lrwxrwxrwx root/root usr/lib64/libcholmod.so.4 -> libcholmod.so.4.0.1 +-rwxr-xr-x root/root usr/lib64/libcholmod.so.4.0.1 +-rw-r--r-- root/root usr/lib64/libcolamd.a +lrwxrwxrwx root/root usr/lib64/libcolamd.so -> libcolamd.so.3 +lrwxrwxrwx root/root usr/lib64/libcolamd.so.3 -> libcolamd.so.3.0.0 +-rwxr-xr-x root/root usr/lib64/libcolamd.so.3.0.0 +-rw-r--r-- root/root usr/lib64/libcxsparse.a +lrwxrwxrwx root/root usr/lib64/libcxsparse.so -> libcxsparse.so.4 +lrwxrwxrwx root/root usr/lib64/libcxsparse.so.4 -> libcxsparse.so.4.0.0 +-rwxr-xr-x root/root usr/lib64/libcxsparse.so.4.0.0 +lrwxrwxrwx root/root usr/lib64/libgpuqrengine.so -> libgpuqrengine.so.2 +lrwxrwxrwx root/root usr/lib64/libgpuqrengine.so.2 -> libgpuqrengine.so.2.0.0 +-rwxr-xr-x root/root usr/lib64/libgpuqrengine.so.2.0.0 +-rw-r--r-- root/root usr/lib64/libgpuqrengine_static.a +lrwxrwxrwx root/root usr/lib64/libgraphblas.so -> libgraphblas.so.7 +lrwxrwxrwx root/root usr/lib64/libgraphblas.so.7 -> libgraphblas.so.7.3.2 +-rwxr-xr-x root/root usr/lib64/libgraphblas.so.7.3.2 +-rw-r--r-- root/root usr/lib64/libklu.a +lrwxrwxrwx root/root usr/lib64/libklu.so -> libklu.so.2 +lrwxrwxrwx root/root usr/lib64/libklu.so.2 -> libklu.so.2.0.0 +-rwxr-xr-x root/root usr/lib64/libklu.so.2.0.0 +-rw-r--r-- root/root usr/lib64/libklu_cholmod.a +lrwxrwxrwx root/root usr/lib64/libklu_cholmod.so -> libklu_cholmod.so.2 +lrwxrwxrwx root/root usr/lib64/libklu_cholmod.so.2 -> libklu_cholmod.so.2.0.0 +-rwxr-xr-x root/root usr/lib64/libklu_cholmod.so.2.0.0 +-rw-r--r-- root/root usr/lib64/libldl.a +lrwxrwxrwx root/root usr/lib64/libldl.so -> libldl.so.3 +lrwxrwxrwx root/root usr/lib64/libldl.so.3 -> libldl.so.3.0.0 +-rwxr-xr-x root/root usr/lib64/libldl.so.3.0.0 +-rw-r--r-- root/root usr/lib64/libmongoose.a +lrwxrwxrwx root/root usr/lib64/libmongoose.so -> libmongoose.so.3 +lrwxrwxrwx root/root usr/lib64/libmongoose.so.3 -> libmongoose.so.3.0.0 +-rwxr-xr-x root/root usr/lib64/libmongoose.so.3.0.0 +-rw-r--r-- root/root usr/lib64/librbio.a +lrwxrwxrwx root/root usr/lib64/librbio.so -> librbio.so.3 +lrwxrwxrwx root/root usr/lib64/librbio.so.3 -> librbio.so.3.0.0 +-rwxr-xr-x root/root usr/lib64/librbio.so.3.0.0 +-rw-r--r-- root/root usr/lib64/libspex.a +lrwxrwxrwx root/root usr/lib64/libspex.so -> libspex.so.2 +lrwxrwxrwx root/root usr/lib64/libspex.so.2 -> libspex.so.2.0.0 +-rwxr-xr-x root/root usr/lib64/libspex.so.2.0.0 +-rw-r--r-- root/root usr/lib64/libspqr.a +lrwxrwxrwx root/root usr/lib64/libspqr.so -> libspqr.so.3 +lrwxrwxrwx root/root usr/lib64/libspqr.so.3 -> libspqr.so.3.0.1 +-rwxr-xr-x root/root usr/lib64/libspqr.so.3.0.1 +lrwxrwxrwx root/root usr/lib64/libsuitesparse_gpuruntime.so -> libsuitesparse_gpuruntime.so.2 +lrwxrwxrwx root/root usr/lib64/libsuitesparse_gpuruntime.so.2 -> libsuitesparse_gpuruntime.so.2.0.0 +-rwxr-xr-x root/root usr/lib64/libsuitesparse_gpuruntime.so.2.0.0 +-rw-r--r-- root/root usr/lib64/libsuitesparse_gpuruntime_static.a +-rw-r--r-- root/root usr/lib64/libsuitesparseconfig.a +lrwxrwxrwx root/root usr/lib64/libsuitesparseconfig.so -> libsuitesparseconfig.so.6 +lrwxrwxrwx root/root usr/lib64/libsuitesparseconfig.so.6 -> libsuitesparseconfig.so.6.0.1 +-rwxr-xr-x root/root usr/lib64/libsuitesparseconfig.so.6.0.1 +-rw-r--r-- root/root usr/lib64/libumfpack.a +lrwxrwxrwx root/root usr/lib64/libumfpack.so -> libumfpack.so.6 +lrwxrwxrwx root/root usr/lib64/libumfpack.so.6 -> libumfpack.so.6.0.1 +-rwxr-xr-x root/root usr/lib64/libumfpack.so.6.0.1 diff --git a/suitesparse/.signature b/suitesparse/.signature index d0e797127..7b0089c92 100644 --- a/suitesparse/.signature +++ b/suitesparse/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35nDhMs4diSjm6Cpc2UWEVyOb8qBGQKVVOq5R/v2kHGUoCspN1ZriXfKxdcx9BIeKq8gueA6kNXbjAGJ0PL1ogM= -SHA256 (Pkgfile) = 5ef68afd228ceaed17ca90b2ad17012d8373356e2d3393984d05890001a6157e -SHA256 (.footprint) = e3fbf3d64c7a6f539cf28aded6daf87d329d8ecb8c7238979968d2bb331f8415 -SHA256 (suitesparse-5.13.0.tar.gz) = 59c6ca2959623f0c69226cf9afb9a018d12a37fab3a8869db5f6d7f83b6b147d -SHA256 (suitesparse-no-demo.patch) = 7b822beb12dbb884788c966f1075810561e0dbcf4758ea49dd1abd190d6c7ce1 +RWSagIOpLGJF31QvL8kd3XEUOOPTUbPGfgjJ3rJHZwbPjzDsibrG5A08CauRTvtQT4GWTxd+orADfCTL6jxIO3SkIMP+N/8bDwk= +SHA256 (Pkgfile) = af50d61d79e103ebe49b6a9899a7a8fbe7583487f52c6d597ed0bcfe34a86e58 +SHA256 (.footprint) = 0da12c520bf26c16f76b8ef86bbd72559c6ae5faaf798fecf34599a2f13e7526 +SHA256 (suitesparse-6.0.0.tar.gz) = 3b07fc5cec46fa66f18f0fbd6a81ad5d552533020bb3595f27c24a0274c89b7a +SHA256 (769870a0.patch) = c8514871dccc75c84ed974262de0e7c593ed9ce9c458dde166d5ac2e72182f99 diff --git a/suitesparse/769870a0.patch b/suitesparse/769870a0.patch new file mode 100644 index 000000000..f110eaf55 --- /dev/null +++ b/suitesparse/769870a0.patch @@ -0,0 +1,345 @@ +From 769870a0d3304d93097d346dc466e8015bf4bab9 Mon Sep 17 00:00:00 2001 +From: Tim Davis <DrTimothyAldenDavis@gmail.com> +Date: Fri, 11 Nov 2022 17:39:19 -0500 +Subject: [PATCH] hide BLAS definitions from user applications + +--- + CHOLMOD/CMakeLists.txt | 2 +- + CHOLMOD/Doc/ChangeLog | 4 ++++ + CHOLMOD/Doc/cholmod_version.tex | 2 +- + CHOLMOD/Include/cholmod.h | 2 +- + CHOLMOD/Include/cholmod_internal.h | 1 + + CHOLMOD/Tcov/cm.h | 1 + + ChangeLog | 6 ++++++ + README.md | 2 +- + SPQR/CMakeLists.txt | 2 +- + SPQR/Doc/ChangeLog | 4 ++++ + SPQR/Doc/spqr_version.tex | 2 +- + SPQR/Include/SuiteSparseQR_definitions.h | 2 +- + SPQR/Include/spqr.hpp | 1 + + SPQR/Tcov/qrtestc.c | 1 - + SuiteSparse_config/CMakeLists.txt | 2 +- + .../Config/SuiteSparse_config.h.in | 16 ++++++++++++++++ + SuiteSparse_config/SuiteSparse_config.h | 18 +++++++++++++++++- + UMFPACK/CMakeLists.txt | 2 +- + UMFPACK/Doc/ChangeLog | 4 ++++ + UMFPACK/Doc/umfpack_version.tex | 2 +- + UMFPACK/Include/umfpack.h | 2 +- + UMFPACK/Source/umf_internal.h | 1 + + 22 files changed, 66 insertions(+), 13 deletions(-) + +diff --git a/CHOLMOD/CMakeLists.txt b/CHOLMOD/CMakeLists.txt +index fcbc5c425..aff0c7a25 100644 +--- a/CHOLMOD/CMakeLists.txt ++++ b/CHOLMOD/CMakeLists.txt +@@ -15,7 +15,7 @@ cmake_minimum_required ( VERSION 3.22 ) + set ( CHOLMOD_DATE "Nov 12, 2022" ) + set ( CHOLMOD_VERSION_MAJOR 4 ) + set ( CHOLMOD_VERSION_MINOR 0 ) +-set ( CHOLMOD_VERSION_SUB 0 ) ++set ( CHOLMOD_VERSION_SUB 1 ) + + message ( STATUS "Building CHOLMOD version: v" + ${CHOLMOD_VERSION_MAJOR}. +diff --git a/CHOLMOD/Doc/ChangeLog b/CHOLMOD/Doc/ChangeLog +index 864aec531..3f7995fc5 100644 +--- a/CHOLMOD/Doc/ChangeLog ++++ b/CHOLMOD/Doc/ChangeLog +@@ -1,3 +1,7 @@ ++Nov 12, 2022: version 4.0.1 ++ ++ * BLAS definitions: no longer exposed to the user application ++ + Nov 12, 2022: version 4.0.0 + + * using CMake build system +diff --git a/CHOLMOD/Doc/cholmod_version.tex b/CHOLMOD/Doc/cholmod_version.tex +index 194eb45b9..0daae1043 100644 +--- a/CHOLMOD/Doc/cholmod_version.tex ++++ b/CHOLMOD/Doc/cholmod_version.tex +@@ -1,2 +1,2 @@ + % version of SuiteSparse/CHOLMOD +-\date{VERSION 4.0.0, Nov 12, 2022} ++\date{VERSION 4.0.1, Nov 12, 2022} +diff --git a/CHOLMOD/Include/cholmod.h b/CHOLMOD/Include/cholmod.h +index 4769b3024..d0c8981b5 100644 +--- a/CHOLMOD/Include/cholmod.h ++++ b/CHOLMOD/Include/cholmod.h +@@ -100,7 +100,7 @@ + #define CHOLMOD_DATE "Nov 12, 2022" + #define CHOLMOD_MAIN_VERSION 4 + #define CHOLMOD_SUB_VERSION 0 +-#define CHOLMOD_SUBSUB_VERSION 0 ++#define CHOLMOD_SUBSUB_VERSION 1 + + /* make it easy for C++ programs to include CHOLMOD */ + #ifdef __cplusplus +diff --git a/CHOLMOD/Include/cholmod_internal.h b/CHOLMOD/Include/cholmod_internal.h +index 379be06e6..763f020b2 100644 +--- a/CHOLMOD/Include/cholmod_internal.h ++++ b/CHOLMOD/Include/cholmod_internal.h +@@ -30,6 +30,7 @@ + #ifndef CHOLMOD_INTERNAL_H + #define CHOLMOD_INTERNAL_H + ++#define SUITESPARSE_BLAS_DEFINITIONS + #include "cholmod.h" + + /* ========================================================================== */ +diff --git a/CHOLMOD/Tcov/cm.h b/CHOLMOD/Tcov/cm.h +index c47a46bdf..b8655544f 100644 +--- a/CHOLMOD/Tcov/cm.h ++++ b/CHOLMOD/Tcov/cm.h +@@ -8,6 +8,7 @@ + + //------------------------------------------------------------------------------ + ++#define SUITESPARSE_BLAS_DEFINITIONS + #include "cholmod.h" + #include <stdlib.h> + #include <stdio.h> +diff --git a/ChangeLog b/ChangeLog +index 722a3bf06..ae3f43462 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,9 @@ ++Nov 12, 2022: SuiteSparse 6.0.1 ++ ++ * BLAS: C prototypes for the Fortan BLAS were unintentionally exposed to ++ the user application. Removed. If you want to use them, see the ++ instructions in SuiteSparse_config.h. ++ + Nov 12, 2022: SuiteSparse 6.0.0 + + * major update: using CMake build system for all packages +diff --git a/README.md b/README.md +index 7e8cd7b6c..43cdce36c 100644 +--- a/README.md ++++ b/README.md +@@ -2,7 +2,7 @@ + SuiteSparse: A Suite of Sparse matrix packages at http://suitesparse.com + ----------------------------------------------------------------------------- + +-Nov 12, 2022. SuiteSparse VERSION 6.0.0 ++Nov 12, 2022. SuiteSparse VERSION 6.0.1 + + SuiteSparse is a set of sparse-matrix-related packages written or co-authored + by Tim Davis, available at https://github.com/DrTimothyAldenDavis/SuiteSparse . +diff --git a/SPQR/CMakeLists.txt b/SPQR/CMakeLists.txt +index 2e9f3cb8e..af5ec8de6 100644 +--- a/SPQR/CMakeLists.txt ++++ b/SPQR/CMakeLists.txt +@@ -16,7 +16,7 @@ cmake_minimum_required ( VERSION 3.22 ) + set ( SPQR_DATE "Nov 12, 2022" ) + set ( SPQR_VERSION_MAJOR 3 ) + set ( SPQR_VERSION_MINOR 0 ) +-set ( SPQR_VERSION_SUB 0 ) ++set ( SPQR_VERSION_SUB 1 ) + + message ( STATUS "Building SPQR version: v" + ${SPQR_VERSION_MAJOR}. +diff --git a/SPQR/Doc/ChangeLog b/SPQR/Doc/ChangeLog +index 98a4ea95a..35a430381 100644 +--- a/SPQR/Doc/ChangeLog ++++ b/SPQR/Doc/ChangeLog +@@ -1,3 +1,7 @@ ++Nov 12, 2022: version 3.0.1 ++ ++ * BLAS definitions: no longer exposed to the user application ++ + Nov 12, 2022: version 3.0.0 + + * using CMake build system +diff --git a/SPQR/Doc/spqr_version.tex b/SPQR/Doc/spqr_version.tex +index 9a3e397e3..cdd59169e 100644 +--- a/SPQR/Doc/spqr_version.tex ++++ b/SPQR/Doc/spqr_version.tex +@@ -1,2 +1,2 @@ + % version of SuiteSparse/SPQR +-\date{VERSION 3.0.0, Nov 12, 2022} ++\date{VERSION 3.0.1, Nov 12, 2022} +diff --git a/SPQR/Include/SuiteSparseQR_definitions.h b/SPQR/Include/SuiteSparseQR_definitions.h +index 764aa9376..d8cd08be8 100644 +--- a/SPQR/Include/SuiteSparseQR_definitions.h ++++ b/SPQR/Include/SuiteSparseQR_definitions.h +@@ -65,7 +65,7 @@ + #define SPQR_DATE "Nov 12, 2022" + #define SPQR_MAIN_VERSION 3 + #define SPQR_SUB_VERSION 0 +-#define SPQR_SUBSUB_VERSION 0 ++#define SPQR_SUBSUB_VERSION 1 + + #define SPQR_VER_CODE(main,sub) ((main) * 1000 + (sub)) + #define SPQR_VERSION SPQR_VER_CODE(SPQR_MAIN_VERSION,SPQR_SUB_VERSION) +diff --git a/SPQR/Include/spqr.hpp b/SPQR/Include/spqr.hpp +index 47386b9b7..adba2a977 100644 +--- a/SPQR/Include/spqr.hpp ++++ b/SPQR/Include/spqr.hpp +@@ -15,6 +15,7 @@ + // include files + // ----------------------------------------------------------------------------- + ++#define SUITESPARSE_BLAS_DEFINITIONS + #include "SuiteSparseQR.hpp" + #include <stdlib.h> + #include <math.h> +diff --git a/SPQR/Tcov/qrtestc.c b/SPQR/Tcov/qrtestc.c +index 12b358b40..33377bcdb 100644 +--- a/SPQR/Tcov/qrtestc.c ++++ b/SPQR/Tcov/qrtestc.c +@@ -10,7 +10,6 @@ + /* Test the C wrapper functions. */ + + #include "SuiteSparseQR_C.h" +-#define int64_t int64_t + + #define MAX(a,b) (((a) > (b)) ? (a) : (b)) + +diff --git a/SuiteSparse_config/CMakeLists.txt b/SuiteSparse_config/CMakeLists.txt +index caa903787..bf526e51c 100644 +--- a/SuiteSparse_config/CMakeLists.txt ++++ b/SuiteSparse_config/CMakeLists.txt +@@ -17,7 +17,7 @@ cmake_minimum_required ( VERSION 3.22 ) + set ( SUITESPARSE_DATE "Nov 12, 2022" ) + set ( SUITESPARSE_VERSION_MAJOR 6 ) + set ( SUITESPARSE_VERSION_MINOR 0 ) +-set ( SUITESPARSE_VERSION_SUB 0 ) ++set ( SUITESPARSE_VERSION_SUB 1 ) + + message ( STATUS "Building SuiteSparse_config version: v" + ${SUITESPARSE_VERSION_MAJOR}. +diff --git a/SuiteSparse_config/Config/SuiteSparse_config.h.in b/SuiteSparse_config/Config/SuiteSparse_config.h.in +index 3e65ef246..c9cf2188c 100644 +--- a/SuiteSparse_config/Config/SuiteSparse_config.h.in ++++ b/SuiteSparse_config/Config/SuiteSparse_config.h.in +@@ -689,6 +689,20 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION + // See https://netlib.org/blas/ and https://netlib.org/lapack/ for the + // definitions of the inputs/outputs of these functions. + ++// These prototypes need to be found by UMFPACK, CHOLMOD, and SPQR, and to do ++// so, they need to appear in this public header to ensure the correct BLAS ++// library and integer size is used. However, these definitions should not ++// (normally) be exposed to the user application. ++ ++// If a user application wishes to use these definitions, simply add ++ ++// #define SUITESPARSE_BLAS_DEFINITIONS ++// #include "SuiteSparse_config.h" ++ ++// prior to #include'ing any SuiteSparse headers (amd.h, and so on). ++ ++#if defined ( SUITESPARSE_BLAS_DEFINITIONS ) ++ + void SUITESPARSE_BLAS_DGEMV // Y = alpha*A*x + beta*Y + ( + // input: +@@ -1447,6 +1461,8 @@ void SUITESPARSE_LAPACK_ZLARF // apply Householder reflector + } \ + } + ++#endif ++ + //------------------------------------------------------------------------------ + // SuiteSparse_BLAS_library: return name of BLAS library found + //------------------------------------------------------------------------------ +diff --git a/SuiteSparse_config/SuiteSparse_config.h b/SuiteSparse_config/SuiteSparse_config.h +index 078260e1d..00beef1a1 100644 +--- a/SuiteSparse_config/SuiteSparse_config.h ++++ b/SuiteSparse_config/SuiteSparse_config.h +@@ -488,7 +488,7 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION + #define SUITESPARSE_DATE "Nov 12, 2022" + #define SUITESPARSE_MAIN_VERSION 6 + #define SUITESPARSE_SUB_VERSION 0 +-#define SUITESPARSE_SUBSUB_VERSION 0 ++#define SUITESPARSE_SUBSUB_VERSION 1 + + #define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub)) + #define SUITESPARSE_VERSION \ +@@ -689,6 +689,20 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION + // See https://netlib.org/blas/ and https://netlib.org/lapack/ for the + // definitions of the inputs/outputs of these functions. + ++// These prototypes need to be found by UMFPACK, CHOLMOD, and SPQR, and to do ++// so, they need to appear in this public header to ensure the correct BLAS ++// library and integer size is used. However, these definitions should not ++// (normally) be exposed to the user application. ++ ++// If a user application wishes to use these definitions, simply add ++ ++// #define SUITESPARSE_BLAS_DEFINITIONS ++// #include "SuiteSparse_config.h" ++ ++// prior to #include'ing any SuiteSparse headers (amd.h, and so on). ++ ++#if defined ( SUITESPARSE_BLAS_DEFINITIONS ) ++ + void SUITESPARSE_BLAS_DGEMV // Y = alpha*A*x + beta*Y + ( + // input: +@@ -1447,6 +1461,8 @@ void SUITESPARSE_LAPACK_ZLARF // apply Householder reflector + } \ + } + ++#endif ++ + //------------------------------------------------------------------------------ + // SuiteSparse_BLAS_library: return name of BLAS library found + //------------------------------------------------------------------------------ +diff --git a/UMFPACK/CMakeLists.txt b/UMFPACK/CMakeLists.txt +index c3a0e07d1..8f746ec33 100644 +--- a/UMFPACK/CMakeLists.txt ++++ b/UMFPACK/CMakeLists.txt +@@ -15,7 +15,7 @@ cmake_minimum_required ( VERSION 3.22 ) + set ( UMFPACK_DATE "Nov 12, 2022" ) + set ( UMFPACK_VERSION_MAJOR 6 ) + set ( UMFPACK_VERSION_MINOR 0 ) +-set ( UMFPACK_VERSION_SUB 0 ) ++set ( UMFPACK_VERSION_SUB 1 ) + + message ( STATUS "Building UMFPACK version: v" + ${UMFPACK_VERSION_MAJOR}. +diff --git a/UMFPACK/Doc/ChangeLog b/UMFPACK/Doc/ChangeLog +index 051bb2129..d40c1d0f0 100644 +--- a/UMFPACK/Doc/ChangeLog ++++ b/UMFPACK/Doc/ChangeLog +@@ -1,3 +1,7 @@ ++Nov 12, 2022: version 6.0.1 ++ ++ * BLAS definitions: no longer exposed to the user application ++ + Nov 12, 2022: version 6.0.0 + + * using CMake build system +diff --git a/UMFPACK/Doc/umfpack_version.tex b/UMFPACK/Doc/umfpack_version.tex +index cf30e6113..9528c7c98 100644 +--- a/UMFPACK/Doc/umfpack_version.tex ++++ b/UMFPACK/Doc/umfpack_version.tex +@@ -1,2 +1,2 @@ + % version of SuiteSparse/UMFPACK +-\date{VERSION 6.0.0, Nov 12, 2022} ++\date{VERSION 6.0.1, Nov 12, 2022} +diff --git a/UMFPACK/Include/umfpack.h b/UMFPACK/Include/umfpack.h +index d05ab8459..c3053893c 100644 +--- a/UMFPACK/Include/umfpack.h ++++ b/UMFPACK/Include/umfpack.h +@@ -85,7 +85,7 @@ extern "C" { + #define UMFPACK_DATE "Nov 12, 2022" + #define UMFPACK_MAIN_VERSION 6 + #define UMFPACK_SUB_VERSION 0 +-#define UMFPACK_SUBSUB_VERSION 0 ++#define UMFPACK_SUBSUB_VERSION 1 + + #define UMFPACK_VER_CODE(main,sub) ((main) * 1000 + (sub)) + #define UMFPACK_VER UMFPACK_VER_CODE(UMFPACK_MAIN_VERSION,UMFPACK_SUB_VERSION) +diff --git a/UMFPACK/Source/umf_internal.h b/UMFPACK/Source/umf_internal.h +index 28c2cef1d..d1fc1c336 100644 +--- a/UMFPACK/Source/umf_internal.h ++++ b/UMFPACK/Source/umf_internal.h +@@ -91,6 +91,7 @@ + /* -------------------------------------------------------------------------- */ + + /* stdio.h, stdlib.h, limits.h, and math.h, NDEBUG definition, assert.h */ ++#define SUITESPARSE_BLAS_DEFINITIONS + #include "amd_internal.h" + + /* -------------------------------------------------------------------------- */ diff --git a/suitesparse/Pkgfile b/suitesparse/Pkgfile index cf0bad215..30c9c4ac7 100644 --- a/suitesparse/Pkgfile +++ b/suitesparse/Pkgfile @@ -1,29 +1,24 @@ # Description: A collection of sparse matrix libraries # URL: http://faculty.cse.tamu.edu/davis/suitesparse.html # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: chrpath lapack metis +# Depends on: lapack metis name=suitesparse -version=5.13.0 +version=6.0.0 release=1 source=(https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$version/$name-$... - suitesparse-no-demo.patch) + 769870a0.patch) build() { cd SuiteSparse-$version - patch -p0 -i ../suitesparse-no-demo.patch - local PKGMK_SUITESPARSE+=" - _BLAS=-lblas - LAPACK=-llapack - MY_METIS_LIB=/usr/lib/libmetis.so" - make $PKGMK_SUITESPARSE + patch -Np1 -i $SRC/769870a0.patch - install -dm755 $PKG/usr/{include,lib} + CMAKE_OPTIONS="-DBLA_VENDOR=Generic \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS_RELEASE=\"$CXXFLAGS -ffat-lto-objects\"" \ + make - INSTALL_LIB=$PKG/usr/lib \ - INSTALL_INCLUDE=$PKG/usr/include \ - make $PKGMK_SUITESPARSE install - - chrpath -d $PKG/usr/lib/* + make DESTDIR=$PKG install }