From 6fb6a08bf84d5d16ebac35527a77bec37112494e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 4 Jan 2016 18:11:12 +0500 Subject: [PATCH] Move Ceres to extern/ Even tho it's currently only used by Libmv we might use it for something else in the future. Plus, it's actually where it logically belongs to. --- CMakeLists.txt | 40 +++++++++++++++++++ extern/CMakeLists.txt | 4 ++ .../third_party => }/ceres/CMakeLists.txt | 20 +++++----- .../{libmv/third_party => }/ceres/ChangeLog | 0 extern/{libmv/third_party => }/ceres/LICENSE | 0 extern/{libmv/third_party => }/ceres/README | 0 .../{libmv/third_party => }/ceres/bundle.sh | 13 +++--- .../ceres/config/ceres/internal/config.h | 0 .../{libmv/third_party => }/ceres/files.txt | 0 .../include/ceres/autodiff_cost_function.h | 0 .../ceres/autodiff_local_parameterization.h | 0 .../ceres/include/ceres/c_api.h | 0 .../ceres/include/ceres/ceres.h | 0 .../include/ceres/conditioned_cost_function.h | 0 .../ceres/include/ceres/cost_function.h | 0 .../include/ceres/cost_function_to_functor.h | 0 .../ceres/include/ceres/covariance.h | 0 .../ceres/include/ceres/crs_matrix.h | 0 .../ceres/dynamic_autodiff_cost_function.h | 0 .../ceres/dynamic_cost_function_to_functor.h | 0 .../dynamic_numeric_diff_cost_function.h | 0 .../ceres/include/ceres/fpclassify.h | 0 .../ceres/include/ceres/gradient_checker.h | 0 .../ceres/include/ceres/gradient_problem.h | 0 .../include/ceres/gradient_problem_solver.h | 0 .../ceres/include/ceres/internal/autodiff.h | 0 .../include/ceres/internal/disable_warnings.h | 0 .../ceres/include/ceres/internal/eigen.h | 0 .../include/ceres/internal/fixed_array.h | 0 .../ceres/include/ceres/internal/macros.h | 0 .../ceres/internal/manual_constructor.h | 0 .../include/ceres/internal/numeric_diff.h | 0 .../ceres/include/ceres/internal/port.h | 0 .../ceres/internal/reenable_warnings.h | 0 .../ceres/include/ceres/internal/scoped_ptr.h | 0 .../ceres/internal/variadic_evaluate.h | 0 .../ceres/include/ceres/iteration_callback.h | 0 .../ceres/include/ceres/jet.h | 0 .../include/ceres/local_parameterization.h | 0 .../ceres/include/ceres/loss_function.h | 0 .../ceres/include/ceres/normal_prior.h | 0 .../ceres/numeric_diff_cost_function.h | 0 .../include/ceres/numeric_diff_options.h | 0 .../ceres/include/ceres/ordered_groups.h | 0 .../ceres/include/ceres/problem.h | 0 .../ceres/include/ceres/rotation.h | 0 .../ceres/include/ceres/sized_cost_function.h | 0 .../ceres/include/ceres/solver.h | 0 .../ceres/include/ceres/types.h | 0 .../ceres/include/ceres/version.h | 0 .../ceres/internal/ceres/array_utils.cc | 0 .../ceres/internal/ceres/array_utils.h | 0 .../ceres/internal/ceres/blas.cc | 0 .../ceres/internal/ceres/blas.h | 0 .../internal/ceres/block_evaluate_preparer.cc | 0 .../internal/ceres/block_evaluate_preparer.h | 0 .../ceres/block_jacobi_preconditioner.cc | 0 .../ceres/block_jacobi_preconditioner.h | 0 .../internal/ceres/block_jacobian_writer.cc | 0 .../internal/ceres/block_jacobian_writer.h | 0 .../ceres/block_random_access_dense_matrix.cc | 0 .../ceres/block_random_access_dense_matrix.h | 0 .../block_random_access_diagonal_matrix.cc | 0 .../block_random_access_diagonal_matrix.h | 0 .../ceres/block_random_access_matrix.cc | 0 .../ceres/block_random_access_matrix.h | 0 .../block_random_access_sparse_matrix.cc | 0 .../ceres/block_random_access_sparse_matrix.h | 0 .../internal/ceres/block_sparse_matrix.cc | 0 .../internal/ceres/block_sparse_matrix.h | 0 .../ceres/internal/ceres/block_structure.cc | 0 .../ceres/internal/ceres/block_structure.h | 0 .../ceres/internal/ceres/c_api.cc | 0 .../ceres/internal/ceres/callbacks.cc | 0 .../ceres/internal/ceres/callbacks.h | 0 .../ceres/internal/ceres/casts.h | 0 .../internal/ceres/cgnr_linear_operator.h | 0 .../ceres/internal/ceres/cgnr_solver.cc | 0 .../ceres/internal/ceres/cgnr_solver.h | 0 .../ceres/internal/ceres/collections_port.h | 0 .../compressed_col_sparse_matrix_utils.cc | 0 .../compressed_col_sparse_matrix_utils.h | 0 .../ceres/compressed_row_jacobian_writer.cc | 0 .../ceres/compressed_row_jacobian_writer.h | 0 .../ceres/compressed_row_sparse_matrix.cc | 0 .../ceres/compressed_row_sparse_matrix.h | 0 .../ceres/conditioned_cost_function.cc | 0 .../ceres/conjugate_gradients_solver.cc | 0 .../ceres/conjugate_gradients_solver.h | 0 .../ceres/coordinate_descent_minimizer.cc | 0 .../ceres/coordinate_descent_minimizer.h | 0 .../ceres/internal/ceres/corrector.cc | 0 .../ceres/internal/ceres/corrector.h | 0 .../ceres/internal/ceres/covariance.cc | 0 .../ceres/internal/ceres/covariance_impl.cc | 0 .../ceres/internal/ceres/covariance_impl.h | 0 .../ceres/internal/ceres/cxsparse.h | 0 .../internal/ceres/dense_jacobian_writer.h | 0 .../ceres/dense_normal_cholesky_solver.cc | 0 .../ceres/dense_normal_cholesky_solver.h | 0 .../ceres/internal/ceres/dense_qr_solver.cc | 0 .../ceres/internal/ceres/dense_qr_solver.h | 0 .../internal/ceres/dense_sparse_matrix.cc | 0 .../internal/ceres/dense_sparse_matrix.h | 0 .../ceres/internal/ceres/detect_structure.cc | 0 .../ceres/internal/ceres/detect_structure.h | 0 .../ceres/internal/ceres/dogleg_strategy.cc | 0 .../ceres/internal/ceres/dogleg_strategy.h | 0 .../ceres/dynamic_compressed_row_finalizer.h | 0 .../dynamic_compressed_row_jacobian_writer.cc | 0 .../dynamic_compressed_row_jacobian_writer.h | 0 .../dynamic_compressed_row_sparse_matrix.cc | 0 .../dynamic_compressed_row_sparse_matrix.h | 0 .../ceres/internal/ceres/evaluator.cc | 0 .../ceres/internal/ceres/evaluator.h | 0 .../ceres/internal/ceres/execution_summary.h | 0 .../ceres/internal/ceres/file.cc | 0 .../ceres/internal/ceres/file.h | 0 .../generate_eliminator_specialization.py | 0 ...partitioned_matrix_view_specializations.py | 0 .../partitioned_matrix_view_2_2_2.cc | 0 .../partitioned_matrix_view_2_2_3.cc | 0 .../partitioned_matrix_view_2_2_4.cc | 0 .../partitioned_matrix_view_2_2_d.cc | 0 .../partitioned_matrix_view_2_3_3.cc | 0 .../partitioned_matrix_view_2_3_4.cc | 0 .../partitioned_matrix_view_2_3_6.cc | 0 .../partitioned_matrix_view_2_3_9.cc | 0 .../partitioned_matrix_view_2_3_d.cc | 0 .../partitioned_matrix_view_2_4_3.cc | 0 .../partitioned_matrix_view_2_4_4.cc | 0 .../partitioned_matrix_view_2_4_8.cc | 0 .../partitioned_matrix_view_2_4_9.cc | 0 .../partitioned_matrix_view_2_4_d.cc | 0 .../partitioned_matrix_view_2_d_d.cc | 0 .../partitioned_matrix_view_4_4_2.cc | 0 .../partitioned_matrix_view_4_4_3.cc | 0 .../partitioned_matrix_view_4_4_4.cc | 0 .../partitioned_matrix_view_4_4_d.cc | 0 .../partitioned_matrix_view_d_d_d.cc | 0 .../ceres/generated/schur_eliminator_2_2_2.cc | 0 .../ceres/generated/schur_eliminator_2_2_3.cc | 0 .../ceres/generated/schur_eliminator_2_2_4.cc | 0 .../ceres/generated/schur_eliminator_2_2_d.cc | 0 .../ceres/generated/schur_eliminator_2_3_3.cc | 0 .../ceres/generated/schur_eliminator_2_3_4.cc | 0 .../ceres/generated/schur_eliminator_2_3_6.cc | 0 .../ceres/generated/schur_eliminator_2_3_9.cc | 0 .../ceres/generated/schur_eliminator_2_3_d.cc | 0 .../ceres/generated/schur_eliminator_2_4_3.cc | 0 .../ceres/generated/schur_eliminator_2_4_4.cc | 0 .../ceres/generated/schur_eliminator_2_4_8.cc | 0 .../ceres/generated/schur_eliminator_2_4_9.cc | 0 .../ceres/generated/schur_eliminator_2_4_d.cc | 0 .../ceres/generated/schur_eliminator_2_d_d.cc | 0 .../ceres/generated/schur_eliminator_4_4_2.cc | 0 .../ceres/generated/schur_eliminator_4_4_3.cc | 0 .../ceres/generated/schur_eliminator_4_4_4.cc | 0 .../ceres/generated/schur_eliminator_4_4_d.cc | 0 .../ceres/generated/schur_eliminator_d_d_d.cc | 0 .../ceres/gradient_checking_cost_function.cc | 0 .../ceres/gradient_checking_cost_function.h | 0 .../ceres/internal/ceres/gradient_problem.cc | 0 .../ceres/gradient_problem_evaluator.h | 0 .../internal/ceres/gradient_problem_solver.cc | 0 .../ceres/internal/ceres/graph.h | 0 .../ceres/internal/ceres/graph_algorithms.h | 0 .../ceres/internal/ceres/householder_vector.h | 0 .../ceres/implicit_schur_complement.cc | 0 .../ceres/implicit_schur_complement.h | 0 .../ceres/internal/ceres/integral_types.h | 0 .../iterative_schur_complement_solver.cc | 0 .../ceres/iterative_schur_complement_solver.h | 0 .../ceres/internal/ceres/lapack.cc | 0 .../ceres/internal/ceres/lapack.h | 0 .../ceres/levenberg_marquardt_strategy.cc | 0 .../ceres/levenberg_marquardt_strategy.h | 0 .../ceres/internal/ceres/line_search.cc | 0 .../ceres/internal/ceres/line_search.h | 0 .../internal/ceres/line_search_direction.cc | 0 .../internal/ceres/line_search_direction.h | 0 .../internal/ceres/line_search_minimizer.cc | 0 .../internal/ceres/line_search_minimizer.h | 0 .../ceres/line_search_preprocessor.cc | 0 .../internal/ceres/line_search_preprocessor.h | 0 .../ceres/linear_least_squares_problems.cc | 0 .../ceres/linear_least_squares_problems.h | 0 .../ceres/internal/ceres/linear_operator.cc | 0 .../ceres/internal/ceres/linear_operator.h | 0 .../ceres/internal/ceres/linear_solver.cc | 0 .../ceres/internal/ceres/linear_solver.h | 0 .../internal/ceres/local_parameterization.cc | 0 .../ceres/internal/ceres/loss_function.cc | 0 .../ceres/low_rank_inverse_hessian.cc | 0 .../internal/ceres/low_rank_inverse_hessian.h | 0 .../ceres/internal/ceres/map_util.h | 0 .../ceres/internal/ceres/minimizer.cc | 0 .../ceres/internal/ceres/minimizer.h | 0 .../ceres/internal/ceres/mutex.h | 0 .../ceres/internal/ceres/normal_prior.cc | 0 .../ceres/internal/ceres/parameter_block.h | 0 .../ceres/parameter_block_ordering.cc | 0 .../internal/ceres/parameter_block_ordering.h | 0 .../internal/ceres/partitioned_matrix_view.cc | 0 .../internal/ceres/partitioned_matrix_view.h | 0 .../ceres/partitioned_matrix_view_impl.h | 0 .../ceres/internal/ceres/polynomial.cc | 0 .../ceres/internal/ceres/polynomial.h | 0 .../ceres/internal/ceres/preconditioner.cc | 0 .../ceres/internal/ceres/preconditioner.h | 0 .../ceres/internal/ceres/preprocessor.cc | 0 .../ceres/internal/ceres/preprocessor.h | 0 .../ceres/internal/ceres/problem.cc | 0 .../ceres/internal/ceres/problem_impl.cc | 0 .../ceres/internal/ceres/problem_impl.h | 0 .../ceres/internal/ceres/program.cc | 0 .../ceres/internal/ceres/program.h | 0 .../ceres/internal/ceres/program_evaluator.h | 0 .../ceres/internal/ceres/random.h | 0 .../ceres/internal/ceres/reorder_program.cc | 0 .../ceres/internal/ceres/reorder_program.h | 0 .../ceres/internal/ceres/residual_block.cc | 0 .../ceres/internal/ceres/residual_block.h | 0 .../internal/ceres/residual_block_utils.cc | 0 .../internal/ceres/residual_block_utils.h | 0 .../internal/ceres/schur_complement_solver.cc | 0 .../internal/ceres/schur_complement_solver.h | 0 .../ceres/internal/ceres/schur_eliminator.cc | 0 .../ceres/internal/ceres/schur_eliminator.h | 0 .../internal/ceres/schur_eliminator_impl.h | 0 .../ceres/schur_jacobi_preconditioner.cc | 0 .../ceres/schur_jacobi_preconditioner.h | 0 .../ceres/scratch_evaluate_preparer.cc | 0 .../ceres/scratch_evaluate_preparer.h | 0 .../ceres/internal/ceres/small_blas.h | 0 .../ceres/internal/ceres/solver.cc | 0 .../ceres/internal/ceres/solver_utils.cc | 0 .../ceres/internal/ceres/solver_utils.h | 0 .../ceres/internal/ceres/sparse_matrix.cc | 0 .../ceres/internal/ceres/sparse_matrix.h | 0 .../ceres/sparse_normal_cholesky_solver.cc | 0 .../ceres/sparse_normal_cholesky_solver.h | 0 .../ceres/internal/ceres/split.cc | 0 .../ceres/internal/ceres/split.h | 0 .../ceres/internal/ceres/stl_util.h | 0 .../ceres/internal/ceres/stringprintf.cc | 0 .../ceres/internal/ceres/stringprintf.h | 0 .../ceres/internal/ceres/suitesparse.h | 0 .../internal/ceres/triplet_sparse_matrix.cc | 0 .../internal/ceres/triplet_sparse_matrix.h | 0 .../internal/ceres/trust_region_minimizer.cc | 0 .../internal/ceres/trust_region_minimizer.h | 0 .../ceres/trust_region_preprocessor.cc | 0 .../ceres/trust_region_preprocessor.h | 0 .../internal/ceres/trust_region_strategy.cc | 0 .../internal/ceres/trust_region_strategy.h | 0 .../ceres/internal/ceres/types.cc | 0 .../ceres/visibility_based_preconditioner.h | 0 .../ceres/internal/ceres/wall_time.cc | 0 .../ceres/internal/ceres/wall_time.h | 0 .../{libmv/third_party => }/ceres/mkfiles.sh | 0 .../third_party => }/ceres/patches/series | 0 extern/libmv/CMakeLists.txt | 15 +------ extern/libmv/bundle.sh | 34 ++++------------ extern/libmv/third_party/CMakeLists.txt | 26 ------------ 265 files changed, 68 insertions(+), 84 deletions(-) rename extern/{libmv/third_party => }/ceres/CMakeLists.txt (97%) rename extern/{libmv/third_party => }/ceres/ChangeLog (100%) rename extern/{libmv/third_party => }/ceres/LICENSE (100%) rename extern/{libmv/third_party => }/ceres/README (100%) rename extern/{libmv/third_party => }/ceres/bundle.sh (97%) rename extern/{libmv/third_party => }/ceres/config/ceres/internal/config.h (100%) rename extern/{libmv/third_party => }/ceres/files.txt (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/autodiff_cost_function.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/autodiff_local_parameterization.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/c_api.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/ceres.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/conditioned_cost_function.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/cost_function.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/cost_function_to_functor.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/covariance.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/crs_matrix.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/dynamic_autodiff_cost_function.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/dynamic_cost_function_to_functor.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/dynamic_numeric_diff_cost_function.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/fpclassify.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/gradient_checker.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/gradient_problem.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/gradient_problem_solver.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/internal/autodiff.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/internal/disable_warnings.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/internal/eigen.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/internal/fixed_array.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/internal/macros.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/internal/manual_constructor.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/internal/numeric_diff.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/internal/port.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/internal/reenable_warnings.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/internal/scoped_ptr.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/internal/variadic_evaluate.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/iteration_callback.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/jet.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/local_parameterization.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/loss_function.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/normal_prior.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/numeric_diff_cost_function.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/numeric_diff_options.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/ordered_groups.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/problem.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/rotation.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/sized_cost_function.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/solver.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/types.h (100%) rename extern/{libmv/third_party => }/ceres/include/ceres/version.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/array_utils.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/array_utils.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/blas.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/blas.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_evaluate_preparer.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_evaluate_preparer.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_jacobi_preconditioner.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_jacobi_preconditioner.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_jacobian_writer.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_jacobian_writer.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_random_access_dense_matrix.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_random_access_dense_matrix.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_random_access_diagonal_matrix.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_random_access_diagonal_matrix.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_random_access_matrix.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_random_access_matrix.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_random_access_sparse_matrix.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_random_access_sparse_matrix.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_sparse_matrix.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_sparse_matrix.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_structure.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/block_structure.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/c_api.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/callbacks.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/callbacks.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/casts.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/cgnr_linear_operator.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/cgnr_solver.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/cgnr_solver.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/collections_port.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/compressed_col_sparse_matrix_utils.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/compressed_row_jacobian_writer.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/compressed_row_jacobian_writer.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/compressed_row_sparse_matrix.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/compressed_row_sparse_matrix.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/conditioned_cost_function.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/conjugate_gradients_solver.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/conjugate_gradients_solver.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/coordinate_descent_minimizer.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/coordinate_descent_minimizer.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/corrector.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/corrector.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/covariance.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/covariance_impl.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/covariance_impl.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/cxsparse.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dense_jacobian_writer.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dense_normal_cholesky_solver.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dense_normal_cholesky_solver.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dense_qr_solver.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dense_qr_solver.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dense_sparse_matrix.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dense_sparse_matrix.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/detect_structure.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/detect_structure.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dogleg_strategy.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dogleg_strategy.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dynamic_compressed_row_finalizer.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/evaluator.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/evaluator.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/execution_summary.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/file.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/file.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generate_eliminator_specialization.py (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generate_partitioned_matrix_view_specializations.py (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_2.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_3.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_4.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_d.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_3.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_4.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_6.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_9.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_d.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_3.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_4.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_8.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_9.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_d.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_2_d_d.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_2.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_3.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_4.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_d.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/partitioned_matrix_view_d_d_d.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_3_6.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_4_8.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_4_9.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_2_d_d.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/gradient_checking_cost_function.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/gradient_checking_cost_function.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/gradient_problem.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/gradient_problem_evaluator.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/gradient_problem_solver.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/graph.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/graph_algorithms.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/householder_vector.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/implicit_schur_complement.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/implicit_schur_complement.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/integral_types.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/iterative_schur_complement_solver.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/iterative_schur_complement_solver.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/lapack.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/lapack.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/levenberg_marquardt_strategy.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/levenberg_marquardt_strategy.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/line_search.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/line_search.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/line_search_direction.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/line_search_direction.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/line_search_minimizer.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/line_search_minimizer.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/line_search_preprocessor.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/line_search_preprocessor.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/linear_least_squares_problems.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/linear_least_squares_problems.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/linear_operator.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/linear_operator.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/linear_solver.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/linear_solver.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/local_parameterization.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/loss_function.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/low_rank_inverse_hessian.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/low_rank_inverse_hessian.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/map_util.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/minimizer.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/minimizer.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/mutex.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/normal_prior.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/parameter_block.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/parameter_block_ordering.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/parameter_block_ordering.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/partitioned_matrix_view.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/partitioned_matrix_view.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/partitioned_matrix_view_impl.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/polynomial.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/polynomial.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/preconditioner.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/preconditioner.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/preprocessor.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/preprocessor.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/problem.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/problem_impl.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/problem_impl.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/program.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/program.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/program_evaluator.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/random.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/reorder_program.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/reorder_program.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/residual_block.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/residual_block.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/residual_block_utils.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/residual_block_utils.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/schur_complement_solver.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/schur_complement_solver.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/schur_eliminator.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/schur_eliminator.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/schur_eliminator_impl.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/schur_jacobi_preconditioner.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/schur_jacobi_preconditioner.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/scratch_evaluate_preparer.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/scratch_evaluate_preparer.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/small_blas.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/solver.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/solver_utils.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/solver_utils.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/sparse_matrix.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/sparse_matrix.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/sparse_normal_cholesky_solver.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/sparse_normal_cholesky_solver.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/split.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/split.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/stl_util.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/stringprintf.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/stringprintf.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/suitesparse.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/triplet_sparse_matrix.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/triplet_sparse_matrix.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/trust_region_minimizer.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/trust_region_minimizer.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/trust_region_preprocessor.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/trust_region_preprocessor.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/trust_region_strategy.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/trust_region_strategy.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/types.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/visibility_based_preconditioner.h (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/wall_time.cc (100%) rename extern/{libmv/third_party => }/ceres/internal/ceres/wall_time.h (100%) rename extern/{libmv/third_party => }/ceres/mkfiles.sh (100%) rename extern/{libmv/third_party => }/ceres/patches/series (100%) delete mode 100644 extern/libmv/third_party/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index b04a771f17c..a4206c30a63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2600,6 +2600,46 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) ) endif() +#----------------------------------------------------------------------------- +# Configure Ceres + +if(WITH_LIBMV) + set(CERES_DEFINES) + + TEST_SHARED_PTR_SUPPORT() + if(SHARED_PTR_FOUND) + if(SHARED_PTR_TR1_MEMORY_HEADER) + list(APPEND CERES_DEFINES -DCERES_TR1_MEMORY_HEADER) + endif() + if(SHARED_PTR_TR1_NAMESPACE) + list(APPEND CERES_DEFINES -DCERES_TR1_SHARED_PTR) + endif() + else() + message(FATAL_ERROR "Ceres: Unable to find shared_ptr.") + endif() + + TEST_UNORDERED_MAP_SUPPORT() + if(HAVE_STD_UNORDERED_MAP_HEADER) + if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE) + list(APPEND CERES_DEFINES -DCERES_STD_UNORDERED_MAP) + else() + if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE) + list(APPEND CERES_DEFINES -DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE) + else() + list(APPEND CERES_DEFINES -DCERES_NO_UNORDERED_MAP) + message(STATUS "Ceres: Replacing unordered_map/set with map/set (warning: slower!)") + endif() + endif() + else() + if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE) + list(APPEND CERES_DEFINES -DCERES_TR1_UNORDERED_MAP) + else() + list(APPEND CERES_DEFINES -DCERES_NO_UNORDERED_MAP) + message(STATUS "Ceres: Replacing unordered_map/set with map/set (warning: slower!)") + endif() + endif() +endif() + #----------------------------------------------------------------------------- # Extra compile flags diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 3723a423eec..3c8e8150ba1 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -86,6 +86,10 @@ if(WITH_X11 AND WITH_GHOST_XDND) add_subdirectory(xdnd) endif() +if(WITH_LIBMV) + add_subdirectory(ceres) +endif() + if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) add_subdirectory(gflags) add_subdirectory(glog) diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt similarity index 97% rename from extern/libmv/third_party/ceres/CMakeLists.txt rename to extern/ceres/CMakeLists.txt index 024fcdef806..711b2ef69f2 100644 --- a/extern/libmv/third_party/ceres/CMakeLists.txt +++ b/extern/ceres/CMakeLists.txt @@ -31,8 +31,7 @@ set(INC include internal config - ../../../gflags/src - ../../ + ../gflags/src ) set(INC_SYS @@ -131,6 +130,7 @@ set(SRC include/ceres/covariance.h include/ceres/crs_matrix.h include/ceres/dynamic_autodiff_cost_function.h + include/ceres/dynamic_cost_function_to_functor.h include/ceres/dynamic_numeric_diff_cost_function.h include/ceres/fpclassify.h include/ceres/gradient_checker.h @@ -153,6 +153,7 @@ set(SRC include/ceres/loss_function.h include/ceres/normal_prior.h include/ceres/numeric_diff_cost_function.h + include/ceres/numeric_diff_options.h include/ceres/ordered_groups.h include/ceres/problem.h include/ceres/rotation.h @@ -200,6 +201,7 @@ set(SRC internal/ceres/gradient_problem_evaluator.h internal/ceres/graph_algorithms.h internal/ceres/graph.h + internal/ceres/householder_vector.h internal/ceres/implicit_schur_complement.h internal/ceres/integral_types.h internal/ceres/iterative_schur_complement_solver.h @@ -298,20 +300,18 @@ endif() if(WIN32) list(APPEND INC - ../../../glog/src/windows + ../glog/src/windows ) - - if(NOT MINGW) - list(APPEND INC - ../msinttypes - ) - endif() else() list(APPEND INC - ../../../glog/src + ../glog/src ) endif() +add_definitions(${GFLAGS_DEFINES}) +add_definitions(${GLOG_DEFINES}) +add_definitions(${CERES_DEFINES}) + add_definitions( -DCERES_HAVE_PTHREAD -DCERES_NO_SUITESPARSE diff --git a/extern/libmv/third_party/ceres/ChangeLog b/extern/ceres/ChangeLog similarity index 100% rename from extern/libmv/third_party/ceres/ChangeLog rename to extern/ceres/ChangeLog diff --git a/extern/libmv/third_party/ceres/LICENSE b/extern/ceres/LICENSE similarity index 100% rename from extern/libmv/third_party/ceres/LICENSE rename to extern/ceres/LICENSE diff --git a/extern/libmv/third_party/ceres/README b/extern/ceres/README similarity index 100% rename from extern/libmv/third_party/ceres/README rename to extern/ceres/README diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/ceres/bundle.sh similarity index 97% rename from extern/libmv/third_party/ceres/bundle.sh rename to extern/ceres/bundle.sh index 85da4f2afc9..0eaf00f3989 100755 --- a/extern/libmv/third_party/ceres/bundle.sh +++ b/extern/ceres/bundle.sh @@ -124,8 +124,7 @@ set(INC include internal config - ../gflags - ../../ + ../gflags/src ) set(INC_SYS @@ -150,18 +149,16 @@ if(WIN32) list(APPEND INC ../glog/src/windows ) - - if(NOT MINGW) - list(APPEND INC - ../msinttypes - ) - endif() else() list(APPEND INC ../glog/src ) endif() +add_definitions(\${GFLAGS_DEFINES}) +add_definitions(\${GLOG_DEFINES}) +add_definitions(\${CERES_DEFINES}) + add_definitions( -DCERES_HAVE_PTHREAD -DCERES_NO_SUITESPARSE diff --git a/extern/libmv/third_party/ceres/config/ceres/internal/config.h b/extern/ceres/config/ceres/internal/config.h similarity index 100% rename from extern/libmv/third_party/ceres/config/ceres/internal/config.h rename to extern/ceres/config/ceres/internal/config.h diff --git a/extern/libmv/third_party/ceres/files.txt b/extern/ceres/files.txt similarity index 100% rename from extern/libmv/third_party/ceres/files.txt rename to extern/ceres/files.txt diff --git a/extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h b/extern/ceres/include/ceres/autodiff_cost_function.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h rename to extern/ceres/include/ceres/autodiff_cost_function.h diff --git a/extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h b/extern/ceres/include/ceres/autodiff_local_parameterization.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h rename to extern/ceres/include/ceres/autodiff_local_parameterization.h diff --git a/extern/libmv/third_party/ceres/include/ceres/c_api.h b/extern/ceres/include/ceres/c_api.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/c_api.h rename to extern/ceres/include/ceres/c_api.h diff --git a/extern/libmv/third_party/ceres/include/ceres/ceres.h b/extern/ceres/include/ceres/ceres.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/ceres.h rename to extern/ceres/include/ceres/ceres.h diff --git a/extern/libmv/third_party/ceres/include/ceres/conditioned_cost_function.h b/extern/ceres/include/ceres/conditioned_cost_function.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/conditioned_cost_function.h rename to extern/ceres/include/ceres/conditioned_cost_function.h diff --git a/extern/libmv/third_party/ceres/include/ceres/cost_function.h b/extern/ceres/include/ceres/cost_function.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/cost_function.h rename to extern/ceres/include/ceres/cost_function.h diff --git a/extern/libmv/third_party/ceres/include/ceres/cost_function_to_functor.h b/extern/ceres/include/ceres/cost_function_to_functor.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/cost_function_to_functor.h rename to extern/ceres/include/ceres/cost_function_to_functor.h diff --git a/extern/libmv/third_party/ceres/include/ceres/covariance.h b/extern/ceres/include/ceres/covariance.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/covariance.h rename to extern/ceres/include/ceres/covariance.h diff --git a/extern/libmv/third_party/ceres/include/ceres/crs_matrix.h b/extern/ceres/include/ceres/crs_matrix.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/crs_matrix.h rename to extern/ceres/include/ceres/crs_matrix.h diff --git a/extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h b/extern/ceres/include/ceres/dynamic_autodiff_cost_function.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h rename to extern/ceres/include/ceres/dynamic_autodiff_cost_function.h diff --git a/extern/libmv/third_party/ceres/include/ceres/dynamic_cost_function_to_functor.h b/extern/ceres/include/ceres/dynamic_cost_function_to_functor.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/dynamic_cost_function_to_functor.h rename to extern/ceres/include/ceres/dynamic_cost_function_to_functor.h diff --git a/extern/libmv/third_party/ceres/include/ceres/dynamic_numeric_diff_cost_function.h b/extern/ceres/include/ceres/dynamic_numeric_diff_cost_function.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/dynamic_numeric_diff_cost_function.h rename to extern/ceres/include/ceres/dynamic_numeric_diff_cost_function.h diff --git a/extern/libmv/third_party/ceres/include/ceres/fpclassify.h b/extern/ceres/include/ceres/fpclassify.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/fpclassify.h rename to extern/ceres/include/ceres/fpclassify.h diff --git a/extern/libmv/third_party/ceres/include/ceres/gradient_checker.h b/extern/ceres/include/ceres/gradient_checker.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/gradient_checker.h rename to extern/ceres/include/ceres/gradient_checker.h diff --git a/extern/libmv/third_party/ceres/include/ceres/gradient_problem.h b/extern/ceres/include/ceres/gradient_problem.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/gradient_problem.h rename to extern/ceres/include/ceres/gradient_problem.h diff --git a/extern/libmv/third_party/ceres/include/ceres/gradient_problem_solver.h b/extern/ceres/include/ceres/gradient_problem_solver.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/gradient_problem_solver.h rename to extern/ceres/include/ceres/gradient_problem_solver.h diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h b/extern/ceres/include/ceres/internal/autodiff.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h rename to extern/ceres/include/ceres/internal/autodiff.h diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/disable_warnings.h b/extern/ceres/include/ceres/internal/disable_warnings.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/internal/disable_warnings.h rename to extern/ceres/include/ceres/internal/disable_warnings.h diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/eigen.h b/extern/ceres/include/ceres/internal/eigen.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/internal/eigen.h rename to extern/ceres/include/ceres/internal/eigen.h diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h b/extern/ceres/include/ceres/internal/fixed_array.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h rename to extern/ceres/include/ceres/internal/fixed_array.h diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/macros.h b/extern/ceres/include/ceres/internal/macros.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/internal/macros.h rename to extern/ceres/include/ceres/internal/macros.h diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/manual_constructor.h b/extern/ceres/include/ceres/internal/manual_constructor.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/internal/manual_constructor.h rename to extern/ceres/include/ceres/internal/manual_constructor.h diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/numeric_diff.h b/extern/ceres/include/ceres/internal/numeric_diff.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/internal/numeric_diff.h rename to extern/ceres/include/ceres/internal/numeric_diff.h diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/port.h b/extern/ceres/include/ceres/internal/port.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/internal/port.h rename to extern/ceres/include/ceres/internal/port.h diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/reenable_warnings.h b/extern/ceres/include/ceres/internal/reenable_warnings.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/internal/reenable_warnings.h rename to extern/ceres/include/ceres/internal/reenable_warnings.h diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/scoped_ptr.h b/extern/ceres/include/ceres/internal/scoped_ptr.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/internal/scoped_ptr.h rename to extern/ceres/include/ceres/internal/scoped_ptr.h diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/variadic_evaluate.h b/extern/ceres/include/ceres/internal/variadic_evaluate.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/internal/variadic_evaluate.h rename to extern/ceres/include/ceres/internal/variadic_evaluate.h diff --git a/extern/libmv/third_party/ceres/include/ceres/iteration_callback.h b/extern/ceres/include/ceres/iteration_callback.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/iteration_callback.h rename to extern/ceres/include/ceres/iteration_callback.h diff --git a/extern/libmv/third_party/ceres/include/ceres/jet.h b/extern/ceres/include/ceres/jet.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/jet.h rename to extern/ceres/include/ceres/jet.h diff --git a/extern/libmv/third_party/ceres/include/ceres/local_parameterization.h b/extern/ceres/include/ceres/local_parameterization.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/local_parameterization.h rename to extern/ceres/include/ceres/local_parameterization.h diff --git a/extern/libmv/third_party/ceres/include/ceres/loss_function.h b/extern/ceres/include/ceres/loss_function.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/loss_function.h rename to extern/ceres/include/ceres/loss_function.h diff --git a/extern/libmv/third_party/ceres/include/ceres/normal_prior.h b/extern/ceres/include/ceres/normal_prior.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/normal_prior.h rename to extern/ceres/include/ceres/normal_prior.h diff --git a/extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h b/extern/ceres/include/ceres/numeric_diff_cost_function.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h rename to extern/ceres/include/ceres/numeric_diff_cost_function.h diff --git a/extern/libmv/third_party/ceres/include/ceres/numeric_diff_options.h b/extern/ceres/include/ceres/numeric_diff_options.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/numeric_diff_options.h rename to extern/ceres/include/ceres/numeric_diff_options.h diff --git a/extern/libmv/third_party/ceres/include/ceres/ordered_groups.h b/extern/ceres/include/ceres/ordered_groups.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/ordered_groups.h rename to extern/ceres/include/ceres/ordered_groups.h diff --git a/extern/libmv/third_party/ceres/include/ceres/problem.h b/extern/ceres/include/ceres/problem.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/problem.h rename to extern/ceres/include/ceres/problem.h diff --git a/extern/libmv/third_party/ceres/include/ceres/rotation.h b/extern/ceres/include/ceres/rotation.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/rotation.h rename to extern/ceres/include/ceres/rotation.h diff --git a/extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h b/extern/ceres/include/ceres/sized_cost_function.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h rename to extern/ceres/include/ceres/sized_cost_function.h diff --git a/extern/libmv/third_party/ceres/include/ceres/solver.h b/extern/ceres/include/ceres/solver.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/solver.h rename to extern/ceres/include/ceres/solver.h diff --git a/extern/libmv/third_party/ceres/include/ceres/types.h b/extern/ceres/include/ceres/types.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/types.h rename to extern/ceres/include/ceres/types.h diff --git a/extern/libmv/third_party/ceres/include/ceres/version.h b/extern/ceres/include/ceres/version.h similarity index 100% rename from extern/libmv/third_party/ceres/include/ceres/version.h rename to extern/ceres/include/ceres/version.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/array_utils.cc b/extern/ceres/internal/ceres/array_utils.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/array_utils.cc rename to extern/ceres/internal/ceres/array_utils.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/array_utils.h b/extern/ceres/internal/ceres/array_utils.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/array_utils.h rename to extern/ceres/internal/ceres/array_utils.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/blas.cc b/extern/ceres/internal/ceres/blas.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/blas.cc rename to extern/ceres/internal/ceres/blas.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/blas.h b/extern/ceres/internal/ceres/blas.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/blas.h rename to extern/ceres/internal/ceres/blas.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.cc b/extern/ceres/internal/ceres/block_evaluate_preparer.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.cc rename to extern/ceres/internal/ceres/block_evaluate_preparer.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.h b/extern/ceres/internal/ceres/block_evaluate_preparer.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.h rename to extern/ceres/internal/ceres/block_evaluate_preparer.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc b/extern/ceres/internal/ceres/block_jacobi_preconditioner.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc rename to extern/ceres/internal/ceres/block_jacobi_preconditioner.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h b/extern/ceres/internal/ceres/block_jacobi_preconditioner.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h rename to extern/ceres/internal/ceres/block_jacobi_preconditioner.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.cc b/extern/ceres/internal/ceres/block_jacobian_writer.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.cc rename to extern/ceres/internal/ceres/block_jacobian_writer.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.h b/extern/ceres/internal/ceres/block_jacobian_writer.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.h rename to extern/ceres/internal/ceres/block_jacobian_writer.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc b/extern/ceres/internal/ceres/block_random_access_dense_matrix.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc rename to extern/ceres/internal/ceres/block_random_access_dense_matrix.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h b/extern/ceres/internal/ceres/block_random_access_dense_matrix.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h rename to extern/ceres/internal/ceres/block_random_access_dense_matrix.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_diagonal_matrix.cc b/extern/ceres/internal/ceres/block_random_access_diagonal_matrix.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_random_access_diagonal_matrix.cc rename to extern/ceres/internal/ceres/block_random_access_diagonal_matrix.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_diagonal_matrix.h b/extern/ceres/internal/ceres/block_random_access_diagonal_matrix.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_random_access_diagonal_matrix.h rename to extern/ceres/internal/ceres/block_random_access_diagonal_matrix.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.cc b/extern/ceres/internal/ceres/block_random_access_matrix.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.cc rename to extern/ceres/internal/ceres/block_random_access_matrix.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.h b/extern/ceres/internal/ceres/block_random_access_matrix.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.h rename to extern/ceres/internal/ceres/block_random_access_matrix.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc b/extern/ceres/internal/ceres/block_random_access_sparse_matrix.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc rename to extern/ceres/internal/ceres/block_random_access_sparse_matrix.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h b/extern/ceres/internal/ceres/block_random_access_sparse_matrix.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h rename to extern/ceres/internal/ceres/block_random_access_sparse_matrix.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc b/extern/ceres/internal/ceres/block_sparse_matrix.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc rename to extern/ceres/internal/ceres/block_sparse_matrix.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h b/extern/ceres/internal/ceres/block_sparse_matrix.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h rename to extern/ceres/internal/ceres/block_sparse_matrix.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_structure.cc b/extern/ceres/internal/ceres/block_structure.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_structure.cc rename to extern/ceres/internal/ceres/block_structure.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_structure.h b/extern/ceres/internal/ceres/block_structure.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/block_structure.h rename to extern/ceres/internal/ceres/block_structure.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/c_api.cc b/extern/ceres/internal/ceres/c_api.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/c_api.cc rename to extern/ceres/internal/ceres/c_api.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/callbacks.cc b/extern/ceres/internal/ceres/callbacks.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/callbacks.cc rename to extern/ceres/internal/ceres/callbacks.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/callbacks.h b/extern/ceres/internal/ceres/callbacks.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/callbacks.h rename to extern/ceres/internal/ceres/callbacks.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/casts.h b/extern/ceres/internal/ceres/casts.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/casts.h rename to extern/ceres/internal/ceres/casts.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/cgnr_linear_operator.h b/extern/ceres/internal/ceres/cgnr_linear_operator.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/cgnr_linear_operator.h rename to extern/ceres/internal/ceres/cgnr_linear_operator.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc b/extern/ceres/internal/ceres/cgnr_solver.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc rename to extern/ceres/internal/ceres/cgnr_solver.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h b/extern/ceres/internal/ceres/cgnr_solver.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h rename to extern/ceres/internal/ceres/cgnr_solver.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/collections_port.h b/extern/ceres/internal/ceres/collections_port.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/collections_port.h rename to extern/ceres/internal/ceres/collections_port.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.cc b/extern/ceres/internal/ceres/compressed_col_sparse_matrix_utils.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.cc rename to extern/ceres/internal/ceres/compressed_col_sparse_matrix_utils.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h b/extern/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h rename to extern/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.cc b/extern/ceres/internal/ceres/compressed_row_jacobian_writer.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.cc rename to extern/ceres/internal/ceres/compressed_row_jacobian_writer.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.h b/extern/ceres/internal/ceres/compressed_row_jacobian_writer.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.h rename to extern/ceres/internal/ceres/compressed_row_jacobian_writer.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc b/extern/ceres/internal/ceres/compressed_row_sparse_matrix.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc rename to extern/ceres/internal/ceres/compressed_row_sparse_matrix.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h b/extern/ceres/internal/ceres/compressed_row_sparse_matrix.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h rename to extern/ceres/internal/ceres/compressed_row_sparse_matrix.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/conditioned_cost_function.cc b/extern/ceres/internal/ceres/conditioned_cost_function.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/conditioned_cost_function.cc rename to extern/ceres/internal/ceres/conditioned_cost_function.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.cc b/extern/ceres/internal/ceres/conjugate_gradients_solver.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.cc rename to extern/ceres/internal/ceres/conjugate_gradients_solver.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.h b/extern/ceres/internal/ceres/conjugate_gradients_solver.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.h rename to extern/ceres/internal/ceres/conjugate_gradients_solver.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.cc b/extern/ceres/internal/ceres/coordinate_descent_minimizer.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.cc rename to extern/ceres/internal/ceres/coordinate_descent_minimizer.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.h b/extern/ceres/internal/ceres/coordinate_descent_minimizer.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.h rename to extern/ceres/internal/ceres/coordinate_descent_minimizer.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/corrector.cc b/extern/ceres/internal/ceres/corrector.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/corrector.cc rename to extern/ceres/internal/ceres/corrector.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/corrector.h b/extern/ceres/internal/ceres/corrector.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/corrector.h rename to extern/ceres/internal/ceres/corrector.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/covariance.cc b/extern/ceres/internal/ceres/covariance.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/covariance.cc rename to extern/ceres/internal/ceres/covariance.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/covariance_impl.cc b/extern/ceres/internal/ceres/covariance_impl.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/covariance_impl.cc rename to extern/ceres/internal/ceres/covariance_impl.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/covariance_impl.h b/extern/ceres/internal/ceres/covariance_impl.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/covariance_impl.h rename to extern/ceres/internal/ceres/covariance_impl.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/cxsparse.h b/extern/ceres/internal/ceres/cxsparse.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/cxsparse.h rename to extern/ceres/internal/ceres/cxsparse.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/dense_jacobian_writer.h b/extern/ceres/internal/ceres/dense_jacobian_writer.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dense_jacobian_writer.h rename to extern/ceres/internal/ceres/dense_jacobian_writer.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.cc b/extern/ceres/internal/ceres/dense_normal_cholesky_solver.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.cc rename to extern/ceres/internal/ceres/dense_normal_cholesky_solver.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.h b/extern/ceres/internal/ceres/dense_normal_cholesky_solver.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.h rename to extern/ceres/internal/ceres/dense_normal_cholesky_solver.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc b/extern/ceres/internal/ceres/dense_qr_solver.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc rename to extern/ceres/internal/ceres/dense_qr_solver.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h b/extern/ceres/internal/ceres/dense_qr_solver.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h rename to extern/ceres/internal/ceres/dense_qr_solver.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc b/extern/ceres/internal/ceres/dense_sparse_matrix.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc rename to extern/ceres/internal/ceres/dense_sparse_matrix.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h b/extern/ceres/internal/ceres/dense_sparse_matrix.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h rename to extern/ceres/internal/ceres/dense_sparse_matrix.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/detect_structure.cc b/extern/ceres/internal/ceres/detect_structure.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/detect_structure.cc rename to extern/ceres/internal/ceres/detect_structure.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/detect_structure.h b/extern/ceres/internal/ceres/detect_structure.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/detect_structure.h rename to extern/ceres/internal/ceres/detect_structure.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.cc b/extern/ceres/internal/ceres/dogleg_strategy.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.cc rename to extern/ceres/internal/ceres/dogleg_strategy.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.h b/extern/ceres/internal/ceres/dogleg_strategy.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.h rename to extern/ceres/internal/ceres/dogleg_strategy.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_finalizer.h b/extern/ceres/internal/ceres/dynamic_compressed_row_finalizer.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_finalizer.h rename to extern/ceres/internal/ceres/dynamic_compressed_row_finalizer.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.cc b/extern/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.cc rename to extern/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.h b/extern/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.h rename to extern/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.cc b/extern/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.cc rename to extern/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.h b/extern/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.h rename to extern/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/evaluator.cc b/extern/ceres/internal/ceres/evaluator.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/evaluator.cc rename to extern/ceres/internal/ceres/evaluator.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/evaluator.h b/extern/ceres/internal/ceres/evaluator.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/evaluator.h rename to extern/ceres/internal/ceres/evaluator.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/execution_summary.h b/extern/ceres/internal/ceres/execution_summary.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/execution_summary.h rename to extern/ceres/internal/ceres/execution_summary.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/file.cc b/extern/ceres/internal/ceres/file.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/file.cc rename to extern/ceres/internal/ceres/file.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/file.h b/extern/ceres/internal/ceres/file.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/file.h rename to extern/ceres/internal/ceres/file.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/generate_eliminator_specialization.py b/extern/ceres/internal/ceres/generate_eliminator_specialization.py similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generate_eliminator_specialization.py rename to extern/ceres/internal/ceres/generate_eliminator_specialization.py diff --git a/extern/libmv/third_party/ceres/internal/ceres/generate_partitioned_matrix_view_specializations.py b/extern/ceres/internal/ceres/generate_partitioned_matrix_view_specializations.py similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generate_partitioned_matrix_view_specializations.py rename to extern/ceres/internal/ceres/generate_partitioned_matrix_view_specializations.py diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_2.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_2.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_2.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_2.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_3.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_3.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_3.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_3.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_4.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_4.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_4.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_4.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_d.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_d.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_d.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_d.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_3.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_3.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_3.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_3.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_4.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_4.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_4.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_4.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_6.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_6.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_6.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_6.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_9.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_9.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_9.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_9.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_d.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_d.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_d.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_d.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_3.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_3.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_3.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_3.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_4.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_4.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_4.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_4.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_8.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_8.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_8.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_8.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_9.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_9.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_9.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_9.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_d.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_d.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_d.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_d.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_d_d.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_d_d.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_d_d.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_d_d.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_2.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_2.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_2.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_2.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_3.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_3.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_3.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_3.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_4.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_4.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_4.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_4.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_d.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_d.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_d.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_d.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_d_d_d.cc b/extern/ceres/internal/ceres/generated/partitioned_matrix_view_d_d_d.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_d_d_d.cc rename to extern/ceres/internal/ceres/generated/partitioned_matrix_view_d_d_d.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_6.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_3_6.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_6.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_3_6.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_8.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_4_8.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_8.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_4_8.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_9.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_4_9.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_9.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_4_9.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_d_d.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_2_d_d.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_d_d.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_2_d_d.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc b/extern/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc rename to extern/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.cc b/extern/ceres/internal/ceres/gradient_checking_cost_function.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.cc rename to extern/ceres/internal/ceres/gradient_checking_cost_function.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.h b/extern/ceres/internal/ceres/gradient_checking_cost_function.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.h rename to extern/ceres/internal/ceres/gradient_checking_cost_function.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/gradient_problem.cc b/extern/ceres/internal/ceres/gradient_problem.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/gradient_problem.cc rename to extern/ceres/internal/ceres/gradient_problem.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/gradient_problem_evaluator.h b/extern/ceres/internal/ceres/gradient_problem_evaluator.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/gradient_problem_evaluator.h rename to extern/ceres/internal/ceres/gradient_problem_evaluator.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/gradient_problem_solver.cc b/extern/ceres/internal/ceres/gradient_problem_solver.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/gradient_problem_solver.cc rename to extern/ceres/internal/ceres/gradient_problem_solver.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/graph.h b/extern/ceres/internal/ceres/graph.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/graph.h rename to extern/ceres/internal/ceres/graph.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h b/extern/ceres/internal/ceres/graph_algorithms.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h rename to extern/ceres/internal/ceres/graph_algorithms.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/householder_vector.h b/extern/ceres/internal/ceres/householder_vector.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/householder_vector.h rename to extern/ceres/internal/ceres/householder_vector.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc b/extern/ceres/internal/ceres/implicit_schur_complement.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc rename to extern/ceres/internal/ceres/implicit_schur_complement.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h b/extern/ceres/internal/ceres/implicit_schur_complement.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h rename to extern/ceres/internal/ceres/implicit_schur_complement.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/integral_types.h b/extern/ceres/internal/ceres/integral_types.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/integral_types.h rename to extern/ceres/internal/ceres/integral_types.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc b/extern/ceres/internal/ceres/iterative_schur_complement_solver.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc rename to extern/ceres/internal/ceres/iterative_schur_complement_solver.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h b/extern/ceres/internal/ceres/iterative_schur_complement_solver.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h rename to extern/ceres/internal/ceres/iterative_schur_complement_solver.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/lapack.cc b/extern/ceres/internal/ceres/lapack.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/lapack.cc rename to extern/ceres/internal/ceres/lapack.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/lapack.h b/extern/ceres/internal/ceres/lapack.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/lapack.h rename to extern/ceres/internal/ceres/lapack.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt_strategy.cc b/extern/ceres/internal/ceres/levenberg_marquardt_strategy.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt_strategy.cc rename to extern/ceres/internal/ceres/levenberg_marquardt_strategy.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt_strategy.h b/extern/ceres/internal/ceres/levenberg_marquardt_strategy.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt_strategy.h rename to extern/ceres/internal/ceres/levenberg_marquardt_strategy.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/line_search.cc b/extern/ceres/internal/ceres/line_search.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/line_search.cc rename to extern/ceres/internal/ceres/line_search.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/line_search.h b/extern/ceres/internal/ceres/line_search.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/line_search.h rename to extern/ceres/internal/ceres/line_search.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc b/extern/ceres/internal/ceres/line_search_direction.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc rename to extern/ceres/internal/ceres/line_search_direction.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.h b/extern/ceres/internal/ceres/line_search_direction.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/line_search_direction.h rename to extern/ceres/internal/ceres/line_search_direction.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc b/extern/ceres/internal/ceres/line_search_minimizer.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc rename to extern/ceres/internal/ceres/line_search_minimizer.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.h b/extern/ceres/internal/ceres/line_search_minimizer.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.h rename to extern/ceres/internal/ceres/line_search_minimizer.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/line_search_preprocessor.cc b/extern/ceres/internal/ceres/line_search_preprocessor.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/line_search_preprocessor.cc rename to extern/ceres/internal/ceres/line_search_preprocessor.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/line_search_preprocessor.h b/extern/ceres/internal/ceres/line_search_preprocessor.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/line_search_preprocessor.h rename to extern/ceres/internal/ceres/line_search_preprocessor.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc b/extern/ceres/internal/ceres/linear_least_squares_problems.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc rename to extern/ceres/internal/ceres/linear_least_squares_problems.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h b/extern/ceres/internal/ceres/linear_least_squares_problems.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h rename to extern/ceres/internal/ceres/linear_least_squares_problems.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/linear_operator.cc b/extern/ceres/internal/ceres/linear_operator.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/linear_operator.cc rename to extern/ceres/internal/ceres/linear_operator.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/linear_operator.h b/extern/ceres/internal/ceres/linear_operator.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/linear_operator.h rename to extern/ceres/internal/ceres/linear_operator.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/linear_solver.cc b/extern/ceres/internal/ceres/linear_solver.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/linear_solver.cc rename to extern/ceres/internal/ceres/linear_solver.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h b/extern/ceres/internal/ceres/linear_solver.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/linear_solver.h rename to extern/ceres/internal/ceres/linear_solver.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/local_parameterization.cc b/extern/ceres/internal/ceres/local_parameterization.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/local_parameterization.cc rename to extern/ceres/internal/ceres/local_parameterization.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/loss_function.cc b/extern/ceres/internal/ceres/loss_function.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/loss_function.cc rename to extern/ceres/internal/ceres/loss_function.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.cc b/extern/ceres/internal/ceres/low_rank_inverse_hessian.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.cc rename to extern/ceres/internal/ceres/low_rank_inverse_hessian.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.h b/extern/ceres/internal/ceres/low_rank_inverse_hessian.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.h rename to extern/ceres/internal/ceres/low_rank_inverse_hessian.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/map_util.h b/extern/ceres/internal/ceres/map_util.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/map_util.h rename to extern/ceres/internal/ceres/map_util.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/minimizer.cc b/extern/ceres/internal/ceres/minimizer.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/minimizer.cc rename to extern/ceres/internal/ceres/minimizer.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/minimizer.h b/extern/ceres/internal/ceres/minimizer.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/minimizer.h rename to extern/ceres/internal/ceres/minimizer.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/mutex.h b/extern/ceres/internal/ceres/mutex.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/mutex.h rename to extern/ceres/internal/ceres/mutex.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/normal_prior.cc b/extern/ceres/internal/ceres/normal_prior.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/normal_prior.cc rename to extern/ceres/internal/ceres/normal_prior.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/parameter_block.h b/extern/ceres/internal/ceres/parameter_block.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/parameter_block.h rename to extern/ceres/internal/ceres/parameter_block.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.cc b/extern/ceres/internal/ceres/parameter_block_ordering.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.cc rename to extern/ceres/internal/ceres/parameter_block_ordering.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.h b/extern/ceres/internal/ceres/parameter_block_ordering.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.h rename to extern/ceres/internal/ceres/parameter_block_ordering.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc b/extern/ceres/internal/ceres/partitioned_matrix_view.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc rename to extern/ceres/internal/ceres/partitioned_matrix_view.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.h b/extern/ceres/internal/ceres/partitioned_matrix_view.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.h rename to extern/ceres/internal/ceres/partitioned_matrix_view.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view_impl.h b/extern/ceres/internal/ceres/partitioned_matrix_view_impl.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view_impl.h rename to extern/ceres/internal/ceres/partitioned_matrix_view_impl.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/polynomial.cc b/extern/ceres/internal/ceres/polynomial.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/polynomial.cc rename to extern/ceres/internal/ceres/polynomial.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/polynomial.h b/extern/ceres/internal/ceres/polynomial.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/polynomial.h rename to extern/ceres/internal/ceres/polynomial.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/preconditioner.cc b/extern/ceres/internal/ceres/preconditioner.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/preconditioner.cc rename to extern/ceres/internal/ceres/preconditioner.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/preconditioner.h b/extern/ceres/internal/ceres/preconditioner.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/preconditioner.h rename to extern/ceres/internal/ceres/preconditioner.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/preprocessor.cc b/extern/ceres/internal/ceres/preprocessor.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/preprocessor.cc rename to extern/ceres/internal/ceres/preprocessor.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/preprocessor.h b/extern/ceres/internal/ceres/preprocessor.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/preprocessor.h rename to extern/ceres/internal/ceres/preprocessor.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/problem.cc b/extern/ceres/internal/ceres/problem.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/problem.cc rename to extern/ceres/internal/ceres/problem.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc b/extern/ceres/internal/ceres/problem_impl.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc rename to extern/ceres/internal/ceres/problem_impl.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h b/extern/ceres/internal/ceres/problem_impl.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/problem_impl.h rename to extern/ceres/internal/ceres/problem_impl.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/program.cc b/extern/ceres/internal/ceres/program.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/program.cc rename to extern/ceres/internal/ceres/program.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/program.h b/extern/ceres/internal/ceres/program.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/program.h rename to extern/ceres/internal/ceres/program.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h b/extern/ceres/internal/ceres/program_evaluator.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h rename to extern/ceres/internal/ceres/program_evaluator.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/random.h b/extern/ceres/internal/ceres/random.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/random.h rename to extern/ceres/internal/ceres/random.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/reorder_program.cc b/extern/ceres/internal/ceres/reorder_program.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/reorder_program.cc rename to extern/ceres/internal/ceres/reorder_program.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/reorder_program.h b/extern/ceres/internal/ceres/reorder_program.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/reorder_program.h rename to extern/ceres/internal/ceres/reorder_program.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc b/extern/ceres/internal/ceres/residual_block.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/residual_block.cc rename to extern/ceres/internal/ceres/residual_block.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/residual_block.h b/extern/ceres/internal/ceres/residual_block.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/residual_block.h rename to extern/ceres/internal/ceres/residual_block.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc b/extern/ceres/internal/ceres/residual_block_utils.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc rename to extern/ceres/internal/ceres/residual_block_utils.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.h b/extern/ceres/internal/ceres/residual_block_utils.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.h rename to extern/ceres/internal/ceres/residual_block_utils.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc b/extern/ceres/internal/ceres/schur_complement_solver.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc rename to extern/ceres/internal/ceres/schur_complement_solver.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h b/extern/ceres/internal/ceres/schur_complement_solver.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h rename to extern/ceres/internal/ceres/schur_complement_solver.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc b/extern/ceres/internal/ceres/schur_eliminator.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc rename to extern/ceres/internal/ceres/schur_eliminator.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h b/extern/ceres/internal/ceres/schur_eliminator.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h rename to extern/ceres/internal/ceres/schur_eliminator.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h b/extern/ceres/internal/ceres/schur_eliminator_impl.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h rename to extern/ceres/internal/ceres/schur_eliminator_impl.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.cc b/extern/ceres/internal/ceres/schur_jacobi_preconditioner.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.cc rename to extern/ceres/internal/ceres/schur_jacobi_preconditioner.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.h b/extern/ceres/internal/ceres/schur_jacobi_preconditioner.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.h rename to extern/ceres/internal/ceres/schur_jacobi_preconditioner.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.cc b/extern/ceres/internal/ceres/scratch_evaluate_preparer.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.cc rename to extern/ceres/internal/ceres/scratch_evaluate_preparer.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.h b/extern/ceres/internal/ceres/scratch_evaluate_preparer.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.h rename to extern/ceres/internal/ceres/scratch_evaluate_preparer.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/small_blas.h b/extern/ceres/internal/ceres/small_blas.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/small_blas.h rename to extern/ceres/internal/ceres/small_blas.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/solver.cc b/extern/ceres/internal/ceres/solver.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/solver.cc rename to extern/ceres/internal/ceres/solver.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/solver_utils.cc b/extern/ceres/internal/ceres/solver_utils.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/solver_utils.cc rename to extern/ceres/internal/ceres/solver_utils.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/solver_utils.h b/extern/ceres/internal/ceres/solver_utils.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/solver_utils.h rename to extern/ceres/internal/ceres/solver_utils.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.cc b/extern/ceres/internal/ceres/sparse_matrix.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.cc rename to extern/ceres/internal/ceres/sparse_matrix.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h b/extern/ceres/internal/ceres/sparse_matrix.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h rename to extern/ceres/internal/ceres/sparse_matrix.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc b/extern/ceres/internal/ceres/sparse_normal_cholesky_solver.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc rename to extern/ceres/internal/ceres/sparse_normal_cholesky_solver.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h b/extern/ceres/internal/ceres/sparse_normal_cholesky_solver.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h rename to extern/ceres/internal/ceres/sparse_normal_cholesky_solver.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/split.cc b/extern/ceres/internal/ceres/split.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/split.cc rename to extern/ceres/internal/ceres/split.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/split.h b/extern/ceres/internal/ceres/split.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/split.h rename to extern/ceres/internal/ceres/split.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/stl_util.h b/extern/ceres/internal/ceres/stl_util.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/stl_util.h rename to extern/ceres/internal/ceres/stl_util.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc b/extern/ceres/internal/ceres/stringprintf.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc rename to extern/ceres/internal/ceres/stringprintf.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/stringprintf.h b/extern/ceres/internal/ceres/stringprintf.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/stringprintf.h rename to extern/ceres/internal/ceres/stringprintf.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h b/extern/ceres/internal/ceres/suitesparse.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/suitesparse.h rename to extern/ceres/internal/ceres/suitesparse.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc b/extern/ceres/internal/ceres/triplet_sparse_matrix.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc rename to extern/ceres/internal/ceres/triplet_sparse_matrix.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h b/extern/ceres/internal/ceres/triplet_sparse_matrix.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h rename to extern/ceres/internal/ceres/triplet_sparse_matrix.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.cc b/extern/ceres/internal/ceres/trust_region_minimizer.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.cc rename to extern/ceres/internal/ceres/trust_region_minimizer.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.h b/extern/ceres/internal/ceres/trust_region_minimizer.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.h rename to extern/ceres/internal/ceres/trust_region_minimizer.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/trust_region_preprocessor.cc b/extern/ceres/internal/ceres/trust_region_preprocessor.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/trust_region_preprocessor.cc rename to extern/ceres/internal/ceres/trust_region_preprocessor.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/trust_region_preprocessor.h b/extern/ceres/internal/ceres/trust_region_preprocessor.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/trust_region_preprocessor.h rename to extern/ceres/internal/ceres/trust_region_preprocessor.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.cc b/extern/ceres/internal/ceres/trust_region_strategy.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.cc rename to extern/ceres/internal/ceres/trust_region_strategy.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.h b/extern/ceres/internal/ceres/trust_region_strategy.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.h rename to extern/ceres/internal/ceres/trust_region_strategy.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/types.cc b/extern/ceres/internal/ceres/types.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/types.cc rename to extern/ceres/internal/ceres/types.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h b/extern/ceres/internal/ceres/visibility_based_preconditioner.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h rename to extern/ceres/internal/ceres/visibility_based_preconditioner.h diff --git a/extern/libmv/third_party/ceres/internal/ceres/wall_time.cc b/extern/ceres/internal/ceres/wall_time.cc similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/wall_time.cc rename to extern/ceres/internal/ceres/wall_time.cc diff --git a/extern/libmv/third_party/ceres/internal/ceres/wall_time.h b/extern/ceres/internal/ceres/wall_time.h similarity index 100% rename from extern/libmv/third_party/ceres/internal/ceres/wall_time.h rename to extern/ceres/internal/ceres/wall_time.h diff --git a/extern/libmv/third_party/ceres/mkfiles.sh b/extern/ceres/mkfiles.sh similarity index 100% rename from extern/libmv/third_party/ceres/mkfiles.sh rename to extern/ceres/mkfiles.sh diff --git a/extern/libmv/third_party/ceres/patches/series b/extern/ceres/patches/series similarity index 100% rename from extern/libmv/third_party/ceres/patches/series rename to extern/ceres/patches/series diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt index c4d27c24f09..375031fd1cb 100644 --- a/extern/libmv/CMakeLists.txt +++ b/extern/libmv/CMakeLists.txt @@ -37,22 +37,9 @@ set(SRC libmv-capi.h ) -TEST_SHARED_PTR_SUPPORT() -if(SHARED_PTR_FOUND) - if(SHARED_PTR_TR1_MEMORY_HEADER) - add_definitions(-DCERES_TR1_MEMORY_HEADER) - endif() - if(SHARED_PTR_TR1_NAMESPACE) - add_definitions(-DCERES_TR1_SHARED_PTR) - endif() -else() - message(FATAL_ERROR "Unable to find shared_ptr.") -endif() - add_definitions(${GFLAGS_DEFINES}) add_definitions(${GLOG_DEFINES}) - -add_subdirectory(third_party) +add_definitions(${CERES_DEFINES}) if(WITH_LIBMV) list(APPEND INC diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index da465e5f93c..273365bb31a 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -17,10 +17,7 @@ git clone -b $BRANCH $repo $tmp/libmv git --git-dir $tmp/libmv/.git --work-tree $tmp/libmv log -n 50 > ChangeLog find libmv -type f -exec rm -rf {} \; -find third_party -type f \ - -not -iwholename '*third_party/ceres*' \ - -not -iwholename '*third_party/CMakeLists.txt*' \ - -exec rm -rf {} \; +find third_party -type f -exec rm -rf {} \; cat "files.txt" | while read f; do mkdir -p `dirname $f` @@ -32,13 +29,13 @@ rm -rf $tmp sources=`find ./libmv -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v _test.cc | grep -v test_data_sets | sed -r 's/^\.\//\t\t/' | sort -d` headers=`find ./libmv -type f -iname '*.h' | grep -v test_data_sets | sed -r 's/^\.\//\t\t/' | sort -d` -third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v ceres | sed -r 's/^\.\//\t\t/' | sort -d` -third_headers=`find ./third_party -type f -iname '*.h' | grep -v ceres | sed -r 's/^\.\//\t\t/' | sort -d` +third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t\t/' | sort -d` +third_headers=`find ./third_party -type f -iname '*.h' | sed -r 's/^\.\//\t\t/' | sort -d` tests=`find ./libmv -type f -iname '*_test.cc' | sort -d | awk ' { name=gensub(".*/([A-Za-z_]+)_test.cc", "\\\\1", $1); printf("\t\tBLENDER_SRC_GTEST(\"libmv_%s\" \"%s\" \"libmv_test_dataset;extern_libmv;extern_ceres\")\n", name, $1) } '` src_dir=`find ./libmv -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t\t/' | sort -d | uniq` -src_third_dir=`find ./third_party -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | grep -v ceres | sed -r 's/^\.\//\t\t/' | sort -d | uniq` +src_third_dir=`find ./third_party -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t\t/' | sort -d | uniq` src="" win_src="" for x in $src_dir $src_third_dir; do @@ -119,28 +116,13 @@ set(SRC libmv-capi.h ) -TEST_SHARED_PTR_SUPPORT() -if(SHARED_PTR_FOUND) - if(SHARED_PTR_TR1_MEMORY_HEADER) - add_definitions(-DCERES_TR1_MEMORY_HEADER) - endif() - if(SHARED_PTR_TR1_NAMESPACE) - add_definitions(-DCERES_TR1_SHARED_PTR) - endif() -else() - message(FATAL_ERROR "Unable to find shared_ptr.") -endif() - -add_definitions(-DGOOGLE_GLOG_DLL_DECL=) -add_definitions(-DGFLAGS_DLL_DEFINE_FLAG=) -add_definitions(-DGFLAGS_DLL_DECLARE_FLAG=) -add_definitions(-DGFLAGS_DLL_DECL=) - -add_subdirectory(third_party) +add_definitions(\${GFLAGS_DEFINES}) +add_definitions(\${GLOG_DEFINES}) +add_definitions(\${CERES_DEFINES}) if(WITH_LIBMV) list(APPEND INC - ../gflags + ../gflags/src ../glog/src third_party/ceres/include third_party/ceres/config diff --git a/extern/libmv/third_party/CMakeLists.txt b/extern/libmv/third_party/CMakeLists.txt deleted file mode 100644 index e54d5fbc5cf..00000000000 --- a/extern/libmv/third_party/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# The Original Code is Copyright (C) 2016, Blender Foundation -# All rights reserved. -# -# Contributor(s): Sergey Sharybin. -# -# ***** END GPL LICENSE BLOCK ***** - -if(WITH_LIBMV) - add_subdirectory(ceres) -endif()