fix formatting generated files (best effort)
- update file generator scripts / templates so generated files adhere
to clang-format
- A few exceptions are not fixed, where the file generation results in
lines of different width. To properly fix this would make the code
more complicated and it's not that important for generated files
anyway.
- note that generated files are excluded in ./scripts/format_all.sh
Change-Id: I4f42c83d1fec01242eada5e7ce6c1a5192234d37
diff --git a/internal/ceres/generate_bundle_adjustment_tests.py b/internal/ceres/generate_bundle_adjustment_tests.py
index a3469eb..7b0caa3 100644
--- a/internal/ceres/generate_bundle_adjustment_tests.py
+++ b/internal/ceres/generate_bundle_adjustment_tests.py
@@ -130,24 +130,22 @@
TEST_F(BundleAdjustmentTest,
%(test_class_name)s) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = %(num_threads)s;
- options->linear_solver_type = %(linear_solver)s;
- options->sparse_linear_algebra_library_type = %(sparse_backend)s;
- options->preconditioner_type = %(preconditioner)s;
- if (%(ordering)s) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = %(num_threads)s;
+ options->linear_solver_type = %(linear_solver)s;
+ options->sparse_linear_algebra_library_type = %(sparse_backend)s;
+ options->preconditioner_type = %(preconditioner)s;
+ if (%(ordering)s) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
-%(preprocessor_conditions_end)s
-""")
+%(preprocessor_conditions_end)s""")
def camelcasify(token):
"""Convert capitalized underscore tokens to camel case"""
diff --git a/internal/ceres/generate_template_specializations.py b/internal/ceres/generate_template_specializations.py
index 5e91f8d..1fb89f4 100644
--- a/internal/ceres/generate_template_specializations.py
+++ b/internal/ceres/generate_template_specializations.py
@@ -101,9 +101,9 @@
return "%s"
if (len(conditionals) == 1):
- return " if " + conditionals[0] + "{\n %s\n }\n"
+ return " if " + conditionals[0] + " {\n %s\n }\n"
- return " if (" + " &&\n ".join(conditionals) + ") {\n %s\n }\n"
+ return " if (" + " &&\n ".join(conditionals) + ") {\n %s\n }\n"
def Specialize(name, data):
"""
@@ -186,9 +186,10 @@
"""
QUERY_FILE_HEADER = """
-#include "ceres/internal/eigen.h"
#include "ceres/schur_templates.h"
+#include "ceres/internal/eigen.h"
+
namespace ceres {
namespace internal {
@@ -214,10 +215,10 @@
} // namespace ceres
"""
-QUERY_ACTION = """ *row_block_size = %s;
- *e_block_size = %s;
- *f_block_size = %s;
- return;"""
+QUERY_ACTION = """ *row_block_size = %s;
+ *e_block_size = %s;
+ *f_block_size = %s;
+ return;"""
def GenerateQueryFile():
"""
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_2_2.cc b/internal/ceres/generated/partitioned_matrix_view_2_2_2.cc
index 86ad17b..38c0fb6 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_2_2.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_2_2.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_2_3.cc b/internal/ceres/generated/partitioned_matrix_view_2_2_3.cc
index 33018d5..6cd43a6 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_2_3.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_2_3.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_2_4.cc b/internal/ceres/generated/partitioned_matrix_view_2_2_4.cc
index a429a54..83a3fa6 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_2_4.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_2_4.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_2_d.cc b/internal/ceres/generated/partitioned_matrix_view_2_2_d.cc
index f6f03ea..ac0c4bd 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_2_d.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_2_d.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_3_3.cc b/internal/ceres/generated/partitioned_matrix_view_2_3_3.cc
index 0b73e1a..6421e35 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_3_3.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_3_3.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_3_4.cc b/internal/ceres/generated/partitioned_matrix_view_2_3_4.cc
index bc4a861..ba44c5f 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_3_4.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_3_4.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_3_6.cc b/internal/ceres/generated/partitioned_matrix_view_2_3_6.cc
index fe8f7dd..dcfdd78 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_3_6.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_3_6.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_3_9.cc b/internal/ceres/generated/partitioned_matrix_view_2_3_9.cc
index ac493fc..22266d8 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_3_9.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_3_9.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_3_d.cc b/internal/ceres/generated/partitioned_matrix_view_2_3_d.cc
index e29efaf..cdae548 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_3_d.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_3_d.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_4_3.cc b/internal/ceres/generated/partitioned_matrix_view_2_4_3.cc
index e61e0a3..0909b59 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_4_3.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_4_3.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_4_4.cc b/internal/ceres/generated/partitioned_matrix_view_2_4_4.cc
index 2e1170d..302bfa1 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_4_4.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_4_4.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_4_6.cc b/internal/ceres/generated/partitioned_matrix_view_2_4_6.cc
index 4a5590d..e1a3434 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_4_6.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_4_6.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_4_8.cc b/internal/ceres/generated/partitioned_matrix_view_2_4_8.cc
index 83015f1..7690df5 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_4_8.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_4_8.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_4_9.cc b/internal/ceres/generated/partitioned_matrix_view_2_4_9.cc
index 25671f9..775a7f0 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_4_9.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_4_9.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_4_d.cc b/internal/ceres/generated/partitioned_matrix_view_2_4_d.cc
index d259802..cb70b05 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_4_d.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_4_d.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_2_d_d.cc b/internal/ceres/generated/partitioned_matrix_view_2_d_d.cc
index c956759..bf52689 100644
--- a/internal/ceres/generated/partitioned_matrix_view_2_d_d.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_2_d_d.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_3_3_3.cc b/internal/ceres/generated/partitioned_matrix_view_3_3_3.cc
index d3b20be..5ccad86 100644
--- a/internal/ceres/generated/partitioned_matrix_view_3_3_3.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_3_3_3.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_4_4_2.cc b/internal/ceres/generated/partitioned_matrix_view_4_4_2.cc
index f08049c..4d27393 100644
--- a/internal/ceres/generated/partitioned_matrix_view_4_4_2.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_4_4_2.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_4_4_3.cc b/internal/ceres/generated/partitioned_matrix_view_4_4_3.cc
index 9342612..a17cd6b 100644
--- a/internal/ceres/generated/partitioned_matrix_view_4_4_3.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_4_4_3.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_4_4_4.cc b/internal/ceres/generated/partitioned_matrix_view_4_4_4.cc
index 8b273fa..8136383 100644
--- a/internal/ceres/generated/partitioned_matrix_view_4_4_4.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_4_4_4.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_4_4_d.cc b/internal/ceres/generated/partitioned_matrix_view_4_4_d.cc
index e8b45e4..46ac514 100644
--- a/internal/ceres/generated/partitioned_matrix_view_4_4_d.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_4_4_d.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/partitioned_matrix_view_d_d_d.cc b/internal/ceres/generated/partitioned_matrix_view_d_d_d.cc
index 3545b86..72277b0 100644
--- a/internal/ceres/generated/partitioned_matrix_view_d_d_d.cc
+++ b/internal/ceres/generated/partitioned_matrix_view_d_d_d.cc
@@ -39,14 +39,15 @@
//
// This file is generated using generate_template_specializations.py.
-
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
-template class PartitionedMatrixView<Eigen::Dynamic, Eigen::Dynamic, Eigen::Dynamic>;
+template class PartitionedMatrixView<Eigen::Dynamic,
+ Eigen::Dynamic,
+ Eigen::Dynamic>;
} // namespace internal
} // namespace ceres
diff --git a/internal/ceres/generated/schur_eliminator_2_2_2.cc b/internal/ceres/generated/schur_eliminator_2_2_2.cc
index 79fcf43..d2e2895 100644
--- a/internal/ceres/generated/schur_eliminator_2_2_2.cc
+++ b/internal/ceres/generated/schur_eliminator_2_2_2.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_2_3.cc b/internal/ceres/generated/schur_eliminator_2_2_3.cc
index edd7fb6..d7e5b64 100644
--- a/internal/ceres/generated/schur_eliminator_2_2_3.cc
+++ b/internal/ceres/generated/schur_eliminator_2_2_3.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_2_4.cc b/internal/ceres/generated/schur_eliminator_2_2_4.cc
index 692267d..b288fbf 100644
--- a/internal/ceres/generated/schur_eliminator_2_2_4.cc
+++ b/internal/ceres/generated/schur_eliminator_2_2_4.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_2_d.cc b/internal/ceres/generated/schur_eliminator_2_2_d.cc
index 33d9c6d..8b92703 100644
--- a/internal/ceres/generated/schur_eliminator_2_2_d.cc
+++ b/internal/ceres/generated/schur_eliminator_2_2_d.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_3_3.cc b/internal/ceres/generated/schur_eliminator_2_3_3.cc
index 4a5e2fe..e339a68 100644
--- a/internal/ceres/generated/schur_eliminator_2_3_3.cc
+++ b/internal/ceres/generated/schur_eliminator_2_3_3.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_3_4.cc b/internal/ceres/generated/schur_eliminator_2_3_4.cc
index 7ee63d0..c85f703 100644
--- a/internal/ceres/generated/schur_eliminator_2_3_4.cc
+++ b/internal/ceres/generated/schur_eliminator_2_3_4.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_3_6.cc b/internal/ceres/generated/schur_eliminator_2_3_6.cc
index 108760e..dac6f36 100644
--- a/internal/ceres/generated/schur_eliminator_2_3_6.cc
+++ b/internal/ceres/generated/schur_eliminator_2_3_6.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_3_9.cc b/internal/ceres/generated/schur_eliminator_2_3_9.cc
index 4fea2fa..d9152f0 100644
--- a/internal/ceres/generated/schur_eliminator_2_3_9.cc
+++ b/internal/ceres/generated/schur_eliminator_2_3_9.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_3_d.cc b/internal/ceres/generated/schur_eliminator_2_3_d.cc
index 0d13c99..aa9aa61 100644
--- a/internal/ceres/generated/schur_eliminator_2_3_d.cc
+++ b/internal/ceres/generated/schur_eliminator_2_3_d.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_4_3.cc b/internal/ceres/generated/schur_eliminator_2_4_3.cc
index 3827c65..5f19f7b 100644
--- a/internal/ceres/generated/schur_eliminator_2_4_3.cc
+++ b/internal/ceres/generated/schur_eliminator_2_4_3.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_4_4.cc b/internal/ceres/generated/schur_eliminator_2_4_4.cc
index 47bdfab..3e1430c 100644
--- a/internal/ceres/generated/schur_eliminator_2_4_4.cc
+++ b/internal/ceres/generated/schur_eliminator_2_4_4.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_4_6.cc b/internal/ceres/generated/schur_eliminator_2_4_6.cc
index 3777be2..accc1b5 100644
--- a/internal/ceres/generated/schur_eliminator_2_4_6.cc
+++ b/internal/ceres/generated/schur_eliminator_2_4_6.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_4_8.cc b/internal/ceres/generated/schur_eliminator_2_4_8.cc
index 862c76a..3568aad 100644
--- a/internal/ceres/generated/schur_eliminator_2_4_8.cc
+++ b/internal/ceres/generated/schur_eliminator_2_4_8.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_4_9.cc b/internal/ceres/generated/schur_eliminator_2_4_9.cc
index 5b5b7cc..8d11a10 100644
--- a/internal/ceres/generated/schur_eliminator_2_4_9.cc
+++ b/internal/ceres/generated/schur_eliminator_2_4_9.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_4_d.cc b/internal/ceres/generated/schur_eliminator_2_4_d.cc
index ce2d450..02d8cfa 100644
--- a/internal/ceres/generated/schur_eliminator_2_4_d.cc
+++ b/internal/ceres/generated/schur_eliminator_2_4_d.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_2_d_d.cc b/internal/ceres/generated/schur_eliminator_2_d_d.cc
index 9b02bd9..9d715dd 100644
--- a/internal/ceres/generated/schur_eliminator_2_d_d.cc
+++ b/internal/ceres/generated/schur_eliminator_2_d_d.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_3_3_3.cc b/internal/ceres/generated/schur_eliminator_3_3_3.cc
index 1cbeadf..25277e3 100644
--- a/internal/ceres/generated/schur_eliminator_3_3_3.cc
+++ b/internal/ceres/generated/schur_eliminator_3_3_3.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_4_4_2.cc b/internal/ceres/generated/schur_eliminator_4_4_2.cc
index 10f709d..6bb8bd6 100644
--- a/internal/ceres/generated/schur_eliminator_4_4_2.cc
+++ b/internal/ceres/generated/schur_eliminator_4_4_2.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_4_4_3.cc b/internal/ceres/generated/schur_eliminator_4_4_3.cc
index bcbcc74..ab2abaa 100644
--- a/internal/ceres/generated/schur_eliminator_4_4_3.cc
+++ b/internal/ceres/generated/schur_eliminator_4_4_3.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_4_4_4.cc b/internal/ceres/generated/schur_eliminator_4_4_4.cc
index 44ecc87..d29116a 100644
--- a/internal/ceres/generated/schur_eliminator_4_4_4.cc
+++ b/internal/ceres/generated/schur_eliminator_4_4_4.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_4_4_d.cc b/internal/ceres/generated/schur_eliminator_4_4_d.cc
index 69c8563..dd64907 100644
--- a/internal/ceres/generated/schur_eliminator_4_4_d.cc
+++ b/internal/ceres/generated/schur_eliminator_4_4_d.cc
@@ -44,8 +44,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated/schur_eliminator_d_d_d.cc b/internal/ceres/generated/schur_eliminator_d_d_d.cc
index 348708b..281a0e8 100644
--- a/internal/ceres/generated/schur_eliminator_d_d_d.cc
+++ b/internal/ceres/generated/schur_eliminator_d_d_d.cc
@@ -39,9 +39,8 @@
//
// This file is generated using generate_template_specializations.py.
-
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_auto_test.cc
index 642e9f2..c0585e8 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_auto_test.cc
@@ -42,20 +42,18 @@
TEST_F(BundleAdjustmentTest,
DenseSchur_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = DENSE_SCHUR;
- options->sparse_linear_algebra_library_type = NO_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = DENSE_SCHUR;
+ options->sparse_linear_algebra_library_type = NO_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_auto_threads_test.cc
index 10b19b7..2ece1b4 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_auto_threads_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
DenseSchur_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = DENSE_SCHUR;
- options->sparse_linear_algebra_library_type = NO_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = DENSE_SCHUR;
+ options->sparse_linear_algebra_library_type = NO_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_THREADS
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_user_test.cc
index f852a46..983c09e 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_user_test.cc
@@ -42,20 +42,18 @@
TEST_F(BundleAdjustmentTest,
DenseSchur_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = DENSE_SCHUR;
- options->sparse_linear_algebra_library_type = NO_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = DENSE_SCHUR;
+ options->sparse_linear_algebra_library_type = NO_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_user_threads_test.cc
index 324998f..5b739f9 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_user_threads_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
DenseSchur_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = DENSE_SCHUR;
- options->sparse_linear_algebra_library_type = NO_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = DENSE_SCHUR;
+ options->sparse_linear_algebra_library_type = NO_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_THREADS
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_test.cc
index 30443af..f2a6661 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_AccelerateSparse_ClusterJacobi_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_threads_test.cc
index f61e1d6..0178c67 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_AccelerateSparse_ClusterJacobi_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_test.cc
index 6de1e4b..6f29df5 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_AccelerateSparse_ClusterJacobi_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_threads_test.cc
index 74cb674..c92b364 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_AccelerateSparse_ClusterJacobi_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_test.cc
index 4168466..576a251 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_AccelerateSparse_ClusterTridiagonal_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_threads_test.cc
index 11c962b..363c92a 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_AccelerateSparse_ClusterTridiagonal_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_test.cc
index b8cb11d..7444a77 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_AccelerateSparse_ClusterTridiagonal_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_threads_test.cc
index ff2e8de..f258e6b 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_AccelerateSparse_ClusterTridiagonal_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_auto_test.cc
index 4ee23a5..9f7032b 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_CxSparse_ClusterJacobi_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_auto_threads_test.cc
index 85c5d83..3d807cf 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_CxSparse_ClusterJacobi_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_user_test.cc
index 5b03651..5883d12 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_CxSparse_ClusterJacobi_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_user_threads_test.cc
index e855875..b98933d 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clustjacobi_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_CxSparse_ClusterJacobi_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_auto_test.cc
index acc6e0d..f29e939 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_CxSparse_ClusterTridiagonal_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_auto_threads_test.cc
index 62c9924..b45d65c 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_CxSparse_ClusterTridiagonal_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_user_test.cc
index bd86d9c..35a68e8 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_CxSparse_ClusterTridiagonal_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_user_threads_test.cc
index ea53a6e..ac3dc25 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cxsparse_clusttri_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_CxSparse_ClusterTridiagonal_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_test.cc
index 78cd02e..92b3021 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_EigenSparse_ClusterJacobi_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_threads_test.cc
index 83693b1..dc72edf 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_EigenSparse_ClusterJacobi_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_test.cc
index dcc42cd..576b8be 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_EigenSparse_ClusterJacobi_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_threads_test.cc
index 8566dce..786c19a 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_EigenSparse_ClusterJacobi_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_test.cc
index aef25fe..cb3c958 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_EigenSparse_ClusterTridiagonal_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_threads_test.cc
index 58389c6..3851bfc 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_EigenSparse_ClusterTridiagonal_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_test.cc
index eee6da0..0df51c2 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_EigenSparse_ClusterTridiagonal_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_threads_test.cc
index 826239b..33c6bb8 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_EigenSparse_ClusterTridiagonal_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_test.cc
index e59be90..78d8d44 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_test.cc
@@ -42,20 +42,18 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_Jacobi_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = NO_SPARSE;
- options->preconditioner_type = JACOBI;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = NO_SPARSE;
+ options->preconditioner_type = JACOBI;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_threads_test.cc
index 7bcdad2..98fa68b 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_threads_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_Jacobi_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = NO_SPARSE;
- options->preconditioner_type = JACOBI;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = NO_SPARSE;
+ options->preconditioner_type = JACOBI;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_THREADS
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_test.cc
index c58f2fd..07fa0a0 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_test.cc
@@ -42,20 +42,18 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_Jacobi_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = NO_SPARSE;
- options->preconditioner_type = JACOBI;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = NO_SPARSE;
+ options->preconditioner_type = JACOBI;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_threads_test.cc
index ef73824..3244173 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_threads_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_Jacobi_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = NO_SPARSE;
- options->preconditioner_type = JACOBI;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = NO_SPARSE;
+ options->preconditioner_type = JACOBI;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_THREADS
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_test.cc
index 0f775e1..61f2c51 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_test.cc
@@ -42,20 +42,18 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_SchurJacobi_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = NO_SPARSE;
- options->preconditioner_type = SCHUR_JACOBI;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = NO_SPARSE;
+ options->preconditioner_type = SCHUR_JACOBI;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_threads_test.cc
index 9d91c81..3bfb35c 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_threads_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_SchurJacobi_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = NO_SPARSE;
- options->preconditioner_type = SCHUR_JACOBI;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = NO_SPARSE;
+ options->preconditioner_type = SCHUR_JACOBI;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_THREADS
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_test.cc
index 564104c..f84b561 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_test.cc
@@ -42,20 +42,18 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_SchurJacobi_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = NO_SPARSE;
- options->preconditioner_type = SCHUR_JACOBI;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = NO_SPARSE;
+ options->preconditioner_type = SCHUR_JACOBI;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_threads_test.cc
index f37de7a..9206290 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_threads_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_SchurJacobi_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = NO_SPARSE;
- options->preconditioner_type = SCHUR_JACOBI;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = NO_SPARSE;
+ options->preconditioner_type = SCHUR_JACOBI;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_THREADS
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_test.cc
index 71b774e..ec63ae1 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_SuiteSparse_ClusterJacobi_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_threads_test.cc
index 23706a6..de40b81 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_SuiteSparse_ClusterJacobi_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_test.cc
index e2a3bb2..5406840 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_SuiteSparse_ClusterJacobi_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_threads_test.cc
index 05b270c..9e8aeec 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_SuiteSparse_ClusterJacobi_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = CLUSTER_JACOBI;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = CLUSTER_JACOBI;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_test.cc
index 04ad42e..fc80339 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_SuiteSparse_ClusterTridiagonal_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_threads_test.cc
index 2164c11..f4962ab 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_SuiteSparse_ClusterTridiagonal_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_test.cc
index a0c213c..7f99834 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_SuiteSparse_ClusterTridiagonal_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_threads_test.cc
index 15eb761..041b77a 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
IterativeSchur_SuiteSparse_ClusterTridiagonal_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = ITERATIVE_SCHUR;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = CLUSTER_TRIDIAGONAL;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = ITERATIVE_SCHUR;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = CLUSTER_TRIDIAGONAL;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_test.cc
index 4683d2b..95d6259 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_AccelerateSparse_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_threads_test.cc
index 1b63415..cf525bc 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_AccelerateSparse_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_test.cc
index bdc7d62..01c86f8 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_AccelerateSparse_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_threads_test.cc
index 36567f1..b562b99 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_AccelerateSparse_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_auto_test.cc
index b47daef..aa0dc2c 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_CxSparse_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_auto_threads_test.cc
index 22d1002..367c4fb 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_CxSparse_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_user_test.cc
index e0c5268..523e031 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_CxSparse_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_user_threads_test.cc
index 2ea905a..e1923ee 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cxsparse_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_CxSparse_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_test.cc
index ce502d6..e9202e9 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_EigenSparse_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_threads_test.cc
index b91a6d4..769e3c8 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_EigenSparse_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_test.cc
index e17caf6..87763c5 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_EigenSparse_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_threads_test.cc
index b17f480..38e10d9 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_EigenSparse_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_test.cc
index e114a51..fd9b6e7 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_SuiteSparse_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_threads_test.cc
index 3340f2f..476087b 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_SuiteSparse_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_test.cc
index 8998e90..be64ae8 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_SuiteSparse_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_threads_test.cc
index b13e26d..d6a2653 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseNormalCholesky_SuiteSparse_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_test.cc
index b43a26a..923eca4 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_AccelerateSparse_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_threads_test.cc
index 7e330c4..8b1a613 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_AccelerateSparse_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_test.cc
index b5738b7..b107c68 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_AccelerateSparse_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_threads_test.cc
index b5c6105..a765e8a 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_AccelerateSparse_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = ACCELERATE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_ACCELERATE_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_auto_test.cc
index 6d9fb7c..5f2d3d9 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_CxSparse_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_auto_threads_test.cc
index 69e8cce..791e8af 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_CxSparse_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_user_test.cc
index f60b7c1..260d2d7 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_CxSparse_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_user_threads_test.cc
index cfb9798..bf01577 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cxsparse_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_CxSparse_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = CX_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = CX_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_CXSPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_test.cc
index a143591..eeac03c 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_EigenSparse_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_threads_test.cc
index 111c2a4..86d4ce4 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_EigenSparse_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_test.cc
index 9ad242e..434b466 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_EigenSparse_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_threads_test.cc
index abd914d..db6e0cf 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_EigenSparse_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = EIGEN_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_USE_EIGEN_SPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_test.cc
index 21d0e50..8dd0117 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_SuiteSparse_AutomaticOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_threads_test.cc
index 145eb9d..b497938 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_SuiteSparse_AutomaticOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kAutomaticOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kAutomaticOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_test.cc
index f73cc7d..1a38e9e 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_test.cc
@@ -44,22 +44,20 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_SuiteSparse_UserOrdering) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 1;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 1;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
} // namespace ceres
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_threads_test.cc
index b0d67d7..05f28af 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_threads_test.cc
@@ -45,18 +45,17 @@
TEST_F(BundleAdjustmentTest,
SparseSchur_SuiteSparse_UserOrdering_Threads) { // NOLINT
- BundleAdjustmentProblem bundle_adjustment_problem;
- Solver::Options* options =
- bundle_adjustment_problem.mutable_solver_options();
- options->num_threads = 4;
- options->linear_solver_type = SPARSE_SCHUR;
- options->sparse_linear_algebra_library_type = SUITE_SPARSE;
- options->preconditioner_type = IDENTITY;
- if (kUserOrdering) {
- options->linear_solver_ordering.reset();
- }
- Problem* problem = bundle_adjustment_problem.mutable_problem();
- RunSolverForConfigAndExpectResidualsMatch(*options, problem);
+ BundleAdjustmentProblem bundle_adjustment_problem;
+ Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+ options->num_threads = 4;
+ options->linear_solver_type = SPARSE_SCHUR;
+ options->sparse_linear_algebra_library_type = SUITE_SPARSE;
+ options->preconditioner_type = IDENTITY;
+ if (kUserOrdering) {
+ options->linear_solver_ordering.reset();
+ }
+ Problem* problem = bundle_adjustment_problem.mutable_problem();
+ RunSolverForConfigAndExpectResidualsMatch(*options, problem);
}
} // namespace internal
@@ -64,4 +63,3 @@
#endif // CERES_NO_THREADS
#endif // CERES_NO_SUITESPARSE
-
diff --git a/internal/ceres/partitioned_matrix_view.cc b/internal/ceres/partitioned_matrix_view.cc
index d7a998d..b0d21b7 100644
--- a/internal/ceres/partitioned_matrix_view.cc
+++ b/internal/ceres/partitioned_matrix_view.cc
@@ -39,124 +39,146 @@
//
// This file is generated using generate_template_specializations.py.
-#include "ceres/linear_solver.h"
#include "ceres/partitioned_matrix_view.h"
+
#include "ceres/internal/eigen.h"
+#include "ceres/linear_solver.h"
namespace ceres {
namespace internal {
-PartitionedMatrixViewBase*
-PartitionedMatrixViewBase::Create(const LinearSolver::Options& options,
- const BlockSparseMatrix& matrix) {
+PartitionedMatrixViewBase* PartitionedMatrixViewBase::Create(
+ const LinearSolver::Options& options, const BlockSparseMatrix& matrix) {
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
- if ((options.row_block_size == 2) &&
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 2) &&
(options.f_block_size == 2)) {
- return new PartitionedMatrixView<2, 2, 2>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 2, 2>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 2) &&
(options.f_block_size == 3)) {
- return new PartitionedMatrixView<2, 2, 3>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 2, 3>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 2) &&
(options.f_block_size == 4)) {
- return new PartitionedMatrixView<2, 2, 4>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 2, 4>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 2)) {
- return new PartitionedMatrixView<2, 2, Eigen::Dynamic>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 2, Eigen::Dynamic>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3) &&
(options.f_block_size == 3)) {
- return new PartitionedMatrixView<2, 3, 3>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 3, 3>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3) &&
(options.f_block_size == 4)) {
- return new PartitionedMatrixView<2, 3, 4>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 3, 4>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3) &&
(options.f_block_size == 6)) {
- return new PartitionedMatrixView<2, 3, 6>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 3, 6>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3) &&
(options.f_block_size == 9)) {
- return new PartitionedMatrixView<2, 3, 9>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 3, 9>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3)) {
- return new PartitionedMatrixView<2, 3, Eigen::Dynamic>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 3, Eigen::Dynamic>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 3)) {
- return new PartitionedMatrixView<2, 4, 3>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 4, 3>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 4)) {
- return new PartitionedMatrixView<2, 4, 4>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 4, 4>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 6)) {
- return new PartitionedMatrixView<2, 4, 6>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 4, 6>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 8)) {
- return new PartitionedMatrixView<2, 4, 8>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 4, 8>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 9)) {
- return new PartitionedMatrixView<2, 4, 9>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 2) &&
+ return new PartitionedMatrixView<2, 4, 9>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4)) {
- return new PartitionedMatrixView<2, 4, Eigen::Dynamic>(matrix, options.elimination_groups[0]);
- }
- if (options.row_block_size == 2){
- return new PartitionedMatrixView<2, Eigen::Dynamic, Eigen::Dynamic>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 3) &&
+ return new PartitionedMatrixView<2, 4, Eigen::Dynamic>(matrix,
+ options.elimination_groups[0]);
+ }
+ if (options.row_block_size == 2) {
+ return new PartitionedMatrixView<2, Eigen::Dynamic, Eigen::Dynamic>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 3) &&
(options.e_block_size == 3) &&
(options.f_block_size == 3)) {
- return new PartitionedMatrixView<3, 3, 3>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 4) &&
+ return new PartitionedMatrixView<3, 3, 3>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 4) &&
(options.e_block_size == 4) &&
(options.f_block_size == 2)) {
- return new PartitionedMatrixView<4, 4, 2>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 4) &&
+ return new PartitionedMatrixView<4, 4, 2>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 4) &&
(options.e_block_size == 4) &&
(options.f_block_size == 3)) {
- return new PartitionedMatrixView<4, 4, 3>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 4) &&
+ return new PartitionedMatrixView<4, 4, 3>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 4) &&
(options.e_block_size == 4) &&
(options.f_block_size == 4)) {
- return new PartitionedMatrixView<4, 4, 4>(matrix, options.elimination_groups[0]);
- }
- if ((options.row_block_size == 4) &&
+ return new PartitionedMatrixView<4, 4, 4>(matrix,
+ options.elimination_groups[0]);
+ }
+ if ((options.row_block_size == 4) &&
(options.e_block_size == 4)) {
- return new PartitionedMatrixView<4, 4, Eigen::Dynamic>(matrix, options.elimination_groups[0]);
- }
+ return new PartitionedMatrixView<4, 4, Eigen::Dynamic>(matrix,
+ options.elimination_groups[0]);
+ }
#endif
VLOG(1) << "Template specializations not found for <"
- << options.row_block_size << ","
- << options.e_block_size << ","
+ << options.row_block_size << "," << options.e_block_size << ","
<< options.f_block_size << ">";
- return new PartitionedMatrixView<Eigen::Dynamic, Eigen::Dynamic, Eigen::Dynamic>(
- matrix, options.elimination_groups[0]);
+ return new PartitionedMatrixView<Eigen::Dynamic,
+ Eigen::Dynamic,
+ Eigen::Dynamic>(
+ matrix, options.elimination_groups[0]);
};
} // namespace internal
diff --git a/internal/ceres/partitioned_matrix_view_template.py b/internal/ceres/partitioned_matrix_view_template.py
index 7894523..1f24ac1 100644
--- a/internal/ceres/partitioned_matrix_view_template.py
+++ b/internal/ceres/partitioned_matrix_view_template.py
@@ -89,14 +89,15 @@
"""
DYNAMIC_FILE = """
-
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
-template class PartitionedMatrixView<%s, %s, %s>;
+template class PartitionedMatrixView<%s,
+ %s,
+ %s>;
} // namespace internal
} // namespace ceres
@@ -108,8 +109,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/partitioned_matrix_view_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/partitioned_matrix_view_impl.h"
namespace ceres {
namespace internal {
@@ -123,28 +124,30 @@
"""
FACTORY_FILE_HEADER = """
-#include "ceres/linear_solver.h"
#include "ceres/partitioned_matrix_view.h"
+
#include "ceres/internal/eigen.h"
+#include "ceres/linear_solver.h"
namespace ceres {
namespace internal {
-PartitionedMatrixViewBase*
-PartitionedMatrixViewBase::Create(const LinearSolver::Options& options,
- const BlockSparseMatrix& matrix) {
+PartitionedMatrixViewBase* PartitionedMatrixViewBase::Create(
+ const LinearSolver::Options& options, const BlockSparseMatrix& matrix) {
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
"""
-FACTORY = """ return new PartitionedMatrixView<%s, %s, %s>(matrix, options.elimination_groups[0]);"""
+FACTORY = """ return new PartitionedMatrixView<%s, %s, %s>(matrix,
+ options.elimination_groups[0]);"""
FACTORY_FOOTER = """
#endif
VLOG(1) << "Template specializations not found for <"
- << options.row_block_size << ","
- << options.e_block_size << ","
+ << options.row_block_size << "," << options.e_block_size << ","
<< options.f_block_size << ">";
- return new PartitionedMatrixView<Eigen::Dynamic, Eigen::Dynamic, Eigen::Dynamic>(
- matrix, options.elimination_groups[0]);
+ return new PartitionedMatrixView<Eigen::Dynamic,
+ Eigen::Dynamic,
+ Eigen::Dynamic>(
+ matrix, options.elimination_groups[0]);
};
} // namespace internal
diff --git a/internal/ceres/schur_eliminator.cc b/internal/ceres/schur_eliminator.cc
index bc8ced4..33bb624 100644
--- a/internal/ceres/schur_eliminator.cc
+++ b/internal/ceres/schur_eliminator.cc
@@ -39,122 +39,123 @@
//
// This file is generated using generate_template_specializations.py.
-#include "ceres/linear_solver.h"
#include "ceres/schur_eliminator.h"
+
#include "ceres/internal/eigen.h"
+#include "ceres/linear_solver.h"
namespace ceres {
namespace internal {
-SchurEliminatorBase*
-SchurEliminatorBase::Create(const LinearSolver::Options& options) {
+SchurEliminatorBase* SchurEliminatorBase::Create(
+ const LinearSolver::Options& options) {
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
- if ((options.row_block_size == 2) &&
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 2) &&
(options.f_block_size == 2)) {
- return new SchurEliminator<2, 2, 2>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 2, 2>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 2) &&
(options.f_block_size == 3)) {
- return new SchurEliminator<2, 2, 3>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 2, 3>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 2) &&
(options.f_block_size == 4)) {
- return new SchurEliminator<2, 2, 4>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 2, 4>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 2)) {
- return new SchurEliminator<2, 2, Eigen::Dynamic>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 2, Eigen::Dynamic>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3) &&
(options.f_block_size == 3)) {
- return new SchurEliminator<2, 3, 3>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 3, 3>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3) &&
(options.f_block_size == 4)) {
- return new SchurEliminator<2, 3, 4>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 3, 4>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3) &&
(options.f_block_size == 6)) {
- return new SchurEliminator<2, 3, 6>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 3, 6>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3) &&
(options.f_block_size == 9)) {
- return new SchurEliminator<2, 3, 9>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 3, 9>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3)) {
- return new SchurEliminator<2, 3, Eigen::Dynamic>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 3, Eigen::Dynamic>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 3)) {
- return new SchurEliminator<2, 4, 3>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 4, 3>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 4)) {
- return new SchurEliminator<2, 4, 4>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 4, 4>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 6)) {
- return new SchurEliminator<2, 4, 6>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 4, 6>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 8)) {
- return new SchurEliminator<2, 4, 8>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 4, 8>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 9)) {
- return new SchurEliminator<2, 4, 9>(options);
- }
- if ((options.row_block_size == 2) &&
+ return new SchurEliminator<2, 4, 9>(options);
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4)) {
- return new SchurEliminator<2, 4, Eigen::Dynamic>(options);
- }
- if (options.row_block_size == 2){
- return new SchurEliminator<2, Eigen::Dynamic, Eigen::Dynamic>(options);
- }
- if ((options.row_block_size == 3) &&
+ return new SchurEliminator<2, 4, Eigen::Dynamic>(options);
+ }
+ if (options.row_block_size == 2) {
+ return new SchurEliminator<2, Eigen::Dynamic, Eigen::Dynamic>(options);
+ }
+ if ((options.row_block_size == 3) &&
(options.e_block_size == 3) &&
(options.f_block_size == 3)) {
- return new SchurEliminator<3, 3, 3>(options);
- }
- if ((options.row_block_size == 4) &&
+ return new SchurEliminator<3, 3, 3>(options);
+ }
+ if ((options.row_block_size == 4) &&
(options.e_block_size == 4) &&
(options.f_block_size == 2)) {
- return new SchurEliminator<4, 4, 2>(options);
- }
- if ((options.row_block_size == 4) &&
+ return new SchurEliminator<4, 4, 2>(options);
+ }
+ if ((options.row_block_size == 4) &&
(options.e_block_size == 4) &&
(options.f_block_size == 3)) {
- return new SchurEliminator<4, 4, 3>(options);
- }
- if ((options.row_block_size == 4) &&
+ return new SchurEliminator<4, 4, 3>(options);
+ }
+ if ((options.row_block_size == 4) &&
(options.e_block_size == 4) &&
(options.f_block_size == 4)) {
- return new SchurEliminator<4, 4, 4>(options);
- }
- if ((options.row_block_size == 4) &&
+ return new SchurEliminator<4, 4, 4>(options);
+ }
+ if ((options.row_block_size == 4) &&
(options.e_block_size == 4)) {
- return new SchurEliminator<4, 4, Eigen::Dynamic>(options);
- }
+ return new SchurEliminator<4, 4, Eigen::Dynamic>(options);
+ }
#endif
VLOG(1) << "Template specializations not found for <"
- << options.row_block_size << ","
- << options.e_block_size << ","
+ << options.row_block_size << "," << options.e_block_size << ","
<< options.f_block_size << ">";
- return new SchurEliminator<Eigen::Dynamic, Eigen::Dynamic, Eigen::Dynamic>(options);
+ return new SchurEliminator<Eigen::Dynamic, Eigen::Dynamic, Eigen::Dynamic>(
+ options);
}
} // namespace internal
diff --git a/internal/ceres/schur_eliminator_template.py b/internal/ceres/schur_eliminator_template.py
index 2f38cf5..04b705e 100644
--- a/internal/ceres/schur_eliminator_template.py
+++ b/internal/ceres/schur_eliminator_template.py
@@ -93,9 +93,8 @@
"""
DYNAMIC_FILE = """
-
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
@@ -112,8 +111,8 @@
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
-#include "ceres/schur_eliminator_impl.h"
#include "ceres/internal/eigen.h"
+#include "ceres/schur_eliminator_impl.h"
namespace ceres {
namespace internal {
@@ -127,27 +126,28 @@
"""
FACTORY_FILE_HEADER = """
-#include "ceres/linear_solver.h"
#include "ceres/schur_eliminator.h"
+
#include "ceres/internal/eigen.h"
+#include "ceres/linear_solver.h"
namespace ceres {
namespace internal {
-SchurEliminatorBase*
-SchurEliminatorBase::Create(const LinearSolver::Options& options) {
+SchurEliminatorBase* SchurEliminatorBase::Create(
+ const LinearSolver::Options& options) {
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
"""
-FACTORY = """ return new SchurEliminator<%s, %s, %s>(options);"""
+FACTORY = """ return new SchurEliminator<%s, %s, %s>(options);"""
FACTORY_FOOTER = """
#endif
VLOG(1) << "Template specializations not found for <"
- << options.row_block_size << ","
- << options.e_block_size << ","
+ << options.row_block_size << "," << options.e_block_size << ","
<< options.f_block_size << ">";
- return new SchurEliminator<Eigen::Dynamic, Eigen::Dynamic, Eigen::Dynamic>(options);
+ return new SchurEliminator<Eigen::Dynamic, Eigen::Dynamic, Eigen::Dynamic>(
+ options);
}
} // namespace internal
diff --git a/internal/ceres/schur_templates.cc b/internal/ceres/schur_templates.cc
index 0152861..b234b8c 100644
--- a/internal/ceres/schur_templates.cc
+++ b/internal/ceres/schur_templates.cc
@@ -39,9 +39,10 @@
//
// This file is generated using generate_template_specializations.py.
-#include "ceres/internal/eigen.h"
#include "ceres/schur_templates.h"
+#include "ceres/internal/eigen.h"
+
namespace ceres {
namespace internal {
@@ -56,168 +57,168 @@
*e_block_size = Eigen::Dynamic;
*f_block_size = Eigen::Dynamic;
#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
- if ((options.row_block_size == 2) &&
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 2) &&
(options.f_block_size == 2)) {
- *row_block_size = 2;
- *e_block_size = 2;
- *f_block_size = 2;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 2;
+ *f_block_size = 2;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 2) &&
(options.f_block_size == 3)) {
- *row_block_size = 2;
- *e_block_size = 2;
- *f_block_size = 3;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 2;
+ *f_block_size = 3;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 2) &&
(options.f_block_size == 4)) {
- *row_block_size = 2;
- *e_block_size = 2;
- *f_block_size = 4;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 2;
+ *f_block_size = 4;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 2)) {
- *row_block_size = 2;
- *e_block_size = 2;
- *f_block_size = Eigen::Dynamic;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 2;
+ *f_block_size = Eigen::Dynamic;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3) &&
(options.f_block_size == 3)) {
- *row_block_size = 2;
- *e_block_size = 3;
- *f_block_size = 3;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 3;
+ *f_block_size = 3;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3) &&
(options.f_block_size == 4)) {
- *row_block_size = 2;
- *e_block_size = 3;
- *f_block_size = 4;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 3;
+ *f_block_size = 4;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3) &&
(options.f_block_size == 6)) {
- *row_block_size = 2;
- *e_block_size = 3;
- *f_block_size = 6;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 3;
+ *f_block_size = 6;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3) &&
(options.f_block_size == 9)) {
- *row_block_size = 2;
- *e_block_size = 3;
- *f_block_size = 9;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 3;
+ *f_block_size = 9;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 3)) {
- *row_block_size = 2;
- *e_block_size = 3;
- *f_block_size = Eigen::Dynamic;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 3;
+ *f_block_size = Eigen::Dynamic;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 3)) {
- *row_block_size = 2;
- *e_block_size = 4;
- *f_block_size = 3;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 4;
+ *f_block_size = 3;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 4)) {
- *row_block_size = 2;
- *e_block_size = 4;
- *f_block_size = 4;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 4;
+ *f_block_size = 4;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 6)) {
- *row_block_size = 2;
- *e_block_size = 4;
- *f_block_size = 6;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 4;
+ *f_block_size = 6;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 8)) {
- *row_block_size = 2;
- *e_block_size = 4;
- *f_block_size = 8;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 4;
+ *f_block_size = 8;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4) &&
(options.f_block_size == 9)) {
- *row_block_size = 2;
- *e_block_size = 4;
- *f_block_size = 9;
- return;
- }
- if ((options.row_block_size == 2) &&
+ *row_block_size = 2;
+ *e_block_size = 4;
+ *f_block_size = 9;
+ return;
+ }
+ if ((options.row_block_size == 2) &&
(options.e_block_size == 4)) {
- *row_block_size = 2;
- *e_block_size = 4;
- *f_block_size = Eigen::Dynamic;
- return;
- }
- if (options.row_block_size == 2){
- *row_block_size = 2;
- *e_block_size = Eigen::Dynamic;
- *f_block_size = Eigen::Dynamic;
- return;
- }
- if ((options.row_block_size == 3) &&
+ *row_block_size = 2;
+ *e_block_size = 4;
+ *f_block_size = Eigen::Dynamic;
+ return;
+ }
+ if (options.row_block_size == 2) {
+ *row_block_size = 2;
+ *e_block_size = Eigen::Dynamic;
+ *f_block_size = Eigen::Dynamic;
+ return;
+ }
+ if ((options.row_block_size == 3) &&
(options.e_block_size == 3) &&
(options.f_block_size == 3)) {
- *row_block_size = 3;
- *e_block_size = 3;
- *f_block_size = 3;
- return;
- }
- if ((options.row_block_size == 4) &&
+ *row_block_size = 3;
+ *e_block_size = 3;
+ *f_block_size = 3;
+ return;
+ }
+ if ((options.row_block_size == 4) &&
(options.e_block_size == 4) &&
(options.f_block_size == 2)) {
- *row_block_size = 4;
- *e_block_size = 4;
- *f_block_size = 2;
- return;
- }
- if ((options.row_block_size == 4) &&
+ *row_block_size = 4;
+ *e_block_size = 4;
+ *f_block_size = 2;
+ return;
+ }
+ if ((options.row_block_size == 4) &&
(options.e_block_size == 4) &&
(options.f_block_size == 3)) {
- *row_block_size = 4;
- *e_block_size = 4;
- *f_block_size = 3;
- return;
- }
- if ((options.row_block_size == 4) &&
+ *row_block_size = 4;
+ *e_block_size = 4;
+ *f_block_size = 3;
+ return;
+ }
+ if ((options.row_block_size == 4) &&
(options.e_block_size == 4) &&
(options.f_block_size == 4)) {
- *row_block_size = 4;
- *e_block_size = 4;
- *f_block_size = 4;
- return;
- }
- if ((options.row_block_size == 4) &&
+ *row_block_size = 4;
+ *e_block_size = 4;
+ *f_block_size = 4;
+ return;
+ }
+ if ((options.row_block_size == 4) &&
(options.e_block_size == 4)) {
- *row_block_size = 4;
- *e_block_size = 4;
- *f_block_size = Eigen::Dynamic;
- return;
- }
+ *row_block_size = 4;
+ *e_block_size = 4;
+ *f_block_size = Eigen::Dynamic;
+ return;
+ }
#endif
return;
