Blender Git Commit Log

Git Commits -> Revision 5b7cad3

Revision 5b7cad3 by Sergey Sharybin (master)
May 9, 2012, 15:39 (GMT)
Initial Ceres integration into Blender

Currently only put sources of Ceres library into extern/libmv/third_party and
setup CMake and SCons building systems.

Integration details:

- Even CMake build files are not re-used from Ceres's trunk: they're using some
automatic stuff detection like glog, pthreads, protobuf and so and it's not
so clear how to re-use that files without modifications.
And IMO it's easier if build files are getting re-generated automatically to
match Blender-specific setup rather than keeping changes made locally in
Blender in sync when re-bundling Ceres library. Especially in case when it's
alerady needed to support SCons build system.
- Integrated only actual sources, all tests were stripped. Probably it'll be nice
to have them, but they'll need clear integration with current module test stuff
in Blender.
Hopefully integration went smooth.
- Suitesparse was disabled. It'll help a lot having it, but there are some difficulties
making cholmod working fine on windows. Would be added in future
- collections_port.cc was also stripped. It's not used by Ceres's upstream and
it gives compilation error (undefined uint32 -- looks like namespace issue).
- Currently all schur eliminators are included. Not sure if it makes sense,
also not sure if it makes sense having them switchable on and off -- IMO better
to have single configuration which works and does not require special tweaks
after everything was set up.
- Personally i'd say if some of Ceres modules are not used better to drop it
away -- all symbols would be stripped anyway, but it'll be waste of compilation
time which is annoying in cases when one doing, say, binary search of revision
at which some regression was introduced. Especially when it's easy to add modules
which should be used by Blender.
But as long as it stays in Tomato i'm not worrying much about this.

To bundle updated version of Ceres:

- You'll need to use GIT-SVN checkout,
Re-bundling Ceres using SVN is still NOT supported!
- Go to extern/libmv/third_party/ceres folder
- Run ./bundle.sh

This will checkout fresh Ceres snapshot of Windows branch (which is currently
most interesting from integration into Blender POV), apply all patches listed
in patches/series and copy needed files into Blender's working copy. This will
also re-generate CMake/SCons build rules.

If you'll need extra files from Ceres repository which are not present in
Blender, you'll need to copy them manually and then run ./mkfiles.sh from
extern/libmv/third_party/ceres folder which will update list of files used
by Blender.

Thanks all Ceres developers for this library and thanks to Keir Mierle with
help integrating Ceres into Blender!

Commit Details:

Full Hash: 5b7cad343e7e5cd09a9dbc6fb973d04c9d11ba3e
SVN Revision: 46470
Parent Commit: dfad263
Lines Changed: +25035, -37

161 Added Paths:

/extern/libmv/third_party/ceres/bundle.sh (+183, -0) (View)
/extern/libmv/third_party/ceres/ChangeLog (+227, -0)
/extern/libmv/third_party/ceres/CMakeLists.txt (+218, -0) (View)
/extern/libmv/third_party/ceres/files.txt (+150, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h (+170, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/ceres.h (+48, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/conditioned_cost_function.h (+97, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/cost_function.h (+127, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h (+374, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/internal/eigen.h (+80, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h (+193, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/internal/macros.h (+154, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/internal/manual_constructor.h (+214, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/internal/port.h (+44, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/internal/scoped_ptr.h (+311, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/iteration_callback.h (+159, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/jet.h (+671, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/local_parameterization.h (+189, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/loss_function.h (+322, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/normal_prior.h (+75, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h (+283, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/problem.h (+265, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/rotation.h (+526, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h (+82, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/solver.h (+379, -0) (View)
/extern/libmv/third_party/ceres/include/ceres/types.h (+224, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.cc (+73, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.h (+67, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.cc (+209, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.h (+127, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc (+136, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h (+84, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc (+83, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h (+98, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.cc (+40, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.h (+132, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc (+158, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h (+109, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc (+263, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h (+142, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_structure.cc (+92, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/block_structure.h (+105, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc (+238, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.h (+133, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/casts.h (+108, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/cgnr_linear_operator.h (+120, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc (+80, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h (+66, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/collections_port.h (+141, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.cc (+201, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.h (+75, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc (+325, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h (+129, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/conditioned_cost_function.cc (+130, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.cc (+233, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.h (+74, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/corrector.cc (+125, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/corrector.h (+88, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/dense_jacobian_writer.h (+110, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc (+93, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h (+99, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc (+184, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h (+115, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/detect_structure.cc (+114, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/detect_structure.h (+63, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/evaluator.cc (+71, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/evaluator.h (+129, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/file.cc (+93, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/file.h (+52, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc (+53, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.cc (+308, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.h (+85, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/graph.h (+138, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h (+270, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc (+237, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h (+176, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/integral_types.h (+92, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc (+150, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h (+94, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.cc (+620, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.h (+65, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc (+574, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h (+77, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/linear_operator.cc (+40, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/linear_operator.h (+59, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/linear_solver.cc (+87, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h (+291, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/local_parameterization.cc (+140, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/loss_function.cc (+93, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/map_util.h (+129, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/matrix_proto.h (+40, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/minimizer.h (+102, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/mutex.h (+312, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/normal_prior.cc (+67, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/parameter_block.h (+256, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc (+315, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.h (+121, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/problem.cc (+149, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc (+359, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h (+127, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/program.cc (+233, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/program.h (+128, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h (+279, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/random.h (+47, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc (+212, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/residual_block.h (+124, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc (+185, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.h (+89, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.cc (+218, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.h (+87, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc (+285, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h (+182, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc (+141, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h (+339, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h (+702, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.cc (+113, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.h (+74, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.cc (+78, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.h (+69, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/solver.cc (+230, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc (+693, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h (+111, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.cc (+40, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h (+108, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc (+129, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h (+77, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/split.cc (+115, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/stl_util.h (+75, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc (+126, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/stringprintf.h (+89, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc (+193, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h (+159, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc (+299, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h (+136, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/types.cc (+98, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/visibility.cc (+150, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/visibility.h (+77, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc (+611, -0) (View)
/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h (+273, -0) (View)
/extern/libmv/third_party/ceres/LICENSE (+27, -0)
/extern/libmv/third_party/ceres/mkfiles.sh (+4, -0) (View)
/extern/libmv/third_party/ceres/patches/series (+1, -0)
/extern/libmv/third_party/ceres/README (+3, -0)
/extern/libmv/third_party/ceres/SConscript (+34, -0) (View)
/extern/libmv/third_party/CMakeLists.txt (+2, -0) (View)
/extern/libmv/third_party/SConscript (+3, -0) (View)

9 Modified Paths:

/extern/libmv/bundle.sh (+10, -5) (Diff)
/extern/libmv/ChangeLog (+51, -30) (Diff)
/extern/libmv/CMakeLists.txt (+3, -0) (Diff)
/extern/libmv/libmv/image/convolve.cc (+14, -0) (Diff)
/extern/libmv/libmv/image/convolve.h (+10, -0) (Diff)
/extern/libmv/mkfiles.sh (+1, -1) (Diff)
/extern/libmv/SConscript (+3, -1) (Diff)
/source/blenderplayer/CMakeLists.txt (+1, -0) (Diff)
/source/creator/CMakeLists.txt (+1, -0) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021