diff options
Diffstat (limited to 'academic/spqr')
| -rw-r--r-- | academic/spqr/README | 22 | ||||
| -rw-r--r-- | academic/spqr/patches/autoconfiscate.diff | 20 | ||||
| -rw-r--r-- | academic/spqr/spqr.SlackBuild | 33 | ||||
| -rw-r--r-- | academic/spqr/spqr.info | 6 |
4 files changed, 48 insertions, 33 deletions
diff --git a/academic/spqr/README b/academic/spqr/README index 051977e0e6..8bb80aef4f 100644 --- a/academic/spqr/README +++ b/academic/spqr/README @@ -1,18 +1,22 @@ SuiteSparseQR is an implementation of the multifrontal sparse QR -factorization method. Parallelism is exploited both in the BLAS and -across different frontal matrices using Intel's Threading Building Blocks, -a shared-memory programming model for modern multicore +factorization method. Parallelism is exploited both in the BLAS and +across different frontal matrices using Intel's Threading Building +Blocks, a shared-memory programming model for modern multicore architectures. It can obtain a substantial fraction of the theoretical peak performance of a multicore computer. This package is part of SuiteSparse. -This requires a BLAS/LAPACK implementation. Choose one of these package sets: +This requires a BLAS/LAPACK implementation. Choose one of these package +sets: + * OpenBLAS (includes both a BLAS and a LAPACK implementation) * atlas (includes both a BLAS and a LAPACK implementation) * blas, lapack (the Netlib reference implementations) -If more than one set is installed (assuming there are no packaging conflicts) -then the auto-detection will use the first implementation from this list that -it finds. If in doubt, choose the Netlib reference implementations; other -packages that require a BLAS or LAPACK implementation may not build if they -are not configured to detect/use alternate implementations. + +If more than one set is installed (assuming there are no packaging +conflicts) then the auto-detection will use the first implementation +from this list that it finds. If in doubt, choose the Netlib reference +implementations; other packages that require a BLAS or LAPACK +implementation may not build if they are not configured to detect/use +alternate implementations. diff --git a/academic/spqr/patches/autoconfiscate.diff b/academic/spqr/patches/autoconfiscate.diff index 8bc53753dd..8fff318251 100644 --- a/academic/spqr/patches/autoconfiscate.diff +++ b/academic/spqr/patches/autoconfiscate.diff @@ -344,7 +344,7 @@ new file mode 100644 +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.69]) -+AC_INIT([SPQR],[2.0.9],[DrTimothyAldenDavis@gmail.com],[spqr],[http://www.suitesparse.com/]) ++AC_INIT([SPQR],[2.0.9],[https://github.com/DrTimothyAldenDavis/SuiteSparse],[spqr],[http://www.suitesparse.com/]) +AC_CONFIG_SRCDIR([Source/spqr_kernel.cpp]) +AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_MACRO_DIR([m4]) @@ -463,7 +463,7 @@ diff --git a/m4/ax_blas.m4 b/m4/ax_blas.m4 new file mode 100644 --- /dev/null +++ b/m4/ax_blas.m4 -@@ -0,0 +1,238 @@ +@@ -0,0 +1,241 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_blas.html +# =========================================================================== @@ -502,6 +502,7 @@ new file mode 100644 +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu> ++# Copyright (c) 2019 Geoffrey M. Oxberry <goxberry@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the @@ -529,7 +530,7 @@ new file mode 100644 +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + -+#serial 16 ++#serial 17 + +AU_ALIAS([ACX_BLAS], [AX_BLAS]) +AC_DEFUN([AX_BLAS], [ @@ -543,7 +544,9 @@ new file mode 100644 +case $with_blas in + yes | "") ;; + no) ax_blas_ok=disable ;; -+ -* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;; ++ -* | */* | *.a | *.so | *.so.* | *.dylib | *.dylib.* | *.o) ++ BLAS_LIBS="$with_blas" ++ ;; + *) BLAS_LIBS="-l$with_blas" ;; +esac + @@ -982,7 +985,7 @@ diff --git a/m4/ax_lapack.m4 b/m4/ax_lapack.m4 new file mode 100644 --- /dev/null +++ b/m4/ax_lapack.m4 -@@ -0,0 +1,131 @@ +@@ -0,0 +1,134 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lapack.html +# =========================================================================== @@ -1022,6 +1025,7 @@ new file mode 100644 +# LICENSE +# +# Copyright (c) 2009 Steven G. Johnson <stevenj@alum.mit.edu> ++# Copyright (c) 2019 Geoffrey M. Oxberry <goxberry@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the @@ -1049,7 +1053,7 @@ new file mode 100644 +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + -+#serial 9 ++#serial 10 + +AU_ALIAS([ACX_LAPACK], [AX_LAPACK]) +AC_DEFUN([AX_LAPACK], [ @@ -1061,7 +1065,9 @@ new file mode 100644 +case $with_lapack in + yes | "") ;; + no) ax_lapack_ok=disable ;; -+ -* | */* | *.a | *.so | *.so.* | *.o) LAPACK_LIBS="$with_lapack" ;; ++ -* | */* | *.a | *.so | *.so.* | *.dylib | *.dylib.* | *.o) ++ LAPACK_LIBS="$with_lapack" ++ ;; + *) LAPACK_LIBS="-l$with_lapack" ;; +esac + diff --git a/academic/spqr/spqr.SlackBuild b/academic/spqr/spqr.SlackBuild index 1bfa8d46d5..a99c21b3d7 100644 --- a/academic/spqr/spqr.SlackBuild +++ b/academic/spqr/spqr.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for SPQR -# Copyright 2013-2019 Kyle Guinn <elyk03@gmail.com> +# Copyright 2013-2023 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,13 +22,16 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=spqr SRCNAM=SuiteSparse SUBDIR=SPQR VERSION=${VERSION:-2.0.9} -SRCVER=${SRCVER:-5.4.0} -BUILD=${BUILD:-1} +SRCVER=${SRCVER:-5.8.1} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$(uname -m)" in @@ -38,17 +41,18 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM-$VERSION +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} DOCS="README.txt Doc/ChangeLog Doc/License.txt Doc/gpl.txt" -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then +if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then @@ -70,9 +74,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM -tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR -cd $SRCNAM/$SUBDIR +rm -rf $SRCNAM-$SRCVER +tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM-$SRCVER/$SUBDIR +cd $SRCNAM-$SRCVER/$SUBDIR chown -R root:root . chmod -R u+w,go-w,a+rX-st . @@ -92,6 +96,7 @@ touch Doc/spqr_user_guide.pdf --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-dependency-tracking \ + --without-tbb \ --build=$ARCH-slackware-linux \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -110,4 +115,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/academic/spqr/spqr.info b/academic/spqr/spqr.info index 3f599628ad..eff7ce4d4d 100644 --- a/academic/spqr/spqr.info +++ b/academic/spqr/spqr.info @@ -1,10 +1,10 @@ PRGNAM="spqr" VERSION="2.0.9" HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html" -DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-5.4.0.tar.gz" -MD5SUM="4a6d4e74fc44c503f52996ae95cad03a" +DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz" +MD5SUM="c414679bbc9432a3def01b31ad921140" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="blas lapack suitesparseconfig cholmod tbb" +REQUIRES="cholmod" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" |