summaryrefslogtreecommitdiff
path: root/libraries/SPQR
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/SPQR')
-rw-r--r--libraries/SPQR/SPQR.SlackBuild26
-rw-r--r--libraries/SPQR/SPQR.info10
-rw-r--r--libraries/SPQR/atlas-threaded-blas.diff26
-rw-r--r--libraries/SPQR/autotoolize.diff685
4 files changed, 424 insertions, 323 deletions
diff --git a/libraries/SPQR/SPQR.SlackBuild b/libraries/SPQR/SPQR.SlackBuild
index bc3d9c9c8a..e7e1140e7e 100644
--- a/libraries/SPQR/SPQR.SlackBuild
+++ b/libraries/SPQR/SPQR.SlackBuild
@@ -1,10 +1,29 @@
#!/bin/sh
# Slackware build script for SPQR
-# Written by Kyle Guinn <elyk03@gmail.com>
+
+# Copyright 2013 Kyle Guinn <elyk03@gmail.com>, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=SPQR
-VERSION=${VERSION:-1.2.2}
+VERSION=${VERSION:-1.3.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -56,6 +75,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p1 < $CWD/autotoolize.diff
+patch -p1 < $CWD/atlas-threaded-blas.diff
autoreconf -vif
CFLAGS="$SLKCFLAGS" \
@@ -70,9 +90,11 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--enable-shared \
--disable-static \
+ --disable-dependency-tracking \
--build=$ARCH-slackware-linux
make
+make check
make install-strip DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/SPQR/SPQR.info b/libraries/SPQR/SPQR.info
index 6132e73d6d..d1958c8dce 100644
--- a/libraries/SPQR/SPQR.info
+++ b/libraries/SPQR/SPQR.info
@@ -1,10 +1,10 @@
PRGNAM="SPQR"
-VERSION="1.2.2"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SPQR/"
-DOWNLOAD="http://www.cise.ufl.edu/research/sparse/SPQR/SPQR-1.2.2.tar.gz"
-MD5SUM="4ea91c05bc3c207ffa9039a4896e42f5"
+VERSION="1.3.1"
+HOMEPAGE="https://www.cise.ufl.edu/research/sparse/SPQR/"
+DOWNLOAD="https://www.cise.ufl.edu/research/sparse/SPQR/SPQR-1.3.1.tar.gz"
+MD5SUM="c1a55e7ac6208f7657186aa01356c8f2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="CHOLMOD tbb"
+REQUIRES="blas lapack SuiteSparse_config CHOLMOD tbb"
MAINTAINER="Kyle Guinn"
EMAIL="elyk03@gmail.com"
diff --git a/libraries/SPQR/atlas-threaded-blas.diff b/libraries/SPQR/atlas-threaded-blas.diff
new file mode 100644
index 0000000000..e7f34ef011
--- /dev/null
+++ b/libraries/SPQR/atlas-threaded-blas.diff
@@ -0,0 +1,26 @@
+diff --git a/ax_blas.m4 b/ax_blas.m4
+--- a/ax_blas.m4
++++ b/ax_blas.m4
+@@ -117,12 +117,16 @@
+ # BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
+ if test $ax_blas_ok = no; then
+ AC_CHECK_LIB(atlas, ATL_xerbla,
+- [AC_CHECK_LIB(f77blas, $sgemm,
+- [AC_CHECK_LIB(cblas, cblas_dgemm,
+- [ax_blas_ok=yes
+- BLAS_LIBS="-lcblas -lf77blas -latlas"],
+- [], [-lf77blas -latlas])],
+- [], [-latlas])])
++ [AC_CHECK_LIB(ptf77blas, $sgemm,
++ [AC_CHECK_LIB(ptcblas, cblas_dgemm,
++ [ax_blas_ok=yes; BLAS_LIBS="-lptcblas -lptf77blas -latlas"],,
++ [-lptf77blas -latlas])],
++ [AC_CHECK_LIB(f77blas, $sgemm,
++ [AC_CHECK_LIB(cblas, cblas_dgemm,
++ [ax_blas_ok=yes; BLAS_LIBS="-lcblas -lf77blas -latlas"],,
++ [-lf77blas -latlas])],,
++ [-latlas])],
++ [-latlas])])
+ fi
+
+ # BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
diff --git a/libraries/SPQR/autotoolize.diff b/libraries/SPQR/autotoolize.diff
index 151336a075..3b4efd6f02 100644
--- a/libraries/SPQR/autotoolize.diff
+++ b/libraries/SPQR/autotoolize.diff
@@ -3,7 +3,7 @@ new file mode 100644
--- /dev/null
+++ b/Demo/Makefile.am
@@ -0,0 +1,109 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include $(CHOLMOD_CFLAGS) $(UFCONFIG_CFLAGS)
++AM_CPPFLAGS = -I$(top_srcdir)/Include $(CHOLMOD_CFLAGS) $(SUITESPARSECONFIG_CFLAGS)
+LDADD = $(top_builddir)/Source/libspqr.la
+
+EXTRA_DIST = \
@@ -26,127 +26,130 @@ new file mode 100644
+qrdemoc_CFLAGS = $(AM_CFLAGS) -ansi
+
+MATRICES = \
-+ ../Matrix/GD01_b.mtx \
-+ ../Matrix/GD06_theory.mtx \
-+ ../Matrix/GD98_a.mtx \
-+ ../Matrix/LFAT5.mtx \
-+ ../Matrix/Ragusa16.mtx \
-+ ../Matrix/Tina_AskCal.mtx \
-+ ../Matrix/Tina_AskCal_perm.mtx \
-+ ../Matrix/a0.mtx \
-+ ../Matrix/a04.mtx \
-+ ../Matrix/a1.mtx \
-+ ../Matrix/a2.mtx \
-+ ../Matrix/a4.mtx \
-+ ../Matrix/ash219.mtx \
-+ ../Matrix/b1_ss.mtx \
-+ ../Matrix/bcspwr01.mtx \
-+ ../Matrix/bfwa62.mtx \
-+ ../Matrix/c2.mtx \
-+ ../Matrix/c32.mtx \
-+ ../Matrix/lfat5b.mtx \
-+ ../Matrix/lp_share1b.mtx \
-+ ../Matrix/lpi_galenet.mtx \
-+ ../Matrix/lpi_itest6.mtx \
-+ ../Matrix/r2.mtx \
-+ ../Matrix/s32.mtx \
-+ ../Matrix/west0067.mtx \
-+ ../Matrix/young1c.mtx
++ $(top_srcdir)/Matrix/GD01_b.mtx \
++ $(top_srcdir)/Matrix/GD06_theory.mtx \
++ $(top_srcdir)/Matrix/GD98_a.mtx \
++ $(top_srcdir)/Matrix/LFAT5.mtx \
++ $(top_srcdir)/Matrix/Ragusa16.mtx \
++ $(top_srcdir)/Matrix/Tina_AskCal.mtx \
++ $(top_srcdir)/Matrix/Tina_AskCal_perm.mtx \
++ $(top_srcdir)/Matrix/a0.mtx \
++ $(top_srcdir)/Matrix/a04.mtx \
++ $(top_srcdir)/Matrix/a1.mtx \
++ $(top_srcdir)/Matrix/a2.mtx \
++ $(top_srcdir)/Matrix/a4.mtx \
++ $(top_srcdir)/Matrix/ash219.mtx \
++ $(top_srcdir)/Matrix/b1_ss.mtx \
++ $(top_srcdir)/Matrix/bcspwr01.mtx \
++ $(top_srcdir)/Matrix/bfwa62.mtx \
++ $(top_srcdir)/Matrix/c2.mtx \
++ $(top_srcdir)/Matrix/c32.mtx \
++ $(top_srcdir)/Matrix/lfat5b.mtx \
++ $(top_srcdir)/Matrix/lp_share1b.mtx \
++ $(top_srcdir)/Matrix/lpi_galenet.mtx \
++ $(top_srcdir)/Matrix/lpi_itest6.mtx \
++ $(top_srcdir)/Matrix/r2.mtx \
++ $(top_srcdir)/Matrix/s32.mtx \
++ $(top_srcdir)/Matrix/west0067.mtx \
++ $(top_srcdir)/Matrix/young1c.mtx
+
+check-local: $(check_PROGRAMS) $(MATRICES)
-+ -./qrsimple < ../Matrix/ash219.mtx
-+ -./qrsimplec < ../Matrix/ash219.mtx
-+ -./qrsimple < ../Matrix/west0067.mtx
-+ -./qrsimplec < ../Matrix/west0067.mtx
-+ -./qrdemo < ../Matrix/a2.mtx
-+ -./qrdemo < ../Matrix/r2.mtx
-+ -./qrdemo < ../Matrix/a04.mtx
-+ -./qrdemo < ../Matrix/a2.mtx
-+ -./qrdemo < ../Matrix/west0067.mtx
-+ -./qrdemo < ../Matrix/c2.mtx
-+ -./qrdemo < ../Matrix/a0.mtx
-+ -./qrdemo < ../Matrix/lfat5b.mtx
-+ -./qrdemo < ../Matrix/bfwa62.mtx
-+ -./qrdemo < ../Matrix/LFAT5.mtx
-+ -./qrdemo < ../Matrix/b1_ss.mtx
-+ -./qrdemo < ../Matrix/bcspwr01.mtx
-+ -./qrdemo < ../Matrix/lpi_galenet.mtx
-+ -./qrdemo < ../Matrix/lpi_itest6.mtx
-+ -./qrdemo < ../Matrix/ash219.mtx
-+ -./qrdemo < ../Matrix/a4.mtx
-+ -./qrdemo < ../Matrix/s32.mtx
-+ -./qrdemo < ../Matrix/c32.mtx
-+ -./qrdemo < ../Matrix/lp_share1b.mtx
-+ -./qrdemo < ../Matrix/a1.mtx
-+ -./qrdemo < ../Matrix/GD06_theory.mtx
-+ -./qrdemo < ../Matrix/GD01_b.mtx
-+ -./qrdemo < ../Matrix/Tina_AskCal_perm.mtx
-+ -./qrdemo < ../Matrix/Tina_AskCal.mtx
-+ -./qrdemo < ../Matrix/GD98_a.mtx
-+ -./qrdemo < ../Matrix/Ragusa16.mtx
-+ -./qrdemo < ../Matrix/young1c.mtx
-+ -./qrdemoc < ../Matrix/a2.mtx
-+ -./qrdemoc < ../Matrix/r2.mtx
-+ -./qrdemoc < ../Matrix/a04.mtx
-+ -./qrdemoc < ../Matrix/a2.mtx
-+ -./qrdemoc < ../Matrix/west0067.mtx
-+ -./qrdemoc < ../Matrix/c2.mtx
-+ -./qrdemoc < ../Matrix/a0.mtx
-+ -./qrdemoc < ../Matrix/lfat5b.mtx
-+ -./qrdemoc < ../Matrix/bfwa62.mtx
-+ -./qrdemoc < ../Matrix/LFAT5.mtx
-+ -./qrdemoc < ../Matrix/b1_ss.mtx
-+ -./qrdemoc < ../Matrix/bcspwr01.mtx
-+ -./qrdemoc < ../Matrix/lpi_galenet.mtx
-+ -./qrdemoc < ../Matrix/lpi_itest6.mtx
-+ -./qrdemoc < ../Matrix/ash219.mtx
-+ -./qrdemoc < ../Matrix/a4.mtx
-+ -./qrdemoc < ../Matrix/s32.mtx
-+ -./qrdemoc < ../Matrix/c32.mtx
-+ -./qrdemoc < ../Matrix/lp_share1b.mtx
-+ -./qrdemoc < ../Matrix/a1.mtx
-+ -./qrdemoc < ../Matrix/GD06_theory.mtx
-+ -./qrdemoc < ../Matrix/GD01_b.mtx
-+ -./qrdemoc < ../Matrix/Tina_AskCal_perm.mtx
-+ -./qrdemoc < ../Matrix/Tina_AskCal.mtx
-+ -./qrdemoc < ../Matrix/GD98_a.mtx
-+ -./qrdemoc < ../Matrix/Ragusa16.mtx
-+ -./qrdemoc < ../Matrix/young1c.mtx
++ -./qrsimple < $(top_srcdir)/Matrix/ash219.mtx
++ -./qrsimplec < $(top_srcdir)/Matrix/ash219.mtx
++ -./qrsimple < $(top_srcdir)/Matrix/west0067.mtx
++ -./qrsimplec < $(top_srcdir)/Matrix/west0067.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/a2.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/r2.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/a04.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/a2.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/west0067.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/c2.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/a0.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/lfat5b.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/bfwa62.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/LFAT5.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/b1_ss.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/bcspwr01.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/lpi_galenet.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/lpi_itest6.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/ash219.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/a4.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/s32.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/c32.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/lp_share1b.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/a1.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/GD06_theory.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/GD01_b.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/Tina_AskCal_perm.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/Tina_AskCal.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/GD98_a.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/Ragusa16.mtx
++ -./qrdemo < $(top_srcdir)/Matrix/young1c.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/a2.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/r2.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/a04.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/a2.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/west0067.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/c2.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/a0.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/lfat5b.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/bfwa62.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/LFAT5.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/b1_ss.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/bcspwr01.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/lpi_galenet.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/lpi_itest6.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/ash219.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/a4.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/s32.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/c32.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/lp_share1b.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/a1.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/GD06_theory.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/GD01_b.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/Tina_AskCal_perm.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/Tina_AskCal.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/GD98_a.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/Ragusa16.mtx
++ -./qrdemoc < $(top_srcdir)/Matrix/young1c.mtx
diff --git a/Doc/Makefile.am b/Doc/Makefile.am
new file mode 100644
--- /dev/null
+++ b/Doc/Makefile.am
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,28 @@
+EXTRA_DIST = \
+ ChangeLog \
+ README.txt \
-+ gpl.txt \
-+ algo_spqr.pdf \
-+ spqr.pdf
++ gpl.txt
+
+dist_noinst_DATA = \
+ spqr_user_guide.tex \
+ spqr_user_guide.bib
+
-+pdf_DATA = \
++dist_pdf_DATA = \
+ spqr_user_guide.pdf \
+ algo_spqr.pdf \
+ spqr.pdf
+
-+%.pdf: %.tex %.bib
-+ pdflatex $*
-+ bibtex $*
-+ pdflatex $*
-+ pdflatex $*
-+
-+clean-local:
-+ -$(RM) *.aux *.bbl *.blg *.log *.out
++TEX = TEXINPUTS="$(srcdir):" pdflatex -interaction nonstopmode -file-line-error
++BIB = BIBINPUTS="$(srcdir):" bibtex
++%.pdf: %.tex %.bbl
++ $(TEX) $*
++ while grep -q "Rerun to get cross-references right" $*.log; do \
++ $(TEX) $*; \
++ done
++%.bbl: %.aux %.bib
++ $(BIB) $*
++%.aux: %.tex
++ $(TEX) $*
++
++CLEANFILES = *.aux *.bbl *.blg *.log *.toc
++MAINTAINERCLEANFILES = $(dist_pdf_DATA)
diff --git a/Include/Makefile.am b/Include/Makefile.am
new file mode 100644
--- /dev/null
+++ b/Include/Makefile.am
-@@ -0,0 +1,6 @@
-+pkgincludedir = $(includedir)/spqr
+@@ -0,0 +1,5 @@
+pkginclude_HEADERS = \
+ SuiteSparseQR.hpp \
+ SuiteSparseQR_C.h \
@@ -203,10 +206,14 @@ diff --git a/Source/Makefile.am b/Source/Makefile.am
new file mode 100644
--- /dev/null
+++ b/Source/Makefile.am
-@@ -0,0 +1,50 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include $(TBB_CFLAGS) $(CHOLMOD_CFLAGS) $(UFCONFIG_CFLAGS)
-+AM_CPPFLAGS += $(SPQR_NPARTITION)
-+AM_CPPFLAGS += $(SPQR_HAVE_TBB)
+@@ -0,0 +1,54 @@
++AM_CPPFLAGS = -I$(top_srcdir)/Include $(TBB_CFLAGS) $(CHOLMOD_CFLAGS) $(SUITESPARSECONFIG_CFLAGS)
++if !EXPERT
++AM_CPPFLAGS += -DNEXPERT
++endif
++if TBB
++AM_CPPFLAGS += -DHAVE_TBB
++endif
+
+lib_LTLIBRARIES = libspqr.la
+
@@ -252,97 +259,92 @@ new file mode 100644
+ spqr_trapezoidal.cpp \
+ spqr_type.cpp
+
-+libspqr_la_LIBADD = $(TBB_LIBS) $(CHOLMOD_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) -lm
-+libspqr_la_LDFLAGS = -no-undefined -version-info 3:2:2
-diff --git a/acx_blas.m4 b/acx_blas.m4
++libspqr_la_LIBADD = $(TBB_LIBS) $(CHOLMOD_LIBS) $(SUITESPARSECONFIG_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) -lm
++libspqr_la_LDFLAGS = -no-undefined -version-number 1:3:1
+diff --git a/ax_blas.m4 b/ax_blas.m4
new file mode 100644
--- /dev/null
-+++ b/acx_blas.m4
-@@ -0,0 +1,191 @@
-+##### http://autoconf-archive.cryp.to/acx_blas.html
++++ b/ax_blas.m4
+@@ -0,0 +1,238 @@
++# ===========================================================================
++# http://www.gnu.org/software/autoconf-archive/ax_blas.html
++# ===========================================================================
+#
+# SYNOPSIS
+#
-+# ACX_BLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++# AX_BLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
-+# This macro looks for a library that implements the BLAS
-+# linear-algebra interface (see http://www.netlib.org/blas/). On
-+# success, it sets the BLAS_LIBS output variable to hold the
-+# requisite library linkages.
++# This macro looks for a library that implements the BLAS linear-algebra
++# interface (see http://www.netlib.org/blas/). On success, it sets the
++# BLAS_LIBS output variable to hold the requisite library linkages.
+#
+# To link with BLAS, you should link with:
+#
-+# $BLAS_LIBS $LIBS $FLIBS
++# $BLAS_LIBS $LIBS $FLIBS
+#
+# in that order. FLIBS is the output variable of the
-+# AC_F77_LIBRARY_LDFLAGS macro (called if necessary by ACX_BLAS), and
-+# is sometimes necessary in order to link with F77 libraries. Users
-+# will also need to use AC_F77_DUMMY_MAIN (see the autoconf manual),
-+# for the same reason.
++# AC_F77_LIBRARY_LDFLAGS macro (called if necessary by AX_BLAS), and is
++# sometimes necessary in order to link with F77 libraries. Users will also
++# need to use AC_F77_DUMMY_MAIN (see the autoconf manual), for the same
++# reason.
+#
-+# Many libraries are searched for, from ATLAS to CXML to ESSL. The
-+# user may also use --with-blas=<lib> in order to use some specific
-+# BLAS library <lib>. In order to link successfully, however, be
-+# aware that you will probably need to use the same Fortran compiler
-+# (which can be set via the F77 env. var.) as was used to compile the
-+# BLAS library.
++# Many libraries are searched for, from ATLAS to CXML to ESSL. The user
++# may also use --with-blas=<lib> in order to use some specific BLAS
++# library <lib>. In order to link successfully, however, be aware that you
++# will probably need to use the same Fortran compiler (which can be set
++# via the F77 env. var.) as was used to compile the BLAS library.
+#
-+# ACTION-IF-FOUND is a list of shell commands to run if a BLAS
-+# library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-+# run it if it is not found. If ACTION-IF-FOUND is not specified, the
-+# default action will define HAVE_BLAS.
++# ACTION-IF-FOUND is a list of shell commands to run if a BLAS library is
++# found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is
++# not found. If ACTION-IF-FOUND is not specified, the default action will
++# define HAVE_BLAS.
+#
-+# This macro requires autoconf 2.50 or later.
++# LICENSE
+#
-+# LAST MODIFICATION
++# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#
-+# 2007-07-29
++# 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
++# Free Software Foundation, either version 3 of the License, or (at your
++# option) any later version.
+#
-+# COPYLEFT
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++# Public License for more details.
+#
-+# Copyright (c) 2007 Steven G. Johnson <stevenj@alum.mit.edu>
++# You should have received a copy of the GNU General Public License along
++# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
-+# 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 Free Software Foundation, either version 3 of the
-+# License, or (at your option) any later version.
++# As a special exception, the respective Autoconf Macro's copyright owner
++# gives unlimited permission to copy, distribute and modify the configure
++# scripts that are the output of Autoconf when processing the Macro. You
++# need not follow the terms of the GNU General Public License when using
++# or distributing such scripts, even though portions of the text of the
++# Macro appear in them. The GNU General Public License (GPL) does govern
++# all other use of the material that constitutes the Autoconf Macro.
+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program. If not, see
-+# <http://www.gnu.org/licenses/>.
-+#
-+# As a special exception, the respective Autoconf Macro's copyright
-+# owner gives unlimited permission to copy, distribute and modify the
-+# configure scripts that are the output of Autoconf when processing
-+# the Macro. You need not follow the terms of the GNU General Public
-+# License when using or distributing such scripts, even though
-+# portions of the text of the Macro appear in them. The GNU General
-+# Public License (GPL) does govern all other use of the material that
-+# constitutes the Autoconf Macro.
-+#
-+# This special exception to the GPL applies to versions of the
-+# Autoconf Macro released by the Autoconf Macro Archive. When you
-+# make and distribute a modified version of the Autoconf Macro, you
-+# may extend this special exception to the GPL to apply to your
-+# modified version as well.
-+
-+AC_DEFUN([ACX_BLAS], [
++# This special exception to the GPL applies to versions of the Autoconf
++# Macro released by the Autoconf Archive. When you make and distribute a
++# modified version of the Autoconf Macro, you may extend this special
++# exception to the GPL to apply to your modified version as well.
++
++#serial 14
++
++AU_ALIAS([ACX_BLAS], [AX_BLAS])
++AC_DEFUN([AX_BLAS], [
+AC_PREREQ(2.50)
+AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
-+acx_blas_ok=no
++AC_REQUIRE([AC_CANONICAL_HOST])
++ax_blas_ok=no
+
+AC_ARG_WITH(blas,
-+ [AC_HELP_STRING([--with-blas=<lib>], [use BLAS library <lib>])])
++ [AS_HELP_STRING([--with-blas=<lib>], [use BLAS library <lib>])])
+case $with_blas in
+ yes | "") ;;
-+ no) acx_blas_ok=disable ;;
++ no) ax_blas_ok=disable ;;
+ -* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;;
+ *) BLAS_LIBS="-l$with_blas" ;;
+esac
@@ -351,191 +353,240 @@ new file mode 100644
+AC_F77_FUNC(sgemm)
+AC_F77_FUNC(dgemm)
+
-+acx_blas_save_LIBS="$LIBS"
++ax_blas_save_LIBS="$LIBS"
+LIBS="$LIBS $FLIBS"
+
+# First, check BLAS_LIBS environment variable
-+if test $acx_blas_ok = no; then
++if test $ax_blas_ok = no; then
+if test "x$BLAS_LIBS" != x; then
+ save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
+ AC_MSG_CHECKING([for $sgemm in $BLAS_LIBS])
-+ AC_TRY_LINK_FUNC($sgemm, [acx_blas_ok=yes], [BLAS_LIBS=""])
-+ AC_MSG_RESULT($acx_blas_ok)
++ AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes], [BLAS_LIBS=""])
++ AC_MSG_RESULT($ax_blas_ok)
+ LIBS="$save_LIBS"
+fi
+fi
+
+# BLAS linked to by default? (happens on some supercomputers)
-+if test $acx_blas_ok = no; then
++if test $ax_blas_ok = no; then
+ save_LIBS="$LIBS"; LIBS="$LIBS"
-+ AC_CHECK_FUNC($sgemm, [acx_blas_ok=yes])
++ AC_MSG_CHECKING([if $sgemm is being linked in already])
++ AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes])
++ AC_MSG_RESULT($ax_blas_ok)
+ LIBS="$save_LIBS"
+fi
+
++# BLAS in OpenBLAS library? (http://xianyi.github.com/OpenBLAS/)
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(openblas, $sgemm, [ax_blas_ok=yes
++ BLAS_LIBS="-lopenblas"])
++fi
++
+# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
-+if test $acx_blas_ok = no; then
++if test $ax_blas_ok = no; then
+ AC_CHECK_LIB(atlas, ATL_xerbla,
+ [AC_CHECK_LIB(f77blas, $sgemm,
+ [AC_CHECK_LIB(cblas, cblas_dgemm,
-+ [acx_blas_ok=yes
++ [ax_blas_ok=yes
+ BLAS_LIBS="-lcblas -lf77blas -latlas"],
+ [], [-lf77blas -latlas])],
+ [], [-latlas])])
+fi
+
+# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
-+if test $acx_blas_ok = no; then
++if test $ax_blas_ok = no; then
+ AC_CHECK_LIB(blas, $sgemm,
+ [AC_CHECK_LIB(dgemm, $dgemm,
+ [AC_CHECK_LIB(sgemm, $sgemm,
-+ [acx_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"],
++ [ax_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"],
+ [], [-lblas])],
+ [], [-lblas])])
+fi
+
++# BLAS in Intel MKL library?
++if test $ax_blas_ok = no; then
++ # MKL for gfortran
++ if test x"$ac_cv_fc_compiler_gnu" = xyes; then
++ # 64 bit
++ if test $host_cpu = x86_64; then
++ AC_CHECK_LIB(mkl_gf_lp64, $sgemm,
++ [ax_blas_ok=yes;BLAS_LIBS="-lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread"],,
++ [-lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread])
++ # 32 bit
++ elif test $host_cpu = i686; then
++ AC_CHECK_LIB(mkl_gf, $sgemm,
++ [ax_blas_ok=yes;BLAS_LIBS="-lmkl_gf -lmkl_sequential -lmkl_core -lpthread"],,
++ [-lmkl_gf -lmkl_sequential -lmkl_core -lpthread])
++ fi
++ # MKL for other compilers (Intel, PGI, ...?)
++ else
++ # 64-bit
++ if test $host_cpu = x86_64; then
++ AC_CHECK_LIB(mkl_intel_lp64, $sgemm,
++ [ax_blas_ok=yes;BLAS_LIBS="-lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread"],,
++ [-lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread])
++ # 32-bit
++ elif test $host_cpu = i686; then
++ AC_CHECK_LIB(mkl_intel, $sgemm,
++ [ax_blas_ok=yes;BLAS_LIBS="-lmkl_intel -lmkl_sequential -lmkl_core -lpthread"],,
++ [-lmkl_intel -lmkl_sequential -lmkl_core -lpthread])
++ fi
++ fi
++fi
++# Old versions of MKL
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(mkl, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-lmkl -lguide -lpthread"],,[-lguide -lpthread])
++fi
++
++# BLAS in Apple vecLib library?
++if test $ax_blas_ok = no; then
++ save_LIBS="$LIBS"; LIBS="-framework vecLib $LIBS"
++ AC_MSG_CHECKING([for $sgemm in -framework vecLib])
++ AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes;BLAS_LIBS="-framework vecLib"])
++ AC_MSG_RESULT($ax_blas_ok)
++ LIBS="$save_LIBS"
++fi
++
+# BLAS in Alpha CXML library?
-+if test $acx_blas_ok = no; then
-+ AC_CHECK_LIB(cxml, $sgemm, [acx_blas_ok=yes;BLAS_LIBS="-lcxml"])
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(cxml, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-lcxml"])
+fi
+
+# BLAS in Alpha DXML library? (now called CXML, see above)
-+if test $acx_blas_ok = no; then
-+ AC_CHECK_LIB(dxml, $sgemm, [acx_blas_ok=yes;BLAS_LIBS="-ldxml"])
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(dxml, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-ldxml"])
+fi
+
+# BLAS in Sun Performance library?
-+if test $acx_blas_ok = no; then
++if test $ax_blas_ok = no; then
+ if test "x$GCC" != xyes; then # only works with Sun CC
+ AC_CHECK_LIB(sunmath, acosp,
+ [AC_CHECK_LIB(sunperf, $sgemm,
-+ [BLAS_LIBS="-xlic_lib=sunperf -lsunmath"
-+ acx_blas_ok=yes],[],[-lsunmath])])
++ [BLAS_LIBS="-xlic_lib=sunperf -lsunmath"
++ ax_blas_ok=yes],[],[-lsunmath])])
+ fi
+fi
+
+# BLAS in SCSL library? (SGI/Cray Scientific Library)
-+if test $acx_blas_ok = no; then
-+ AC_CHECK_LIB(scs, $sgemm, [acx_blas_ok=yes; BLAS_LIBS="-lscs"])
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(scs, $sgemm, [ax_blas_ok=yes; BLAS_LIBS="-lscs"])
+fi
+
+# BLAS in SGIMATH library?
-+if test $acx_blas_ok = no; then
++if test $ax_blas_ok = no; then
+ AC_CHECK_LIB(complib.sgimath, $sgemm,
-+ [acx_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"])
++ [ax_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"])
+fi
+
+# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
-+if test $acx_blas_ok = no; then
++if test $ax_blas_ok = no; then
+ AC_CHECK_LIB(blas, $sgemm,
+ [AC_CHECK_LIB(essl, $sgemm,
-+ [acx_blas_ok=yes; BLAS_LIBS="-lessl -lblas"],
++ [ax_blas_ok=yes; BLAS_LIBS="-lessl -lblas"],
+ [], [-lblas $FLIBS])])
+fi
+
+# Generic BLAS library?
-+if test $acx_blas_ok = no; then
-+ AC_CHECK_LIB(blas, $sgemm, [acx_blas_ok=yes; BLAS_LIBS="-lblas"])
++if test $ax_blas_ok = no; then
++ AC_CHECK_LIB(blas, $sgemm, [ax_blas_ok=yes; BLAS_LIBS="-lblas"])
+fi
+
+AC_SUBST(BLAS_LIBS)
+
-+LIBS="$acx_blas_save_LIBS"
++LIBS="$ax_blas_save_LIBS"
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x"$acx_blas_ok" = xyes; then
++if test x"$ax_blas_ok" = xyes; then
+ ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1])
+ :
+else
-+ acx_blas_ok=no
++ ax_blas_ok=no
+ $2
+fi
-+])dnl ACX_BLAS
-diff --git a/acx_lapack.m4 b/acx_lapack.m4
++])dnl AX_BLAS
+diff --git a/ax_lapack.m4 b/ax_lapack.m4
new file mode 100644
--- /dev/null
-+++ b/acx_lapack.m4
-@@ -0,0 +1,133 @@
-+##### http://autoconf-archive.cryp.to/acx_lapack.html
++++ b/ax_lapack.m4
+@@ -0,0 +1,131 @@
++# ===========================================================================
++# http://www.gnu.org/software/autoconf-archive/ax_lapack.html
++# ===========================================================================
+#
+# SYNOPSIS
+#
-+# ACX_LAPACK([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++# AX_LAPACK([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
-+# This macro looks for a library that implements the LAPACK
-+# linear-algebra interface (see http://www.netlib.org/lapack/). On
-+# success, it sets the LAPACK_LIBS output variable to hold the
-+# requisite library linkages.
++# This macro looks for a library that implements the LAPACK linear-algebra
++# interface (see http://www.netlib.org/lapack/). On success, it sets the
++# LAPACK_LIBS output variable to hold the requisite library linkages.
+#
+# To link with LAPACK, you should link with:
+#
-+# $LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS
-+#
-+# in that order. BLAS_LIBS is the output variable of the ACX_BLAS
-+# macro, called automatically. FLIBS is the output variable of the
-+# AC_F77_LIBRARY_LDFLAGS macro (called if necessary by ACX_BLAS), and
-+# is sometimes necessary in order to link with F77 libraries. Users
-+# will also need to use AC_F77_DUMMY_MAIN (see the autoconf manual),
-+# for the same reason.
++# $LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS
+#
-+# The user may also use --with-lapack=<lib> in order to use some
-+# specific LAPACK library <lib>. In order to link successfully,
-+# however, be aware that you will probably need to use the same
-+# Fortran compiler (which can be set via the F77 env. var.) as was
-+# used to compile the LAPACK and BLAS libraries.
++# in that order. BLAS_LIBS is the output variable of the AX_BLAS macro,
++# called automatically. FLIBS is the output variable of the
++# AC_F77_LIBRARY_LDFLAGS macro (called if necessary by AX_BLAS), and is
++# sometimes necessary in order to link with F77 libraries. Users will also
++# need to use AC_F77_DUMMY_MAIN (see the autoconf manual), for the same
++# reason.
+#
-+# ACTION-IF-FOUND is a list of shell commands to run if a LAPACK
-+# library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-+# run it if it is not found. If ACTION-IF-FOUND is not specified, the
-+# default action will define HAVE_LAPACK.
++# The user may also use --with-lapack=<lib> in order to use some specific
++# LAPACK library <lib>. In order to link successfully, however, be aware
++# that you will probably need to use the same Fortran compiler (which can
++# be set via the F77 env. var.) as was used to compile the LAPACK and BLAS
++# libraries.
+#
-+# LAST MODIFICATION
++# ACTION-IF-FOUND is a list of shell commands to run if a LAPACK library
++# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
++# is not found. If ACTION-IF-FOUND is not specified, the default action
++# will define HAVE_LAPACK.
+#
-+# 2007-07-29
++# LICENSE
+#
-+# COPYLEFT
++# Copyright (c) 2009 Steven G. Johnson <stevenj@alum.mit.edu>
+#
-+# Copyright (c) 2007 Steven G. Johnson <stevenj@alum.mit.edu>
-+#
-+# 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 Free Software Foundation, either version 3 of the
-+# License, or (at your option) any later version.
++# 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
++# Free Software Foundation, either version 3 of the License, or (at your
++# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program. If not, see
-+# <http://www.gnu.org/licenses/>.
-+#
-+# As a special exception, the respective Autoconf Macro's copyright
-+# owner gives unlimited permission to copy, distribute and modify the
-+# configure scripts that are the output of Autoconf when processing
-+# the Macro. You need not follow the terms of the GNU General Public
-+# License when using or distributing such scripts, even though
-+# portions of the text of the Macro appear in them. The GNU General
-+# Public License (GPL) does govern all other use of the material that
-+# constitutes the Autoconf Macro.
-+#
-+# This special exception to the GPL applies to versions of the
-+# Autoconf Macro released by the Autoconf Macro Archive. When you
-+# make and distribute a modified version of the Autoconf Macro, you
-+# may extend this special exception to the GPL to apply to your
-+# modified version as well.
-+
-+AC_DEFUN([ACX_LAPACK], [
-+AC_REQUIRE([ACX_BLAS])
-+acx_lapack_ok=no
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++# Public License for more details.
++#
++# You should have received a copy of the GNU General Public License along
++# with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++# As a special exception, the respective Autoconf Macro's copyright owner
++# gives unlimited permission to copy, distribute and modify the configure
++# scripts that are the output of Autoconf when processing the Macro. You
++# need not follow the terms of the GNU General Public License when using
++# or distributing such scripts, even though portions of the text of the
++# Macro appear in them. The GNU General Public License (GPL) does govern
++# all other use of the material that constitutes the Autoconf Macro.
++#
++# This special exception to the GPL applies to versions of the Autoconf
++# Macro released by the Autoconf Archive. When you make and distribute a
++# modified version of the Autoconf Macro, you may extend this special
++# exception to the GPL to apply to your modified version as well.
++
++#serial 7
++
++AU_ALIAS([ACX_LAPACK], [AX_LAPACK])
++AC_DEFUN([AX_LAPACK], [
++AC_REQUIRE([AX_BLAS])
++ax_lapack_ok=no
+
+AC_ARG_WITH(lapack,
-+ [AC_HELP_STRING([--with-lapack=<lib>], [use LAPACK library <lib>])])
++ [AS_HELP_STRING([--with-lapack=<lib>], [use LAPACK library <lib>])])
+case $with_lapack in
+ yes | "") ;;
-+ no) acx_lapack_ok=disable ;;
++ no) ax_lapack_ok=disable ;;
+ -* | */* | *.a | *.so | *.so.* | *.o) LAPACK_LIBS="$with_lapack" ;;
+ *) LAPACK_LIBS="-l$with_lapack" ;;
+esac
@@ -544,35 +595,36 @@ new file mode 100644
+AC_F77_FUNC(cheev)
+
+# We cannot use LAPACK if BLAS is not found
-+if test "x$acx_blas_ok" != xyes; then
-+ acx_lapack_ok=noblas
++if test "x$ax_blas_ok" != xyes; then
++ ax_lapack_ok=noblas
++ LAPACK_LIBS=""
+fi
+
+# First, check LAPACK_LIBS environment variable
+if test "x$LAPACK_LIBS" != x; then
+ save_LIBS="$LIBS"; LIBS="$LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS"
+ AC_MSG_CHECKING([for $cheev in $LAPACK_LIBS])
-+ AC_TRY_LINK_FUNC($cheev, [acx_lapack_ok=yes], [LAPACK_LIBS=""])
-+ AC_MSG_RESULT($acx_lapack_ok)
++ AC_TRY_LINK_FUNC($cheev, [ax_lapack_ok=yes], [LAPACK_LIBS=""])
++ AC_MSG_RESULT($ax_lapack_ok)
+ LIBS="$save_LIBS"
-+ if test acx_lapack_ok = no; then
++ if test $ax_lapack_ok = no; then
+ LAPACK_LIBS=""
+ fi
+fi
+
+# LAPACK linked to by default? (is sometimes included in BLAS lib)
-+if test $acx_lapack_ok = no; then
++if test $ax_lapack_ok = no; then
+ save_LIBS="$LIBS"; LIBS="$LIBS $BLAS_LIBS $FLIBS"
-+ AC_CHECK_FUNC($cheev, [acx_lapack_ok=yes])
++ AC_CHECK_FUNC($cheev, [ax_lapack_ok=yes])
+ LIBS="$save_LIBS"
+fi
+
+# Generic LAPACK library?
+for lapack in lapack lapack_rs6k; do
-+ if test $acx_lapack_ok = no; then
++ if test $ax_lapack_ok = no; then
+ save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
+ AC_CHECK_LIB($lapack, $cheev,
-+ [acx_lapack_ok=yes; LAPACK_LIBS="-l$lapack"], [], [$FLIBS])
++ [ax_lapack_ok=yes; LAPACK_LIBS="-l$lapack"], [], [$FLIBS])
+ LIBS="$save_LIBS"
+ fi
+done
@@ -580,101 +632,101 @@ new file mode 100644
+AC_SUBST(LAPACK_LIBS)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x"$acx_lapack_ok" = xyes; then
++if test x"$ax_lapack_ok" = xyes; then
+ ifelse([$1],,AC_DEFINE(HAVE_LAPACK,1,[Define if you have LAPACK library.]),[$1])
+ :
+else
-+ acx_lapack_ok=no
++ ax_lapack_ok=no
+ $2
+fi
-+])dnl ACX_LAPACK
++])dnl AX_LAPACK
diff --git a/configure.ac b/configure.ac
new file mode 100644
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,92 @@
-+AC_PREREQ([2.68])
-+AC_INIT([SPQR],[1.2.2],[davis@cise.ufl.edu])
++# -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_PREREQ([2.69])
++AC_INIT([SPQR],[1.3.1],[DrTimothyAldenDavis@gmail.com],[spqr],[http://www.suitesparse.com/])
+AC_CONFIG_SRCDIR([Source/spqr_kernel.cpp])
-+AC_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([foreign])
+LT_INIT
+
++# Checks for programs.
+AC_PROG_INSTALL
+AC_PROG_F77
+AC_PROG_CC
+AC_PROG_CXX
++AC_LANG([C++])
+
-+AC_MSG_CHECKING([whether to use the CHOLMOD Partition module])
-+AC_ARG_WITH([cholmod-partition],
++AC_MSG_CHECKING([whether to use expert routines])
++AC_ARG_ENABLE([expert],
+ [AS_HELP_STRING(
-+ [--with-cholmod-partition],
-+ [Use METIS in the CHOLMOD partition module for partitioning @<:@default=yes@:>@])],
-+ [with_cholmod_partition=$withval],
-+ [with_cholmod_partition="yes"])
-+AC_MSG_RESULT([$with_cholmod_partition])
++ [--disable-expert],
++ [compile without the min 2-norm solution option])],
++ [expert=$enableval],
++ [expert="yes"])
++AC_MSG_RESULT([$expert])
+
+AC_MSG_CHECKING([whether to use tbb])
+AC_ARG_WITH([tbb],
+ [AS_HELP_STRING(
-+ [--with-tbb],
-+ [Use Intel Threading Building Blocks for multithreading @<:@default=yes@:>@])],
-+ [with_tbb=$withval],
-+ [with_tbb="yes"])
-+AC_MSG_RESULT([$with_tbb])
-+
-+if test "x$with_cholmod_partition" = "xno"; then
-+ AC_DEFINE([NPARTITION], [], [Define if CHOLMOD was compiled without the Partition module])
-+ AC_SUBST([SPQR_NPARTITION], ["-DNPARTITION"])
-+fi
-+
-+if test "x$with_tbb" = "xyes"; then
-+ AC_DEFINE([HAVE_TBB], [], [Define to compile with Threading Building Blocks])
-+ AC_SUBST([SPQR_HAVE_TBB], ["-DHAVE_TBB"])
-+fi
++ [--without-tbb],
++ [do not use Intel Threading Building Blocks for multithreading])],
++ [tbb=$withval],
++ [tbb="yes"])
++AC_MSG_RESULT([$tbb])
+
+LIBS_SAVED=$LIBS
+
++# Checks for libraries.
+AC_CHECK_LIB([m], [sqrt])
+
-+AC_CHECK_HEADERS([float.h stdlib.h sys/time.h])
-+
-+sinclude([acx_blas.m4])
-+sinclude([acx_lapack.m4])
-+ACX_LAPACK
-+
-+if test "x$BLAS_LIBS" = "x"; then
++sinclude([ax_blas.m4])
++AX_BLAS
++if test "x$ax_blas_ok" != "xyes"; then
+ AC_MSG_ERROR([cannot find blas])
+fi
+
-+if test "x$LAPACK_LIBS" = "x"; then
++sinclude([ax_lapack.m4])
++AX_LAPACK
++if test "x$ax_lapack_ok" != "xyes"; then
+ AC_MSG_ERROR([cannot find lapack])
+fi
+
+PKG_PROG_PKG_CONFIG
-+PKG_CHECK_MODULES([UFCONFIG],[ufconfig],
++PKG_CHECK_MODULES([SUITESPARSECONFIG],[suitesparseconfig],
+ [],
-+ [AC_MSG_ERROR([cannot find ufconfig])])
++ [AC_MSG_ERROR([cannot find suitesparseconfig])])
+PKG_CHECK_MODULES([CHOLMOD],[cholmod],
+ [],
+ [AC_MSG_ERROR([cannot find cholmod])])
+
-+if test "x$with_tbb" = "xyes"; then
-+ AC_CHECK_HEADERS([tbb/task.h])
-+ AC_SUBST([TBB_CFLAGS], [""])
-+ AC_SUBST([TBB_LIBS], ["-ltbb"])
++# Checks for header files.
++AC_CHECK_HEADERS([float.h stdlib.h])
++
++if test "x$tbb" = "xyes"; then
++ AC_CHECK_HEADERS([tbb/task_scheduler_init.h tbb/task.h])
+fi
+
-+AC_HEADER_STDBOOL
-+AC_C_INLINE
++# Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_SIZE_T
+
-+AC_CHECK_FUNCS([clock_gettime sqrt])
++# Checks for library functions.
++AC_CHECK_FUNCS([sqrt])
+
+LIBS=$LIBS_SAVED
+
-+AM_CONDITIONAL([CHOLMOD_PARTITION], [test "x$with_cholmod_partition" = "xyes"])
-+AM_CONDITIONAL([WITH_TBB], [test "x$with_tbb" = "xyes"])
++if test "x$tbb" = "xyes"; then
++ AC_SUBST([TBB_CFLAGS], [""])
++ AC_SUBST([TBB_LIBS], ["-ltbb"])
++fi
++
++AM_CONDITIONAL([EXPERT], [test "x$expert" = "xyes"])
++AM_CONDITIONAL([TBB], [test "x$tbb" = "xyes"])
+
+AC_CONFIG_FILES([
+ spqr.pc
@@ -689,7 +741,7 @@ diff --git a/spqr.pc.in b/spqr.pc.in
new file mode 100644
--- /dev/null
+++ b/spqr.pc.in
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
@@ -698,7 +750,8 @@ new file mode 100644
+Name: @PACKAGE_NAME@
+Description: Multifrontal sparse QR factorization
+Version: @PACKAGE_VERSION@
-+Requires.private: cholmod ufconfig
++URL: @PACKAGE_URL@
++Requires.private: cholmod suitesparseconfig
+Libs: -L${libdir} -lspqr
+Libs.private: @TBB_LIBS@ @LAPACK_LIBS@ @BLAS_LIBS@ -lm
+Cflags: -I${includedir}/spqr
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-01 23:49:01 +0000