Remove inclusion of ceres/eigen.h

The initial reason for this is because of a previous reformatting CL
triggered a macro redefinition warning in the schur eliminator. But
actually it was worse because the reordering had caused the macro
definition to be ignored and caused a performance regression.

This simplifies the generated files, fixes some formatting errors
and recovers the performance.

Change-Id: I9dbeffc38743b3f24b25843feec2e26a73188413

internal/ceres/generate_template_specializations.py

@@ -186,9 +186,8 @@ QUERY_HEADER = """// Ceres Solver - A fast non-linear least squares minimizer
 """
 
 QUERY_FILE_HEADER = """
-#include "ceres/schur_templates.h"
-
 #include "ceres/internal/eigen.h"
+#include "ceres/schur_templates.h"
 
 namespace ceres {
 namespace internal {

internal/ceres/generated/partitioned_matrix_view_2_2_2.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_2_3.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_2_4.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_2_d.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_3_3.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_3_4.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_3_6.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_3_9.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_3_d.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_4_3.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_4_4.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_4_6.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_4_8.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_4_9.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_4_d.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_2_d_d.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_3_3_3.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_4_4_2.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_4_4_3.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_4_4_4.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_4_4_d.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/partitioned_matrix_view_d_d_d.cc

@@ -39,7 +39,6 @@
 //
 // This file is generated using generate_template_specializations.py.
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_2_2.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_2_3.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_2_4.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_2_d.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_3_3.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_3_4.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_3_6.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_3_9.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_3_d.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_4_3.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_4_4.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_4_6.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_4_8.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_4_9.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_4_d.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_2_d_d.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_3_3_3.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_4_4_2.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_4_4_3.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_4_4_4.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_4_4_d.cc

@@ -44,7 +44,6 @@
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/generated/schur_eliminator_d_d_d.cc

@@ -39,7 +39,6 @@
 //
 // This file is generated using generate_template_specializations.py.
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {

internal/ceres/partitioned_matrix_view.cc

@@ -39,10 +39,8 @@
 //
 // This file is generated using generate_template_specializations.py.
 
-#include "ceres/partitioned_matrix_view.h"
-
-#include "ceres/internal/eigen.h"
 #include "ceres/linear_solver.h"
+#include "ceres/partitioned_matrix_view.h"
 
 namespace ceres {
 namespace internal {

internal/ceres/partitioned_matrix_view_template.py

@@ -89,7 +89,6 @@ HEADER = """// Ceres Solver - A fast non-linear least squares minimizer
 """
 
 DYNAMIC_FILE = """
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {
@@ -109,7 +108,6 @@ SPECIALIZATION_FILE = """
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/partitioned_matrix_view_impl.h"
 
 namespace ceres {
@@ -124,10 +122,8 @@ template class PartitionedMatrixView<%s, %s, %s>;
 """
 
 FACTORY_FILE_HEADER = """
-#include "ceres/partitioned_matrix_view.h"
-
-#include "ceres/internal/eigen.h"
 #include "ceres/linear_solver.h"
+#include "ceres/partitioned_matrix_view.h"
 
 namespace ceres {
 namespace internal {

internal/ceres/schur_eliminator.cc

@@ -39,10 +39,8 @@
 //
 // This file is generated using generate_template_specializations.py.
 
-#include "ceres/schur_eliminator.h"
-
-#include "ceres/internal/eigen.h"
 #include "ceres/linear_solver.h"
+#include "ceres/schur_eliminator.h"
 
 namespace ceres {
 namespace internal {

internal/ceres/schur_eliminator_template.py

@@ -93,7 +93,6 @@ HEADER = """// Ceres Solver - A fast non-linear least squares minimizer
 """
 
 DYNAMIC_FILE = """
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {
@@ -111,7 +110,6 @@ SPECIALIZATION_FILE = """
 
 #ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
 
-#include "ceres/internal/eigen.h"
 #include "ceres/schur_eliminator_impl.h"
 
 namespace ceres {
@@ -126,10 +124,8 @@ template class SchurEliminator<%s, %s, %s>;
 """
 
 FACTORY_FILE_HEADER = """
-#include "ceres/schur_eliminator.h"
-
-#include "ceres/internal/eigen.h"
 #include "ceres/linear_solver.h"
+#include "ceres/schur_eliminator.h"
 
 namespace ceres {
 namespace internal {

internal/ceres/schur_templates.cc

@@ -39,9 +39,8 @@
 //
 // This file is generated using generate_template_specializations.py.
 
-#include "ceres/schur_templates.h"
-
 #include "ceres/internal/eigen.h"
+#include "ceres/schur_templates.h"
 
 namespace ceres {
 namespace internal {