commit c5c2afcc91d01357a47f388f053fb5eb309d4485
author Sameer Agarwal <sameeragarwal@google.com> Fri Aug 12 21:35:15 2022 -0700
committer Sameer Agarwal <sameeragarwal@google.com> Fri Aug 12 21:35:15 2022 -0700
tree 5c01f7c42044a76665e33ca8bc6c1dd61fdec827
parent 07d333fb6870eada8f02c4beb0e8383b5e91dcc9

Fix solver_test.cc for preconditioners and sparse linear algebra libraries

Change-Id: Ia391680f872ab49101f672f676cdd68fe332d1d4

internal/ceres/solver_test.cc

diff --git a/internal/ceres/solver_test.cc b/internal/ceres/solver_test.cc
index 1b61b18..3f9f8a1 100644
--- a/internal/ceres/solver_test.cc
+++ b/internal/ceres/solver_test.cc
@@ -840,52 +840,43 @@
   EXPECT_FALSE(options.IsValid(&message));
 
   options.sparse_linear_algebra_library_type = EIGEN_SPARSE;
-  if (IsSparseLinearAlgebraLibraryTypeAvailable(
-          options.sparse_linear_algebra_library_type)) {
-    options.dynamic_sparsity = false;
-    options.use_mixed_precision_solves = false;
-    EXPECT_TRUE(options.IsValid(&message));
+  options.dynamic_sparsity = false;
+  options.use_mixed_precision_solves = false;
+  EXPECT_TRUE(options.IsValid(&message));
 
-    options.dynamic_sparsity = true;
-    options.use_mixed_precision_solves = false;
-    EXPECT_FALSE(options.IsValid(&message));
+  options.dynamic_sparsity = true;
+  options.use_mixed_precision_solves = false;
+  EXPECT_FALSE(options.IsValid(&message));
 
-    options.dynamic_sparsity = false;
-    options.use_mixed_precision_solves = true;
-    EXPECT_FALSE(options.IsValid(&message));
-  }
+  options.dynamic_sparsity = false;
+  options.use_mixed_precision_solves = true;
+  EXPECT_FALSE(options.IsValid(&message));
 
   options.sparse_linear_algebra_library_type = SUITE_SPARSE;
-  if (IsSparseLinearAlgebraLibraryTypeAvailable(
-          options.sparse_linear_algebra_library_type)) {
-    options.dynamic_sparsity = false;
-    options.use_mixed_precision_solves = false;
-    EXPECT_TRUE(options.IsValid(&message));
+  options.dynamic_sparsity = false;
+  options.use_mixed_precision_solves = false;
+  EXPECT_TRUE(options.IsValid(&message));
 
-    options.dynamic_sparsity = true;
-    options.use_mixed_precision_solves = false;
-    EXPECT_FALSE(options.IsValid(&message));
+  options.dynamic_sparsity = true;
+  options.use_mixed_precision_solves = false;
+  EXPECT_FALSE(options.IsValid(&message));
 
-    options.dynamic_sparsity = false;
-    options.use_mixed_precision_solves = true;
-    EXPECT_FALSE(options.IsValid(&message));
-  }
+  options.dynamic_sparsity = false;
+  options.use_mixed_precision_solves = true;
+  EXPECT_FALSE(options.IsValid(&message));
 
   options.sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
