Replace lapack with linalg in MahalanobisDistance

cmake/FindMetaExamples.cmake

@@ -35,7 +35,6 @@ function(get_excluded_meta_examples)
 
 	IF(NOT HAVE_LAPACK)
 		LIST(APPEND EXCLUDED_META_EXAMPLES
-			distance/mahalanobis.sg
 			)
 	ENDIF()
 

src/shogun/distance/MahalanobisDistance.cpp

@@ -7,14 +7,12 @@
 
 #include <shogun/lib/config.h>
 
-#ifdef HAVE_LAPACK
-
-#include <shogun/lib/common.h>
-#include <shogun/io/SGIO.h>
 #include <shogun/distance/MahalanobisDistance.h>
 #include <shogun/features/Features.h>
+#include <shogun/io/SGIO.h>
+#include <shogun/lib/common.h>
 #include <shogun/mathematics/Math.h>
-#include <shogun/mathematics/lapack.h>
+#include <shogun/mathematics/linalg/LinalgNamespace.h>
 
 using namespace shogun;
 
@@ -38,21 +36,25 @@ CMahalanobisDistance::~CMahalanobisDistance()
 bool CMahalanobisDistance::init(CFeatures* l, CFeatures* r)
 {
 	CRealDistance::init(l, r);
-
+	SGMatrix<float64_t> cov;
 
 	if ( l == r)
 	{
 		mean = ((CDenseFeatures<float64_t>*) l)->get_mean();
-		icov  = ((CDenseFeatures<float64_t>*) l)->get_cov();
+		cov = ((CDenseFeatures<float64_t>*)l)->get_cov();
 	}
 	else
 	{
 		mean = ((CDenseFeatures<float64_t>*)l)
 		           ->compute_mean((CDotFeatures*)lhs, (CDotFeatures*)rhs);
-		icov = CDotFeatures::compute_cov((CDotFeatures*) lhs, (CDotFeatures*) rhs);
+		cov = CDotFeatures::compute_cov((CDotFeatures*)lhs, (CDotFeatures*)rhs);
 	}
 
-	SGMatrix<float64_t>::inverse(icov);
+	auto num_features = cov.num_rows;
+	chol_cov_L = SGMatrix<float64_t>(num_features, num_features);
+	chol_cov_d = SGVector<float64_t>(num_features);
+	chol_cov_p = SGVector<index_t>(num_features);
+	linalg::ldlt_factor(cov, chol_cov_L, chol_cov_d, chol_cov_p);
 
 	return true;
 }
@@ -83,12 +85,8 @@ float64_t CMahalanobisDistance::compute(int32_t idx_a, int32_t idx_b)
 	for (int32_t i=0; i < diff.vlen; i++)
 		diff[i] = bvec.vector[i] - diff[i];
 
-	SGVector<float64_t> v = diff.clone();
-	cblas_dgemv(CblasColMajor, CblasNoTrans,
-		icov.num_rows, icov.num_cols, 1.0, icov.matrix,
-		diff.vlen, diff.vector, 1, 0.0, v.vector, 1);
-
-	float64_t result = cblas_ddot(v.vlen, v.vector, 1, diff.vector, 1);
+	auto v = linalg::ldlt_solver(chol_cov_L, chol_cov_d, chol_cov_p, diff);
+	float64_t result = linalg::dot(v, diff);
 
 	if (!use_mean)
 		((CDenseFeatures<float64_t>*) lhs)->free_feature_vector(avec, idx_a);
@@ -110,4 +108,3 @@ void CMahalanobisDistance::init()
 	m_parameters->add(&use_mean, "use_mean", "If distance shall be computed between mean vector and vector from rhs or between lhs and rhs.");
 }
 
-#endif /* HAVE_LAPACK */

src/shogun/distance/MahalanobisDistance.h

@@ -10,44 +10,45 @@
 
 #include <shogun/lib/config.h>
 
