diff --git a/internal/ceres/generate_eliminator_specialization.py b/internal/ceres/generate_eliminator_specialization.py index 60953513f..b14b14573 100644 --- a/internal/ceres/generate_eliminator_specialization.py +++ b/internal/ceres/generate_eliminator_specialization.py @@ -65,8 +65,7 @@ SPECIALIZATIONS = [(2, 2, 2), (4, 4, 4), (4, 4, "Eigen::Dynamic"), ("Eigen::Dynamic", "Eigen::Dynamic", "Eigen::Dynamic")] - -SPECIALIZATION_FILE = """// Ceres Solver - A fast non-linear least squares minimizer +HEADER = """// Ceres Solver - A fast non-linear least squares minimizer // Copyright 2010, 2011, 2012, 2013 Google Inc. All rights reserved. // http://code.google.com/p/ceres-solver/ // @@ -107,6 +106,24 @@ SPECIALIZATION_FILE = """// Ceres Solver - A fast non-linear least squares minim // // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +""" + +DYNAMIC_FILE = """ + +#include "ceres/schur_eliminator_impl.h" +#include "ceres/internal/eigen.h" + +namespace ceres { +namespace internal { + +template class SchurEliminator<%s, %s, %s>; + +} // namespace internal +} // namespace ceres +""" + +SPECIALIZATION_FILE = """ +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -119,21 +136,10 @@ template class SchurEliminator<%s, %s, %s>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION """ -FACTORY_FILE_HEADER = """// Copyright 2011 Google Inc. All Rights Reserved. -// Author: sameeragarwal@google.com (Sameer Agarwal) -// -// ======================================== -// THIS FILE IS AUTOGENERATED. DO NOT EDIT. -// THIS FILE IS AUTOGENERATED. DO NOT EDIT. -// THIS FILE IS AUTOGENERATED. DO NOT EDIT. -// THIS FILE IS AUTOGENERATED. DO NOT EDIT. -//========================================= -// -// This file is generated using generate_template_specializations.py. -// Editing it manually is not recommended. - +FACTORY_FILE_HEADER = """ #include "ceres/linear_solver.h" #include "ceres/schur_eliminator.h" #include "ceres/internal/eigen.h" @@ -184,6 +190,7 @@ def Specialize(): Generate specialization code and the conditionals to instantiate it. """ f = open("schur_eliminator.cc", "w") + f.write(HEADER) f.write(FACTORY_FILE_HEADER) for row_block_size, e_block_size, f_block_size in SPECIALIZATIONS: @@ -192,9 +199,15 @@ def Specialize(): e_block_size, f_block_size) + ".cc" fptr = open(output, "w") - fptr.write(SPECIALIZATION_FILE % (row_block_size, - e_block_size, - f_block_size)) + fptr.write(HEADER) + + template = SPECIALIZATION_FILE + if (row_block_size == "Eigen::Dynamic" and + e_block_size == "Eigen::Dynamic" and + f_block_size == "Eigen::Dynamic") : + template = DYNAMIC_FILE + + fptr.write(template % (row_block_size, e_block_size, f_block_size)); fptr.close() f.write(FACTORY_CONDITIONAL % (row_block_size, diff --git a/internal/ceres/generated/schur_eliminator_2_2_2.cc b/internal/ceres/generated/schur_eliminator_2_2_2.cc index b4a2cfd12..7f9ce1431 100644 --- a/internal/ceres/generated/schur_eliminator_2_2_2.cc +++ b/internal/ceres/generated/schur_eliminator_2_2_2.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<2, 2, 2>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_2_2_3.cc b/internal/ceres/generated/schur_eliminator_2_2_3.cc index 2373c6b86..d9ab1ddf2 100644 --- a/internal/ceres/generated/schur_eliminator_2_2_3.cc +++ b/internal/ceres/generated/schur_eliminator_2_2_3.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<2, 2, 3>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_2_2_4.cc b/internal/ceres/generated/schur_eliminator_2_2_4.cc index 6253fe474..a268810a8 100644 --- a/internal/ceres/generated/schur_eliminator_2_2_4.cc +++ b/internal/ceres/generated/schur_eliminator_2_2_4.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<2, 2, 4>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_2_2_d.cc b/internal/ceres/generated/schur_eliminator_2_2_d.cc index d773a4f9d..46f9492e8 100644 --- a/internal/ceres/generated/schur_eliminator_2_2_d.cc +++ b/internal/ceres/generated/schur_eliminator_2_2_d.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<2, 2, Eigen::Dynamic>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_2_3_3.cc b/internal/ceres/generated/schur_eliminator_2_3_3.cc index afb89b888..ce53c6c07 100644 --- a/internal/ceres/generated/schur_eliminator_2_3_3.cc +++ b/internal/ceres/generated/schur_eliminator_2_3_3.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<2, 3, 3>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_2_3_4.cc b/internal/ceres/generated/schur_eliminator_2_3_4.cc index c883ee690..7f6d41d77 100644 --- a/internal/ceres/generated/schur_eliminator_2_3_4.cc +++ b/internal/ceres/generated/schur_eliminator_2_3_4.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<2, 3, 4>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_2_3_9.cc b/internal/ceres/generated/schur_eliminator_2_3_9.cc index bdffdc5a9..10f84afaa 100644 --- a/internal/ceres/generated/schur_eliminator_2_3_9.cc +++ b/internal/ceres/generated/schur_eliminator_2_3_9.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<2, 3, 9>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_2_3_d.cc b/internal/ceres/generated/schur_eliminator_2_3_d.cc index 5d4139c23..047d47314 100644 --- a/internal/ceres/generated/schur_eliminator_2_3_d.cc +++ b/internal/ceres/generated/schur_eliminator_2_3_d.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<2, 3, Eigen::Dynamic>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_2_4_3.cc b/internal/ceres/generated/schur_eliminator_2_4_3.cc index 06b99df66..12fdb861b 100644 --- a/internal/ceres/generated/schur_eliminator_2_4_3.cc +++ b/internal/ceres/generated/schur_eliminator_2_4_3.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<2, 4, 3>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_2_4_4.cc b/internal/ceres/generated/schur_eliminator_2_4_4.cc index 4bc1f44c2..0e29dc178 100644 --- a/internal/ceres/generated/schur_eliminator_2_4_4.cc +++ b/internal/ceres/generated/schur_eliminator_2_4_4.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<2, 4, 4>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_2_4_d.cc b/internal/ceres/generated/schur_eliminator_2_4_d.cc index 573e40ca7..4d4ac5653 100644 --- a/internal/ceres/generated/schur_eliminator_2_4_d.cc +++ b/internal/ceres/generated/schur_eliminator_2_4_d.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<2, 4, Eigen::Dynamic>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_4_4_2.cc b/internal/ceres/generated/schur_eliminator_4_4_2.cc index e1f17fedd..4ad7d4162 100644 --- a/internal/ceres/generated/schur_eliminator_4_4_2.cc +++ b/internal/ceres/generated/schur_eliminator_4_4_2.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<4, 4, 2>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_4_4_3.cc b/internal/ceres/generated/schur_eliminator_4_4_3.cc index e7c750ade..87f2fc58b 100644 --- a/internal/ceres/generated/schur_eliminator_4_4_3.cc +++ b/internal/ceres/generated/schur_eliminator_4_4_3.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<4, 4, 3>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_4_4_4.cc b/internal/ceres/generated/schur_eliminator_4_4_4.cc index d60ad71ee..8b3f5703b 100644 --- a/internal/ceres/generated/schur_eliminator_4_4_4.cc +++ b/internal/ceres/generated/schur_eliminator_4_4_4.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<4, 4, 4>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_4_4_d.cc b/internal/ceres/generated/schur_eliminator_4_4_d.cc index 12fa9789b..b21feb2d3 100644 --- a/internal/ceres/generated/schur_eliminator_4_4_d.cc +++ b/internal/ceres/generated/schur_eliminator_4_4_d.cc @@ -40,6 +40,8 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. +#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -51,3 +53,4 @@ template class SchurEliminator<4, 4, Eigen::Dynamic>; } // namespace internal } // namespace ceres +#endif // CERES_RESTRICT_SCHUR_SPECIALIZATION diff --git a/internal/ceres/generated/schur_eliminator_d_d_d.cc b/internal/ceres/generated/schur_eliminator_d_d_d.cc index fa34e39e4..d483db7b5 100644 --- a/internal/ceres/generated/schur_eliminator_d_d_d.cc +++ b/internal/ceres/generated/schur_eliminator_d_d_d.cc @@ -40,6 +40,7 @@ // This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. + #include "ceres/schur_eliminator_impl.h" #include "ceres/internal/eigen.h" @@ -50,4 +51,3 @@ template class SchurEliminator; } // namespace internal } // namespace ceres - diff --git a/internal/ceres/schur_eliminator.cc b/internal/ceres/schur_eliminator.cc index 8dbf30f03..31f83547b 100644 --- a/internal/ceres/schur_eliminator.cc +++ b/internal/ceres/schur_eliminator.cc @@ -1,6 +1,35 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +// Ceres Solver - A fast non-linear least squares minimizer +// Copyright 2010, 2011, 2012, 2013 Google Inc. All rights reserved. +// http://code.google.com/p/ceres-solver/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// * Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// * Neither the name of Google Inc. nor the names of its contributors may be +// used to endorse or promote products derived from this software without +// specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// // Author: sameeragarwal@google.com (Sameer Agarwal) // +// Template specialization of SchurEliminator. +// // ======================================== // THIS FILE IS AUTOGENERATED. DO NOT EDIT. // THIS FILE IS AUTOGENERATED. DO NOT EDIT. @@ -8,7 +37,7 @@ // THIS FILE IS AUTOGENERATED. DO NOT EDIT. //========================================= // -// This file is generated using generate_template_specializations.py. +// This file is generated using generate_eliminator_specializations.py. // Editing it manually is not recommended. #include "ceres/linear_solver.h"