-  if (IsSparseLinearAlgebraLibraryTypeAvailable(
-          options.sparse_linear_algebra_library_type)) {
-    options.dynamic_sparsity = false;
-    options.use_mixed_precision_solves = false;
-    EXPECT_TRUE(options.IsValid(&message));
+  options.dynamic_sparsity = false;
+  options.use_mixed_precision_solves = false;
+  EXPECT_TRUE(options.IsValid(&message));
 
-    options.dynamic_sparsity = true;
-    options.use_mixed_precision_solves = false;
-    EXPECT_FALSE(options.IsValid(&message));
+  options.dynamic_sparsity = true;
+  options.use_mixed_precision_solves = false;
+  EXPECT_FALSE(options.IsValid(&message));
 
-    options.dynamic_sparsity = false;
-    options.use_mixed_precision_solves = true;
-    EXPECT_FALSE(options.IsValid(&message));
-  }
+  options.dynamic_sparsity = false;
+  options.use_mixed_precision_solves = true;
+  EXPECT_FALSE(options.IsValid(&message));
 }
 
 TEST(Solver, CgnrOptionsJacobiPreconditioner) {
@@ -974,46 +965,52 @@
   EXPECT_FALSE(options.IsValid(&message));
 
   options.sparse_linear_algebra_library_type = EIGEN_SPARSE;
+  if (IsSparseLinearAlgebraLibraryTypeAvailable(
+          options.sparse_linear_algebra_library_type)) {
+    options.dynamic_sparsity = false;
+    options.use_mixed_precision_solves = false;
+    EXPECT_TRUE(options.IsValid(&message));
 
-  options.dynamic_sparsity = false;
-  options.use_mixed_precision_solves = false;
-  EXPECT_TRUE(options.IsValid(&message));
+    options.dynamic_sparsity = true;
+    options.use_mixed_precision_solves = false;
+    EXPECT_FALSE(options.IsValid(&message));
 
-  options.dynamic_sparsity = true;
-  options.use_mixed_precision_solves = false;
-  EXPECT_FALSE(options.IsValid(&message));
-
-  options.dynamic_sparsity = false;
-  options.use_mixed_precision_solves = true;
-  EXPECT_FALSE(options.IsValid(&message));
+    options.dynamic_sparsity = false;
+    options.use_mixed_precision_solves = true;
+    EXPECT_FALSE(options.IsValid(&message));
+  }
 
   options.sparse_linear_algebra_library_type = SUITE_SPARSE;
+  if (IsSparseLinearAlgebraLibraryTypeAvailable(
+          options.sparse_linear_algebra_library_type)) {
+    options.dynamic_sparsity = false;
+    options.use_mixed_precision_solves = false;
+    EXPECT_TRUE(options.IsValid(&message));
 
-  options.dynamic_sparsity = false;
-  options.use_mixed_precision_solves = false;
-  EXPECT_TRUE(options.IsValid(&message));
+    options.dynamic_sparsity = true;
+    options.use_mixed_precision_solves = false;
+    EXPECT_FALSE(options.IsValid(&message));
 
-  options.dynamic_sparsity = true;
-  options.use_mixed_precision_solves = false;
-  EXPECT_FALSE(options.IsValid(&message));
-
-  options.dynamic_sparsity = false;
-  options.use_mixed_precision_solves = true;
-  EXPECT_FALSE(options.IsValid(&message));
+    options.dynamic_sparsity = false;
+    options.use_mixed_precision_solves = true;
+    EXPECT_FALSE(options.IsValid(&message));
+  }
 
   options.sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+  if (IsSparseLinearAlgebraLibraryTypeAvailable(
+          options.sparse_linear_algebra_library_type)) {
+    options.dynamic_sparsity = false;
+    options.use_mixed_precision_solves = false;
+    EXPECT_TRUE(options.IsValid(&message));
 
-  options.dynamic_sparsity = false;
-  options.use_mixed_precision_solves = false;
-  EXPECT_TRUE(options.IsValid(&message));
+    options.dynamic_sparsity = true;
+    options.use_mixed_precision_solves = false;
+    EXPECT_FALSE(options.IsValid(&message));
 
-  options.dynamic_sparsity = true;
-  options.use_mixed_precision_solves = false;
-  EXPECT_FALSE(options.IsValid(&message));
-
-  options.dynamic_sparsity = false;
-  options.use_mixed_precision_solves = true;
-  EXPECT_FALSE(options.IsValid(&message));
+    options.dynamic_sparsity = false;
+    options.use_mixed_precision_solves = true;
+    EXPECT_FALSE(options.IsValid(&message));
+  }
 }
 
 TEST(Solver, CgnrOptionsSchurPreconditioners) {