-#ifdef HAVE_LAPACK
-
 #include <shogun/lib/common.h>
 #include <shogun/distance/RealDistance.h>
 
 namespace shogun
 {
-/** @brief class MahalanobisDistance
- *
- * The Mahalanobis distance for real valued features computes the distance
- * between a feature vector and a distribution of features characterized by its
- * mean and covariance.
- *
- * \f[\displaystyle
- *  D = \sqrt{ (x_i - \mu)^T \Sigma^{-1} (x_i - \mu)  }
- * \f]
- *
- * The Mahalanobis Squared distance does not take the square root:
- *
- * \f[\displaystyle
- *  D = (x_i - \mu)^T \Sigma^{-1} (x_i - \mu)
- * \f]
- *
- * If use_mean is set to false (which it is by default) the distance is computed
- * as
- *
- * \f[\displaystyle
- *  D = \sqrt{ (x_i - x_i')^T \Sigma^{-1} (x_i - x_i')  }
- * \f]
- *
- * i.e., instead of the mean as reference two vector \f$x_i\f$ and \f$x_i'\f$
- * are compared.
- *
- * @see <a href="en.wikipedia.org/wiki/Mahalanobis_distance">
- * Wikipedia: Mahalanobis Distance</a>
- */
-class CMahalanobisDistance: public CRealDistance
-{
+	/** @brief class MahalanobisDistance
+	 *
+	 * The Mahalanobis distance for real valued features computes the distance
+	 * between a feature vector and a distribution of features characterized by
+	 * its
+	 * mean and covariance.
+	 *
+	 * \f[\displaystyle
+	 *  D = \sqrt{ (x_i - \mu)^T \Sigma^{-1} (x_i - \mu)  }
+	 * \f]
+	 *
+	 * The Mahalanobis Squared distance does not take the square root:
+	 *
+	 * \f[\displaystyle
+	 *  D = (x_i - \mu)^T \Sigma^{-1} (x_i - \mu)
+	 * \f]
+	 *
+	 * If use_mean is set to false (which it is by default) the distance is
+	 * computed
+	 * as
+	 *
+	 * \f[\displaystyle
+	 *  D = \sqrt{ (x_i - x_i')^T \Sigma^{-1} (x_i - x_i')  }
+	 * \f]
+	 *
+	 * i.e., instead of the mean as reference two vector \f$x_i\f$ and
+	 * \f$x_i'\f$
+	 * are compared.
+	 *
+	 * @see <a href="http://en.wikipedia.org/wiki/Mahalanobis_distance">
+	 * Wikipedia: Mahalanobis Distance</a>
+	 */
+	class CMahalanobisDistance : public CRealDistance
+	{
 	public:
 		/** default constructor */
 		CMahalanobisDistance();
@@ -141,10 +142,13 @@ class CMahalanobisDistance: public CRealDistance
 
 		/** vector mean of the lhs feature vectors */
 		SGVector<float64_t> mean;
-		/** inverse of the covariance matrix of lhs feature vectors */
-		SGMatrix<float64_t> icov;
+
+		/** LDLT decomposition of the covariance matrix of lhs feature vectors
+		 */
+		SGMatrix<float64_t> chol_cov_L;
+		SGVector<float64_t> chol_cov_d;
+		SGVector<index_t> chol_cov_p;
 };
 
 } // namespace shogun
-#endif /* HAVE_LAPACK */
 #endif /* _MAHALANOBISDISTANCE_H__ */

tests/unit/distance/MahalanobisDistance_unittest.cc

@@ -0,0 +1,33 @@
+/*
+ * This software is distributed under BSD 3-clause license (see LICENSE file).
+ *
+ * Authors: Wuwei Lin
+ */
+
+#include <gtest/gtest.h>
+#include <shogun/base/some.h>
+#include <shogun/distance/MahalanobisDistance.h>
+#include <shogun/features/DenseFeatures.h>
+#include <shogun/lib/common.h>
+
+using namespace shogun;
+
+TEST(MahalanobisDistance, compute_distance)
+{
+	// create four points (0,0) (2,10) (2,8) (5,5)
+	SGMatrix<float64_t> rect(2, 4);
+	rect(0, 0) = 0;
+	rect(1, 0) = 0;
+	rect(0, 1) = 2;
+	rect(1, 1) = 10;
+	rect(0, 2) = 2;
+	rect(1, 2) = 8;
+	rect(0, 3) = 5;
+	rect(1, 3) = 5;
+
+	auto feature = some<CDenseFeatures<float64_t>>(rect);
+	auto distance = some<CMahalanobisDistance>(feature, feature);
+	EXPECT_NEAR(distance->distance(1, 1), 0.0, 1e-10);
+	EXPECT_NEAR(distance->distance(1, 3), 2.63447126986, 1e-10);
+	EXPECT_NEAR(distance->distance(2, 3), 2.22834405812, 1e-10);
+}