From 87f823617e83e066654082dd5d1a7ed07b078b72 Mon Sep 17 00:00:00 2001 From: Sameer Agarwal Date: Mon, 10 Jul 2017 11:32:27 -0700 Subject: [PATCH] Fix dynamic_sparsity_test. Skip the test in dynamic_sparsity_test when there are no sparse linear algebra libraries available. Also fix a minor typo in version_history.rst Change-Id: Ie7cc14e655c58b6bd9625ce9f9025f94d0624d2d --- docs/source/version_history.rst | 2 +- internal/ceres/dynamic_sparsity_test.cc | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/source/version_history.rst b/docs/source/version_history.rst index 30316ee12..73fc2f0bc 100644 --- a/docs/source/version_history.rst +++ b/docs/source/version_history.rst @@ -90,7 +90,7 @@ Bug Fixes & Minor Changes #. Fix detection of CMake-built glog on Windows. (Alex Stewart) #. Add additional search paths for glog & Eigen on Windows. (Alex Stewart) -#. Various minor grammar and bug fixes to the documetation (Sameer +#. Various minor grammar and bug fixes to the documentation (Sameer Agarwal, Alex Stewart, William Rucklidge) diff --git a/internal/ceres/dynamic_sparsity_test.cc b/internal/ceres/dynamic_sparsity_test.cc index c6bba2056..5fe60f4f2 100644 --- a/internal/ceres/dynamic_sparsity_test.cc +++ b/internal/ceres/dynamic_sparsity_test.cc @@ -358,6 +358,13 @@ class EuclideanDistanceFunctor { }; TEST(DynamicSparsity, StaticAndDynamicSparsityProduceSameSolution) { + // Skip test if there is no sparse linear algebra library. + if (!IsSparseLinearAlgebraLibraryTypeAvailable(SUITE_SPARSE) && + !IsSparseLinearAlgebraLibraryTypeAvailable(CX_SPARSE) && + !IsSparseLinearAlgebraLibraryTypeAvailable(EIGEN_SPARSE)) { + return; + } + // Problem configuration. const int num_segments = 151; const double regularization_weight = 1e-2;