diff --git a/.gitattributes b/.gitattributes index 73b96f7862a..2d93a73505a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -711,9 +711,12 @@ Installation/config/support/S80-QT3MT -text Installation/config/support/S81-QT3ST -text Installation/config/support/S82-QT3MSMT -text Installation/config/support/S83-QT3MSST -text -Installation/config/support/S91-TAUCSWIN -text -Installation/config/support/S92-TAUCS -text -Installation/config/support/S93-TAUCSFREEBSD -text +Installation/config/support/S91a-TAUCSWINLAPACK -text +Installation/config/support/S91b-TAUCSWINATLAS -text +Installation/config/support/S92a-TAUCSLAPACK -text +Installation/config/support/S92b-TAUCSATLAS -text +Installation/config/support/S93a-TAUCSFREEBSDLAPACK -text +Installation/config/support/S93b-TAUCSFREEBSDATLAS -text Installation/config/support/S96-TAUCSDARWIN -text Installation/config/support/S98-TAUCSIRIXCC32 -text Installation/config/support/S99-TAUCSIRIXCC64 -text diff --git a/Installation/config/support/S52-BLASIFORTATLAS b/Installation/config/support/S52-BLASIFORTATLAS index 5e85a3462d9..1ec9d0b4e72 100644 --- a/Installation/config/support/S52-BLASIFORTATLAS +++ b/Installation/config/support/S52-BLASIFORTATLAS @@ -4,7 +4,7 @@ # This configuration has been tested with g++ and icpc. DESCRIPTION = ATLAS/Intel Fortan/Linux -PROVIDES = BLAS +PROVIDES = ATLAS BLAS CXXFLAGS = -DCGAL_USE_F2C LDFLAGS = LIBS = lapack f77blas cblas atlas ifcore imf pthread diff --git a/Installation/config/support/S53-BLASGCCATLAS b/Installation/config/support/S53-BLASGCCATLAS index 730334cb2aa..a01e4f3e164 100644 --- a/Installation/config/support/S53-BLASGCCATLAS +++ b/Installation/config/support/S53-BLASGCCATLAS @@ -4,7 +4,7 @@ # This configuration has been tested with g++ and icpc. DESCRIPTION = ATLAS for gcc -PROVIDES = BLAS +PROVIDES = ATLAS BLAS CXXFLAGS = -DCGAL_USE_F2C LDFLAGS = LIBS = lapack f77blas cblas atlas g2c diff --git a/Installation/config/support/S54-BLASWINATLAS b/Installation/config/support/S54-BLASWINATLAS index 41bdb7a272e..8b1836bd5a3 100644 --- a/Installation/config/support/S54-BLASWINATLAS +++ b/Installation/config/support/S54-BLASWINATLAS @@ -3,7 +3,7 @@ # Note: this configuration has been tested with VisualC++ 7.1. DESCRIPTION = ATLAS for MS Windows -PROVIDES = BLAS +PROVIDES = ATLAS BLAS CXXFLAGS = -DCGAL_USE_F2C LDFLAGS = LIBS = liblapack libf77blas libcblas libatlas vcf2c diff --git a/Installation/config/support/S91a-TAUCSWINLAPACK b/Installation/config/support/S91a-TAUCSWINLAPACK new file mode 100644 index 00000000000..98684f1e03a --- /dev/null +++ b/Installation/config/support/S91a-TAUCSWINLAPACK @@ -0,0 +1,18 @@ +# TAUCS, a Library of Sparse Linear Solvers (http://www.tau.ac.il/~stoledo/taucs/) +# Note: TAUCS requires either ATLAS or LAPACK for dpotrf() Lapack routine. +# Note: this configuration has been tested with VisualC++ 7.1. + +DESCRIPTION = MS Windows with LAPACK +PROVIDES = TAUCS +CXXFLAGS = +LDFLAGS = +LIBS = libtaucs libmetis +REQUIRES = BLAS LAPACK DOLLAR_WINDOWS_COMPILER +INCOMPATIBLE = +STDINCLDIRS = +INCLTHING = +STDLIBDIRS = +LIBTHING = +COMPILETESTFLAGS = + +# EOF diff --git a/Installation/config/support/S91-TAUCSWIN b/Installation/config/support/S91b-TAUCSWINATLAS similarity index 65% rename from Installation/config/support/S91-TAUCSWIN rename to Installation/config/support/S91b-TAUCSWINATLAS index 0faed11cf42..d9b37898374 100644 --- a/Installation/config/support/S91-TAUCSWIN +++ b/Installation/config/support/S91b-TAUCSWINATLAS @@ -1,12 +1,13 @@ # TAUCS, a Library of Sparse Linear Solvers (http://www.tau.ac.il/~stoledo/taucs/) +# Note: TAUCS requires either ATLAS or LAPACK for dpotrf() Lapack routine. # Note: this configuration has been tested with VisualC++ 7.1. -DESCRIPTION = MS Windows +DESCRIPTION = MS Windows with ATLAS PROVIDES = TAUCS CXXFLAGS = LDFLAGS = LIBS = libtaucs libmetis -REQUIRES = BLAS DOLLAR_WINDOWS_COMPILER +REQUIRES = BLAS ATLAS DOLLAR_WINDOWS_COMPILER INCOMPATIBLE = STDINCLDIRS = INCLTHING = diff --git a/Installation/config/support/S92a-TAUCSLAPACK b/Installation/config/support/S92a-TAUCSLAPACK new file mode 100644 index 00000000000..d1959ca5fe0 --- /dev/null +++ b/Installation/config/support/S92a-TAUCSLAPACK @@ -0,0 +1,18 @@ +# TAUCS, a Library of Sparse Linear Solvers (http://www.tau.ac.il/~stoledo/taucs/) +# Note: TAUCS requires either ATLAS or LAPACK for dpotrf() Lapack routine. +# This configuration has been tested with g++, Sun CC and icpc. + +DESCRIPTION = Unix with LAPACK +PROVIDES = TAUCS +CXXFLAGS = +LDFLAGS = +LIBS = taucs metis +REQUIRES = BLAS LAPACK +INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER +STDINCLDIRS = +INCLTHING = +STDLIBDIRS = +LIBTHING = +COMPILETESTFLAGS = + +# EOF diff --git a/Installation/config/support/S92-TAUCS b/Installation/config/support/S92b-TAUCSATLAS similarity index 53% rename from Installation/config/support/S92-TAUCS rename to Installation/config/support/S92b-TAUCSATLAS index 9525fc6df25..78d750f45d3 100644 --- a/Installation/config/support/S92-TAUCS +++ b/Installation/config/support/S92b-TAUCSATLAS @@ -1,16 +1,18 @@ # TAUCS, a Library of Sparse Linear Solvers (http://www.tau.ac.il/~stoledo/taucs/) +# Note: TAUCS requires either ATLAS or LAPACK for dpotrf() Lapack routine. +# This configuration has been tested with g++, Sun CC and icpc. -DESCRIPTION = Unix +DESCRIPTION = Unix with ATLAS PROVIDES = TAUCS CXXFLAGS = LDFLAGS = LIBS = taucs metis -REQUIRES = BLAS +REQUIRES = BLAS ATLAS INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER STDINCLDIRS = INCLTHING = STDLIBDIRS = LIBTHING = -COMPILETESTFLAGS = +COMPILETESTFLAGS = # EOF diff --git a/Installation/config/support/S93a-TAUCSFREEBSDLAPACK b/Installation/config/support/S93a-TAUCSFREEBSDLAPACK new file mode 100644 index 00000000000..1c148f3107a --- /dev/null +++ b/Installation/config/support/S93a-TAUCSFREEBSDLAPACK @@ -0,0 +1,19 @@ +# TAUCS, a Library of Sparse Linear Solvers (http://www.tau.ac.il/~stoledo/taucs/) +# FreeBSD requires compat library for ftime(). +# Note: TAUCS requires either ATLAS or LAPACK for dpotrf() Lapack routine. +# This configuration has *not* been tested. + +DESCRIPTION = FreeBSD with LAPACK +PROVIDES = TAUCS +CXXFLAGS = +LDFLAGS = +LIBS = taucs metis compat +REQUIRES = BLAS LAPACK +INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER +STDINCLDIRS = +INCLTHING = +STDLIBDIRS = +LIBTHING = +COMPILETESTFLAGS = + +# EOF diff --git a/Installation/config/support/S93-TAUCSFREEBSD b/Installation/config/support/S93b-TAUCSFREEBSDATLAS similarity index 54% rename from Installation/config/support/S93-TAUCSFREEBSD rename to Installation/config/support/S93b-TAUCSFREEBSDATLAS index fdcbb35909b..cd8c98f8456 100644 --- a/Installation/config/support/S93-TAUCSFREEBSD +++ b/Installation/config/support/S93b-TAUCSFREEBSDATLAS @@ -1,12 +1,14 @@ # TAUCS, a Library of Sparse Linear Solvers (http://www.tau.ac.il/~stoledo/taucs/) -# FreeBSD requires compat library for ftime() +# FreeBSD requires compat library for ftime(). +# Note: TAUCS requires either ATLAS or LAPACK for dpotrf() Lapack routine. +# This configuration has *not* been tested. -DESCRIPTION = FreeBSD +DESCRIPTION = FreeBSD with ATLAS PROVIDES = TAUCS CXXFLAGS = LDFLAGS = LIBS = taucs metis compat -REQUIRES = BLAS +REQUIRES = BLAS ATLAS INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER STDINCLDIRS = INCLTHING = diff --git a/Installation/config/support/S96-TAUCSDARWIN b/Installation/config/support/S96-TAUCSDARWIN index 0b25452bebe..4f7fbeba18e 100644 --- a/Installation/config/support/S96-TAUCSDARWIN +++ b/Installation/config/support/S96-TAUCSDARWIN @@ -1,13 +1,15 @@ # TAUCS, a Library of Sparse Linear Solvers (http://www.tau.ac.il/~stoledo/taucs/) -# MacOSX requires crypto library for ftime() +# MacOSX requires crypto library for ftime(). +# Note: TAUCS requires either ATLAS or LAPACK for dpotrf() Lapack routine. +# This configuration has *not* been tested. DESCRIPTION = MacOSX PROVIDES = TAUCS CXXFLAGS = LDFLAGS = LIBS = taucs metis crypto -REQUIRES = BLAS DOLLAR_DARWIN_COMPILER -INCOMPATIBLE = +REQUIRES = BLAS LAPACK DOLLAR_DARWIN_COMPILER +INCOMPATIBLE = STDINCLDIRS = INCLTHING = STDLIBDIRS = diff --git a/Installation/config/support/S98-TAUCSIRIXCC32 b/Installation/config/support/S98-TAUCSIRIXCC32 index 81c667b9880..9a05cc21962 100644 --- a/Installation/config/support/S98-TAUCSIRIXCC32 +++ b/Installation/config/support/S98-TAUCSIRIXCC32 @@ -1,4 +1,5 @@ # TAUCS, a Library of Sparse Linear Solvers (http://www.tau.ac.il/~stoledo/taucs/) +# Note: TAUCS requires either ATLAS or LAPACK for dpotrf() Lapack routine. # This configuration has *not* been tested. DESCRIPTION = TAUCS for IRIX 32 bits @@ -6,12 +7,12 @@ PROVIDES = TAUCS CXXFLAGS = LDFLAGS = LIBS = taucs metis32 -REQUIRES = BLAS +REQUIRES = BLAS LAPACK INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER STDINCLDIRS = INCLTHING = STDLIBDIRS = LIBTHING = -COMPILETESTFLAGS = +COMPILETESTFLAGS = # EOF diff --git a/Installation/config/support/S99-TAUCSIRIXCC64 b/Installation/config/support/S99-TAUCSIRIXCC64 index bf7990a3387..df0632a3b0f 100644 --- a/Installation/config/support/S99-TAUCSIRIXCC64 +++ b/Installation/config/support/S99-TAUCSIRIXCC64 @@ -1,4 +1,5 @@ # TAUCS, a Library of Sparse Linear Solvers (http://www.tau.ac.il/~stoledo/taucs/) +# Note: TAUCS requires either ATLAS or LAPACK for dpotrf() Lapack routine. # This configuration has *not* been tested. DESCRIPTION = TAUCS for IRIX 64 bits @@ -6,12 +7,12 @@ PROVIDES = TAUCS CXXFLAGS = LDFLAGS = LIBS = taucs metis64 -REQUIRES = BLAS +REQUIRES = BLAS LAPACK INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER STDINCLDIRS = INCLTHING = STDLIBDIRS = LIBTHING = -COMPILETESTFLAGS = +COMPILETESTFLAGS = # EOF diff --git a/Installation/config/support/test_ATLAS.cpp b/Installation/config/support/test_ATLAS.cpp new file mode 100644 index 00000000000..66d0960d7d1 --- /dev/null +++ b/Installation/config/support/test_ATLAS.cpp @@ -0,0 +1,46 @@ +// Copyright (c) 2007 INRIA Sophia-Antipolis (France). +// All rights reserved. +// +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// +// $URL$ +// $Id$ +// +// Author(s) : Laurent Saboret + +// Test if the LAPACK subset in ATLAS is available + + +#include + +extern "C" { + // Fortran interface taken from ATLAS/interfaces/lapack/F77/src/dpotrf.f + extern void dpotrf_(char *uplo, int *n, double *a, int *lda, int *info); +} + + +int main() +{ + // Call dpotrf_() Lapack routine (Cholesky factorization) + int sn_size = 0; + int lda = 1; + int info; + dpotrf_((char*)"LOWER", + &sn_size, + NULL, + &lda, + &info); + + std::cout << "ok for ATLAS" << std::endl; + + return 0; +}