Remove CERES_NO_LINE_SEARCH_MINIMIZER. Now that the trust region minimizer depends on the line search minimizer, conditional compilation of the line search minimizer will lead to build breakages, so this option is now not available. It is not expected to have as significant impact on users as the amount of code in the line search minimization algorithm is rather small to begin with. Change-Id: I2aa6b6e6e3931b6428dbda654f14faf1ac6dd130
diff --git a/CMakeLists.txt b/CMakeLists.txt index 521684c..6479982 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -104,11 +104,6 @@ # Multithreading using OpenMP OPTION(OPENMP "Enable threaded solving in Ceres (requires OpenMP)" ON) -# Line search minimizer is useful for large scale problems or when -# sparse linear algebra libraries are not available. If compile time, -# binary size or compiler performance is an issue, consider disabling -# this. -OPTION(LINE_SEARCH_MINIMIZER "Enable the line search minimizer." ON) OPTION(BUILD_TESTING "Enable tests" ON) OPTION(BUILD_DOCUMENTATION "Build User's Guide (html)" OFF) OPTION(BUILD_EXAMPLES "Build examples" ON) @@ -355,11 +350,6 @@ MESSAGE("-- Disabling Schur specializations (faster compiles)") ENDIF (NOT SCHUR_SPECIALIZATIONS) -IF (NOT LINE_SEARCH_MINIMIZER) - ADD_DEFINITIONS(-DCERES_NO_LINE_SEARCH_MINIMIZER) - MESSAGE("-- Disabling line search minimizer") -ENDIF (NOT LINE_SEARCH_MINIMIZER) - IF (NOT CUSTOM_BLAS) ADD_DEFINITIONS(-DCERES_NO_CUSTOM_BLAS) MESSAGE("-- Disabling custom blas")
diff --git a/docs/source/building.rst b/docs/source/building.rst index 40d1f93..cf147b0 100644 --- a/docs/source/building.rst +++ b/docs/source/building.rst
@@ -370,12 +370,6 @@ gains in the ``SPARSE_SCHUR`` solver, you can disable some of the template specializations by turning this ``OFF``. -#. ``LINE_SEARCH_MINIMIZER [Default: ON]``: The line search based - minimizer is mostly suitable for large scale optimization problems, - or when sparse linear algebra libraries are not available. You can - further save on some compile time and binary size by turning this - ``OFF``. - #. ``OPENMP [Default: ON]``: On certain platforms like Android, multi-threading with ``OpenMP`` is not supported. Turn this ``OFF`` to disable multithreading. @@ -487,4 +481,3 @@ Note that this can be used to have multiple versions of Ceres installed. -
diff --git a/internal/ceres/line_search.cc b/internal/ceres/line_search.cc index bacad48..7ff1164 100644 --- a/internal/ceres/line_search.cc +++ b/internal/ceres/line_search.cc
@@ -28,7 +28,6 @@ // // Author: sameeragarwal@google.com (Sameer Agarwal) -#ifndef CERES_NO_LINE_SEARCH_MINIMIZER #include <iomanip> #include <iostream> // NOLINT @@ -820,5 +819,3 @@ } // namespace internal } // namespace ceres - -#endif // CERES_NO_LINE_SEARCH_MINIMIZER
diff --git a/internal/ceres/line_search.h b/internal/ceres/line_search.h index 57ef9e7..97b9bc6 100644 --- a/internal/ceres/line_search.h +++ b/internal/ceres/line_search.h
@@ -33,8 +33,6 @@ #ifndef CERES_INTERNAL_LINE_SEARCH_H_ #define CERES_INTERNAL_LINE_SEARCH_H_ -#ifndef CERES_NO_LINE_SEARCH_MINIMIZER - #include <string> #include <vector> #include "ceres/internal/eigen.h" @@ -298,5 +296,4 @@ } // namespace internal } // namespace ceres -#endif // CERES_NO_LINE_SEARCH_MINIMIZER #endif // CERES_INTERNAL_LINE_SEARCH_H_
diff --git a/internal/ceres/line_search_direction.cc b/internal/ceres/line_search_direction.cc index a865f11..e04c65b 100644 --- a/internal/ceres/line_search_direction.cc +++ b/internal/ceres/line_search_direction.cc
@@ -28,8 +28,6 @@ // // Author: sameeragarwal@google.com (Sameer Agarwal) -#ifndef CERES_NO_LINE_SEARCH_MINIMIZER - #include "ceres/line_search_direction.h" #include "ceres/line_search_minimizer.h" #include "ceres/low_rank_inverse_hessian.h" @@ -372,5 +370,3 @@ } // namespace internal } // namespace ceres - -#endif // CERES_NO_LINE_SEARCH_MINIMIZER
diff --git a/internal/ceres/line_search_direction.h b/internal/ceres/line_search_direction.h index 0857cb0..c77fdc8 100644 --- a/internal/ceres/line_search_direction.h +++ b/internal/ceres/line_search_direction.h
@@ -31,8 +31,6 @@ #ifndef CERES_INTERNAL_LINE_SEARCH_DIRECTION_H_ #define CERES_INTERNAL_LINE_SEARCH_DIRECTION_H_ -#ifndef CERES_NO_LINE_SEARCH_MINIMIZER - #include "ceres/internal/eigen.h" #include "ceres/line_search_minimizer.h" #include "ceres/types.h" @@ -71,5 +69,4 @@ } // namespace internal } // namespace ceres -#endif // CERES_NO_LINE_SEARCH_MINIMIZER #endif // CERES_INTERNAL_LINE_SEARCH_DIRECTION_H_
diff --git a/internal/ceres/line_search_minimizer.cc b/internal/ceres/line_search_minimizer.cc index 7623f8d..c84698d 100644 --- a/internal/ceres/line_search_minimizer.cc +++ b/internal/ceres/line_search_minimizer.cc
@@ -38,8 +38,6 @@ // For details on the theory and implementation see "Numerical // Optimization" by Nocedal & Wright. -#ifndef CERES_NO_LINE_SEARCH_MINIMIZER - #include "ceres/line_search_minimizer.h" #include <algorithm> @@ -410,5 +408,3 @@ } // namespace internal } // namespace ceres - -#endif // CERES_NO_LINE_SEARCH_MINIMIZER
diff --git a/internal/ceres/line_search_minimizer.h b/internal/ceres/line_search_minimizer.h index 59f5c3f..f82f139 100644 --- a/internal/ceres/line_search_minimizer.h +++ b/internal/ceres/line_search_minimizer.h
@@ -31,8 +31,6 @@ #ifndef CERES_INTERNAL_LINE_SEARCH_MINIMIZER_H_ #define CERES_INTERNAL_LINE_SEARCH_MINIMIZER_H_ -#ifndef CERES_NO_LINE_SEARCH_MINIMIZER - #include "ceres/minimizer.h" #include "ceres/solver.h" #include "ceres/types.h" @@ -76,5 +74,4 @@ } // namespace internal } // namespace ceres -#endif // CERES_NO_LINE_SEARCH_MINIMIZER #endif // CERES_INTERNAL_LINE_SEARCH_MINIMIZER_H_
diff --git a/internal/ceres/solver_impl.cc b/internal/ceres/solver_impl.cc index a0ad1b7..9c5a2b0 100644 --- a/internal/ceres/solver_impl.cc +++ b/internal/ceres/solver_impl.cc
@@ -477,7 +477,6 @@ WallTimeInSeconds() - minimizer_start_time; } -#ifndef CERES_NO_LINE_SEARCH_MINIMIZER void SolverImpl::LineSearchMinimize( const Solver::Options& options, Program* program, @@ -533,7 +532,6 @@ summary->minimizer_time_in_seconds = WallTimeInSeconds() - minimizer_start_time; } -#endif // CERES_NO_LINE_SEARCH_MINIMIZER void SolverImpl::Solve(const Solver::Options& options, ProblemImpl* problem_impl, @@ -551,11 +549,7 @@ if (options.minimizer_type == TRUST_REGION) { TrustRegionSolve(options, problem_impl, summary); } else { -#ifndef CERES_NO_LINE_SEARCH_MINIMIZER LineSearchSolve(options, problem_impl, summary); -#else - LOG(FATAL) << "Ceres Solver was compiled with -DLINE_SEARCH_MINIMIZER=OFF"; -#endif } } @@ -808,7 +802,6 @@ event_logger.AddEvent("PostProcess"); } -#ifndef CERES_NO_LINE_SEARCH_MINIMIZER void SolverImpl::LineSearchSolve(const Solver::Options& original_options, ProblemImpl* original_problem_impl, Solver::Summary* summary) { @@ -973,7 +966,6 @@ summary->postprocessor_time_in_seconds = WallTimeInSeconds() - post_process_start_time; } -#endif // CERES_NO_LINE_SEARCH_MINIMIZER bool SolverImpl::IsOrderingValid(const Solver::Options& options, const ProblemImpl* problem_impl,
diff --git a/internal/ceres/solver_impl.h b/internal/ceres/solver_impl.h index f6599c4..631add5 100644 --- a/internal/ceres/solver_impl.h +++ b/internal/ceres/solver_impl.h
@@ -69,7 +69,6 @@ LinearSolver* linear_solver, Solver::Summary* summary); -#ifndef CERES_NO_LINE_SEARCH_MINIMIZER static void LineSearchSolve(const Solver::Options& options, ProblemImpl* problem_impl, Solver::Summary* summary); @@ -79,7 +78,6 @@ Program* program, Evaluator* evaluator, Solver::Summary* summary); -#endif // CERES_NO_LINE_SEARCH_MINIMIZER // Create the transformed Program, which has all the fixed blocks // and residuals eliminated, and in the case of automatic schur
diff --git a/jni/Android.mk b/jni/Android.mk index 56f5db6..09657aa 100644 --- a/jni/Android.mk +++ b/jni/Android.mk
@@ -65,10 +65,6 @@ # # to the LOCAL_CFLAGS variable below. # -# Similarly if you do not need the line search minimizer, consider adding -# -# -DCERES_NO_LINE_SEARCH_MINIMIZER -# # Changing the logging library: # # Ceres Solver ships with a replacement for glog that provides a