Index: head/math/suitesparse/Makefile =================================================================== --- head/math/suitesparse/Makefile (revision 541168) +++ head/math/suitesparse/Makefile (revision 541169) @@ -1,85 +1,96 @@ # Created by: Maho Nakata # $FreeBSD$ PORTNAME= suitesparse -PORTVERSION= 5.7.2 -PORTREVISION= 1 +PORTVERSION= 5.8.0 DISTVERSIONPREFIX= v CATEGORIES= math MAINTAINER= fortran@FreeBSD.org COMMENT= Set of packages for sparse matrix calculation LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual LIB_DEPENDS= libmetis.so:math/metis USE_GITHUB= yes GH_ACCOUNT= DrTimothyAldenDavis GH_PROJECT= SuiteSparse USES= cmake:insource fortran gmake localbase:ldflags USE_LDCONFIG= yes -ALL_TARGET= library # skip demos INSTALL_TARGET= install # skip USES=cmake MAKE_ENV= BLAS="${BLASLIB}" LAPACK="${LAPACKLIB}" \ MY_METIS_LIB="-lmetis" \ JOBS="${MAKE_JOBS_NUMBER}" \ CMAKE_OPTIONS='${CMAKE_ARGS}' \ INSTALL="${STAGEDIR}${PREFIX}" \ INSTALL_DOC="${STAGEDIR}${DOCSDIR}" \ INSTALL_INCLUDE="${STAGEDIR}${PREFIX}/include/${PORTNAME}" CMAKE_ARGS= -DCMAKE_INSTALL_INCLUDEDIR:PATH="include/${PORTNAME}" \ -DBUILD_GRB_STATIC_LIBRARY:BOOL=ON LDFLAGS+= -L${WRKSRC}/lib # prevent linking with shared libs from the preinstalled older versions CONFLICTS_INSTALL= mongoose plinkseq # bin/mongoose -OPTIONS_DEFINE= DOCS OPENMP TBB -OPTIONS_RADIO= BLAS +OPTIONS_DEFINE= DEMOS DOCS OPENMP TBB +OPTIONS_RADIO= BLAS OPTIONS_RADIO_BLAS= ATLAS GOTOBLAS NETLIB OPENBLAS OPTIONS_DEFAULT= OPENBLAS OPENMP TBB ATLAS_USES= blaslapack:atlas GOTOBLAS_DESC= Goto blas implementation GOTOBLAS_USES= blaslapack:gotoblas NETLIB_USES= blaslapack:netlib OPENBLAS_USES= blaslapack:openblas -OPENMP_USES= compiler:openmp OPENMP_MAKE_ENV_OFF= CFOPENMP= .if !exists(/usr/include/omp.h) # XXX ports/199603: LLVM openmp in base doesn't support aarch64, armv6, armv7 yet OPENMP_VARS= OPENMP=gcc- .endif +DEMOS_DESC= Install the demonstrations +DEMOS_ALL_TARGET= go +DEMOS_ALL_TARGET_OFF= library + TBB_DESC= Intel threading building blocks TBB_LIB_DEPENDS= libtbb.so:devel/tbb TBB_MAKE_ENV= TBB="-ltbb" SPQR_CONFIG="-DHAVE_TBB" +MODULES= AMD CAMD CCOLAMD CHOLMOD COLAMD CSparse CXSparse_newfiles \ + CXSparse GPUQREngine KLU LDL RBio SPQR UMFPACK + .include .if ${ARCH} == i386 # See PR 230888 : Missing 64 bit atomic functions for i386 USES+= compiler:gcc-c++11-lib LDFLAGS+= -latomic .elif defined(PPC_ABI) && ${PPC_ABI} == ELFv1 USE_GCC= yes .else -USES+= compiler:${OPENMP}c++11-lib +USES+= compiler:c++11-lib .endif post-extract: ${RM} -r ${WRKSRC}/metis-* -do-configure: # skip USES=cmake - post-patch-OPENMP-off: @${REINPLACE_CMD} -e '/find_package.*OpenMP/d' \ ${WRKSRC}/GraphBLAS/CMakeLists.txt + +pre-configure: +.for m in ${MODULES} + ${REINPLACE_CMD} -e 's|-I../../include|-I${STAGEDIR}${PREFIX}/include/suitesparse|;\ + s|-lsuitesparseconfig|-lsuitesparseconfig -L${LOCALBASE}/lib|' \ + ${WRKSRC}/${m}/Demo/Makefile +.endfor + +do-configure: # skip USES=cmake post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so .include Index: head/math/suitesparse/distinfo =================================================================== --- head/math/suitesparse/distinfo (revision 541168) +++ head/math/suitesparse/distinfo (revision 541169) @@ -1,3 +1,3 @@ -TIMESTAMP = 1586617989 -SHA256 (DrTimothyAldenDavis-SuiteSparse-v5.7.2_GH0.tar.gz) = fe3bc7c3bd1efdfa5cffffb5cebf021ff024c83b5daf0ab445429d3d741bd3ad -SIZE (DrTimothyAldenDavis-SuiteSparse-v5.7.2_GH0.tar.gz) = 57027884 +TIMESTAMP = 1593811165 +SHA256 (DrTimothyAldenDavis-SuiteSparse-v5.8.0_GH0.tar.gz) = 94a9b7134eb4dd82b97f1a22a6b464feb81e73af2dcdf683c6f252285191df1d +SIZE (DrTimothyAldenDavis-SuiteSparse-v5.8.0_GH0.tar.gz) = 58819484 Index: head/math/suitesparse/pkg-plist =================================================================== --- head/math/suitesparse/pkg-plist (revision 541168) +++ head/math/suitesparse/pkg-plist (revision 541169) @@ -1,136 +1,142 @@ bin/mongoose include/suitesparse/GraphBLAS.h include/suitesparse/Mongoose.hpp include/suitesparse/RBio.h +include/suitesparse/SLIP_LU.h include/suitesparse/SuiteSparseQR.hpp include/suitesparse/SuiteSparseQR_C.h include/suitesparse/SuiteSparseQR_definitions.h include/suitesparse/SuiteSparse_config.h include/suitesparse/amd.h include/suitesparse/btf.h include/suitesparse/camd.h include/suitesparse/ccolamd.h include/suitesparse/cholmod.h include/suitesparse/cholmod_blas.h include/suitesparse/cholmod_camd.h include/suitesparse/cholmod_check.h include/suitesparse/cholmod_cholesky.h include/suitesparse/cholmod_complexity.h include/suitesparse/cholmod_config.h include/suitesparse/cholmod_core.h include/suitesparse/cholmod_function.h include/suitesparse/cholmod_gpu.h include/suitesparse/cholmod_gpu_kernels.h include/suitesparse/cholmod_io64.h include/suitesparse/cholmod_matrixops.h include/suitesparse/cholmod_modify.h include/suitesparse/cholmod_partition.h include/suitesparse/cholmod_supernodal.h include/suitesparse/cholmod_template.h include/suitesparse/colamd.h include/suitesparse/cs.h include/suitesparse/klu.h include/suitesparse/ldl.h include/suitesparse/spqr.hpp include/suitesparse/umfpack.h include/suitesparse/umfpack_col_to_triplet.h include/suitesparse/umfpack_defaults.h include/suitesparse/umfpack_free_numeric.h include/suitesparse/umfpack_free_symbolic.h include/suitesparse/umfpack_get_determinant.h include/suitesparse/umfpack_get_lunz.h include/suitesparse/umfpack_get_numeric.h include/suitesparse/umfpack_get_symbolic.h include/suitesparse/umfpack_global.h include/suitesparse/umfpack_load_numeric.h include/suitesparse/umfpack_load_symbolic.h include/suitesparse/umfpack_numeric.h include/suitesparse/umfpack_qsymbolic.h include/suitesparse/umfpack_report_control.h include/suitesparse/umfpack_report_info.h include/suitesparse/umfpack_report_matrix.h include/suitesparse/umfpack_report_numeric.h include/suitesparse/umfpack_report_perm.h include/suitesparse/umfpack_report_status.h include/suitesparse/umfpack_report_symbolic.h include/suitesparse/umfpack_report_triplet.h include/suitesparse/umfpack_report_vector.h include/suitesparse/umfpack_save_numeric.h include/suitesparse/umfpack_save_symbolic.h include/suitesparse/umfpack_scale.h include/suitesparse/umfpack_solve.h include/suitesparse/umfpack_symbolic.h include/suitesparse/umfpack_tictoc.h include/suitesparse/umfpack_timer.h include/suitesparse/umfpack_transpose.h include/suitesparse/umfpack_triplet_to_col.h include/suitesparse/umfpack_wsolve.h lib/libamd.so lib/libamd.so.2 lib/libamd.so.2.4.6 lib/libbtf.so lib/libbtf.so.1 lib/libbtf.so.1.2.6 lib/libcamd.so lib/libcamd.so.2 lib/libcamd.so.2.4.6 lib/libccolamd.so lib/libccolamd.so.2 lib/libccolamd.so.2.9.6 lib/libcholmod.so lib/libcholmod.so.3 lib/libcholmod.so.3.0.14 lib/libcolamd.so lib/libcolamd.so.2 lib/libcolamd.so.2.9.6 lib/libcxsparse.so lib/libcxsparse.so.3 lib/libcxsparse.so.3.2.0 lib/libgraphblas.a lib/libgraphblas.so lib/libgraphblas.so.3 -lib/libgraphblas.so.3.2.2 +lib/libgraphblas.so.3.3.2 lib/libklu.so lib/libklu.so.1 lib/libklu.so.1.3.8 lib/libldl.so lib/libldl.so.2 lib/libldl.so.2.2.6 lib/libmongoose.a lib/libmongoose.so lib/libmongoose.so.2 lib/libmongoose.so.2.0.4 lib/librbio.so lib/librbio.so.2 lib/librbio.so.2.2.6 +lib/libsliplu.so +lib/libsliplu.so.1 +lib/libsliplu.so.1.0.1 lib/libspqr.so lib/libspqr.so.2 lib/libspqr.so.2.0.9 lib/libsuitesparseconfig.so lib/libsuitesparseconfig.so.5 -lib/libsuitesparseconfig.so.5.7.2 +lib/libsuitesparseconfig.so.5.8.0 lib/libumfpack.so lib/libumfpack.so.5 lib/libumfpack.so.5.7.9 %%PORTDOCS%%%%DOCSDIR%%/AMD_README.txt %%PORTDOCS%%%%DOCSDIR%%/AMD_UserGuide.pdf %%PORTDOCS%%%%DOCSDIR%%/BTF_README.txt %%PORTDOCS%%%%DOCSDIR%%/CAMD_README.txt %%PORTDOCS%%%%DOCSDIR%%/CAMD_UserGuide.pdf %%PORTDOCS%%%%DOCSDIR%%/CCOLAMD_README.txt %%PORTDOCS%%%%DOCSDIR%%/CHOLMOD_README.txt %%PORTDOCS%%%%DOCSDIR%%/CHOLMOD_UserGuide.pdf %%PORTDOCS%%%%DOCSDIR%%/COLAMD_README.txt %%PORTDOCS%%%%DOCSDIR%%/CXSPARSE_README.txt %%PORTDOCS%%%%DOCSDIR%%/KLU_README.txt %%PORTDOCS%%%%DOCSDIR%%/KLU_UserGuide.pdf %%PORTDOCS%%%%DOCSDIR%%/LDL_README.txt %%PORTDOCS%%%%DOCSDIR%%/RBIO_README.txt +%%PORTDOCS%%%%DOCSDIR%%/SLIP_LU_README.md +%%PORTDOCS%%%%DOCSDIR%%/SLIP_LU_UserGuide.pdf %%PORTDOCS%%%%DOCSDIR%%/SPQR_README.txt %%PORTDOCS%%%%DOCSDIR%%/SUITESPARSECONFIG_README.txt %%PORTDOCS%%%%DOCSDIR%%/SuiteSparse_README.md %%PORTDOCS%%%%DOCSDIR%%/UMFPACK_QuickStart.pdf %%PORTDOCS%%%%DOCSDIR%%/UMFPACK_README.txt %%PORTDOCS%%%%DOCSDIR%%/UMFPACK_UserGuide.pdf %%PORTDOCS%%%%DOCSDIR%%/ldl_userguide.pdf %%PORTDOCS%%%%DOCSDIR%%/spqr_user_guide.pdf