From e4c990f16de7641d6a15634607b379c8f7bb753d Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Mon, 7 Sep 2015 10:17:28 +0200 Subject: [PATCH] Remove references to Lapack in doc and examples --- Documentation/doc/Documentation/Installation.txt | 9 --------- .../doc/Solver_interface/Concepts/SvdTraits.h | 1 - .../doc/Solver_interface/PackageDescription.txt | 1 - .../doc/Solver_interface/Solver_interface.txt | 6 ++---- .../examples/Solver_interface/CMakeLists.txt | 16 +++------------- .../singular_value_decomposition.cpp | 7 ------- 6 files changed, 5 insertions(+), 35 deletions(-) diff --git a/Documentation/doc/Documentation/Installation.txt b/Documentation/doc/Documentation/Installation.txt index 3a5b6c1c980..f97e1a58731 100644 --- a/Documentation/doc/Documentation/Installation.txt +++ b/Documentation/doc/Documentation/Installation.txt @@ -509,15 +509,6 @@ and the \ref PkgRidges_3 packages. The \sc{Eigen} web site is `http://eigen.tuxfamily.org`. -\subsection thirdpartyLapack Lapack - -\sc{Lapack} is a `Fortran` library for linear algebra. - -In \cgal, \sc{Lapack} is an alternative to \sc{Eigen} for singular value decomposition for the \ref -PkgJet_fitting_3 and the \ref PkgRidges_3 packages. - -The \sc{Lapack} web site is `http://www.netlib.org/lapack/`. - \subsection thirdpartylibQGLViewer libQGLViewer libQGLViewer is a 3D widget based on \sc{Qt} 4's `QGLWidget`. In case of \sc{Qt}5 used, libQGLViewer needs to be recompiled with the proper \sc{Qt}5 version. diff --git a/Solver_interface/doc/Solver_interface/Concepts/SvdTraits.h b/Solver_interface/doc/Solver_interface/Concepts/SvdTraits.h index 495485fbe83..686027ffd17 100644 --- a/Solver_interface/doc/Solver_interface/Concepts/SvdTraits.h +++ b/Solver_interface/doc/Solver_interface/Concepts/SvdTraits.h @@ -6,7 +6,6 @@ to solve in the least square sense a linear system with a singular value decomposition \cgalHasModel `CGAL::Eigen_svd` - \cgalHasModel `CGAL::Lapack_svd` */ class SvdTraits { diff --git a/Solver_interface/doc/Solver_interface/PackageDescription.txt b/Solver_interface/doc/Solver_interface/PackageDescription.txt index 1fc89d13a10..154b9482d9f 100644 --- a/Solver_interface/doc/Solver_interface/PackageDescription.txt +++ b/Solver_interface/doc/Solver_interface/PackageDescription.txt @@ -41,7 +41,6 @@ - `CGAL::Eigen_sparse_matrix` - `CGAL::Eigen_sparse_symmetric_matrix` - `CGAL::Internal_diagonalize_traits` -- `CGAL::Lapack_svd` */ diff --git a/Solver_interface/doc/Solver_interface/Solver_interface.txt b/Solver_interface/doc/Solver_interface/Solver_interface.txt index cc021566810..2693eff9aff 100644 --- a/Solver_interface/doc/Solver_interface/Solver_interface.txt +++ b/Solver_interface/doc/Solver_interface/Solver_interface.txt @@ -49,10 +49,8 @@ class: The concept `SvdTraits` defines an interface for solving in the least square sense a linear system with a singular value decomposition. The -field type is `double`. We provide two models for this concept: - -- `Eigen_svd` uses the \ref thirdpartyEigen library. -- `Lapack_svd` uses the \ref thirdpartyLapack library. +field type is `double`. We provide the model `Eigen_svd` that uses the +\ref thirdpartyEigen library. Here is a simple example that shows how to handle matrices, vectors and this solver: diff --git a/Solver_interface/examples/Solver_interface/CMakeLists.txt b/Solver_interface/examples/Solver_interface/CMakeLists.txt index eead05a759f..be8c1e3069c 100644 --- a/Solver_interface/examples/Solver_interface/CMakeLists.txt +++ b/Solver_interface/examples/Solver_interface/CMakeLists.txt @@ -16,22 +16,12 @@ if ( CGAL_FOUND ) include_directories (BEFORE "../include") - # Use Eigen or BLAS and LAPACK (optional) + # Use Eigen find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater) - if (NOT EIGEN3_FOUND) - find_package(LAPACK) - if(LAPACK_FOUND) - include( ${LAPACK_USE_FILE} ) - endif(LAPACK_FOUND) - else() + + if (EIGEN3_FOUND) include( ${EIGEN3_USE_FILE} ) - endif() - - if(EIGEN3_FOUND OR LAPACK_FOUND) create_single_source_cgal_program( "singular_value_decomposition.cpp" ) - endif() - - if(EIGEN3_FOUND) create_single_source_cgal_program( "sparse_solvers.cpp" ) endif() diff --git a/Solver_interface/examples/Solver_interface/singular_value_decomposition.cpp b/Solver_interface/examples/Solver_interface/singular_value_decomposition.cpp index 11a14619ad0..81fe15e139e 100644 --- a/Solver_interface/examples/Solver_interface/singular_value_decomposition.cpp +++ b/Solver_interface/examples/Solver_interface/singular_value_decomposition.cpp @@ -1,15 +1,8 @@ -// If Eigen is available, use it, otherwise switch to Lapack #ifdef CGAL_EIGEN3_ENABLED #include #include #include typedef CGAL::Eigen_svd Svd; - -#else -#ifdef CGAL_LAPACK_ENABLED -#include -typedef CGAL::Lapack_svd Svd; -#endif #endif typedef Svd::FT FT;