Skip to content

Commit

Permalink
More lapack genocide in converter module
Browse files Browse the repository at this point in the history
  • Loading branch information
lisitsyn committed Jan 17, 2013
1 parent 7694f60 commit dd6df90
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/shogun/converter/DiffusionMaps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <shogun/converter/DiffusionMaps.h>
#include <shogun/converter/EmbeddingConverter.h>
#include <shogun/lib/config.h>
#ifdef HAVE_LAPACK
#ifdef HAVE_EIGEN3
#include <shogun/distance/EuclideanDistance.h>
#include <shogun/lib/tapkee/tapkee_shogun.hpp>

Expand Down Expand Up @@ -85,4 +85,4 @@ CDenseFeatures<float64_t>* CDiffusionMaps::embed_distance(CDistance* distance)
parameters.distance = distance;
return tapkee_embed(parameters);
}
#endif /* HAVE_LAPACK */
#endif /* HAVE_EIGEN3 */
2 changes: 1 addition & 1 deletion src/shogun/converter/Isomap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

#include <shogun/converter/Isomap.h>
#ifdef HAVE_LAPACK
#ifdef HAVE_EIGEN3
#include <shogun/io/SGIO.h>
#include <shogun/lib/Signal.h>
#include <shogun/lib/tapkee/tapkee_shogun.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/converter/LinearLocalTangentSpaceAlignment.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

#include <shogun/converter/LinearLocalTangentSpaceAlignment.h>
#ifdef HAVE_LAPACK
#ifdef HAVE_EIGEN3
#include <shogun/io/SGIO.h>
#include <shogun/kernel/LinearKernel.h>
#include <shogun/lib/tapkee/tapkee_shogun.hpp>
Expand Down
6 changes: 0 additions & 6 deletions src/shogun/converter/LocallyLinearEmbedding.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ class CDistance;
* Retrieved from:
* http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.123.7319&rep=rep1&type=pdf
*
* Due to computation speed, ARPACK is being used with small
* regularization of weight matrix and Cholesky factorization is used
* internally for Lanzcos iterations (in case of only LAPACK is available)
* and SUPERLU library for fast solving sparse equations stated by ARPACK
* is being used if available.
*
* It is optimized with alignment formulation as described in
*
* Zhao, D. (2006).
Expand Down

0 comments on commit dd6df90

Please sign in to comment.