[Bf-blender-cvs] [72ac596] master: Update Ceres to latest upstream version
Sergey Sharybin
noreply at git.blender.org
Fri Jun 27 10:08:47 CEST 2014
Commit: 72ac596e19ddb37636e107635b52ee78888460e7
Author: Sergey Sharybin
Date: Fri May 2 05:52:56 2014 +0600
https://developer.blender.org/rB72ac596e19ddb37636e107635b52ee78888460e7
Update Ceres to latest upstream version
Brings new bounds limiting and also prepares build system
for the changes in the upstream.
Namely shared_ptr header and namespace is now being detected
by a build system rather than by hacks in the code.
This commit includes some changes to auto-detection flags
in SCons, presumably adding more consistency there. This
is main changes which are suppoed to be reviewed here.
Reviewers: campbellbarton
Differential Revision: https://developer.blender.org/D581
===================================================================
M SConstruct
M build_files/cmake/macros.cmake
A build_files/scons/Modules/FindPython.py
A build_files/scons/Modules/FindSharedPtr.py
A build_files/scons/Modules/FindUnorderedMap.py
A build_files/scons/Modules/__init__.py
D build_files/scons/config/Modules/FindPython.py
D build_files/scons/config/Modules/__init__.py
M build_files/scons/config/linux-config.py
D build_files/scons/tools/unordered_map.py
M extern/libmv/CMakeLists.txt
M extern/libmv/SConscript
M extern/libmv/bundle.sh
M extern/libmv/third_party/ceres/CMakeLists.txt
M extern/libmv/third_party/ceres/ChangeLog
M extern/libmv/third_party/ceres/SConscript
M extern/libmv/third_party/ceres/bundle.sh
A extern/libmv/third_party/ceres/config/ceres/internal/config.h
M extern/libmv/third_party/ceres/files.txt
M extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h
M extern/libmv/third_party/ceres/include/ceres/c_api.h
M extern/libmv/third_party/ceres/include/ceres/ceres.h
M extern/libmv/third_party/ceres/include/ceres/conditioned_cost_function.h
M extern/libmv/third_party/ceres/include/ceres/cost_function.h
M extern/libmv/third_party/ceres/include/ceres/covariance.h
M extern/libmv/third_party/ceres/include/ceres/crs_matrix.h
M extern/libmv/third_party/ceres/include/ceres/fpclassify.h
M extern/libmv/third_party/ceres/include/ceres/internal/port.h
M extern/libmv/third_party/ceres/include/ceres/iteration_callback.h
M extern/libmv/third_party/ceres/include/ceres/jet.h
M extern/libmv/third_party/ceres/include/ceres/local_parameterization.h
M extern/libmv/third_party/ceres/include/ceres/loss_function.h
M extern/libmv/third_party/ceres/include/ceres/normal_prior.h
M extern/libmv/third_party/ceres/include/ceres/problem.h
M extern/libmv/third_party/ceres/include/ceres/solver.h
M extern/libmv/third_party/ceres/include/ceres/types.h
A extern/libmv/third_party/ceres/internal/ceres/CMakeLists.txt
M extern/libmv/third_party/ceres/internal/ceres/array_utils.cc
M extern/libmv/third_party/ceres/internal/ceres/array_utils.h
M extern/libmv/third_party/ceres/internal/ceres/blas.cc
D extern/libmv/third_party/ceres/internal/ceres/block_random_access_crs_matrix.cc
D extern/libmv/third_party/ceres/internal/ceres/block_random_access_crs_matrix.h
M extern/libmv/third_party/ceres/internal/ceres/block_structure.cc
M extern/libmv/third_party/ceres/internal/ceres/block_structure.h
M extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc
M extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.h
M extern/libmv/third_party/ceres/internal/ceres/collections_port.h
M extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.cc
M extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.h
M extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc
M extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h
M extern/libmv/third_party/ceres/internal/ceres/cxsparse.cc
M extern/libmv/third_party/ceres/internal/ceres/cxsparse.h
A extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_finalizer.h
A extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.cc
A extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.h
A extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.cc
A extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.h
M extern/libmv/third_party/ceres/internal/ceres/evaluator.cc
M extern/libmv/third_party/ceres/internal/ceres/evaluator.h
M extern/libmv/third_party/ceres/internal/ceres/generate_eliminator_specialization.py
M extern/libmv/third_party/ceres/internal/ceres/generate_partitioned_matrix_view_specializations.py
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_2.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_3.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_4.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_d.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_3.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_4.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_9.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_d.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_3.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_4.cc
A extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_8.cc
A extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_9.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_d.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_d_d.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_2.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_3.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_4.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_d.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_d_d_d.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc
A extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_8.cc
A extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_9.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_d_d.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc
M extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc
M extern/libmv/third_party/ceres/internal/ceres/integral_types.h
M extern/libmv/third_party/ceres/internal/ceres/line_search.cc
M extern/libmv/third_party/ceres/internal/ceres/line_search.h
M extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc
M extern/libmv/third_party/ceres/internal/ceres/line_search_direction.h
M extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc
M extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.h
M extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
M extern/libmv/third_party/ceres/internal/ceres/minimizer.cc
M extern/libmv/third_party/ceres/internal/ceres/minimizer.h
M extern/libmv/third_party/ceres/internal/ceres/mutex.h
M extern/libmv/third_party/ceres/internal/ceres/parameter_block.h
M extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc
M extern/libmv/third_party/ceres/internal/ceres/problem.cc
M extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
M extern/libmv/third_party/ceres/internal/ceres/problem_impl.h
M extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h
M extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc
M extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
M extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc
M extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h
M extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.cc
M extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.h
M extern/libmv/third_party/ceres/internal/ceres/small_blas.h
M extern/libmv/third_party/ceres/internal/ceres/solver.cc
M extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
M extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
M extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
M extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
M extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc
M extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
M extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
M extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.cc
M extern/libmv/third_party/ceres/internal/ceres/visibility.cc
M extern/libmv/third_party/ceres/internal/ceres/visibility.h
M extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
M extern/libmv/third_party/ceres/mkfiles.sh
===================================================================
diff --git a/SConstruct b/SConstruct
index 0c85fe1..bdb9b3a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -40,11 +40,13 @@ import string
import shutil
import re
-# store path to tools
+# store path to tools and modules
toolpath=os.path.join(".", "build_files", "scons", "tools")
+modulespath=os.path.join(".", "build_files", "scons", "Modules")
-# needed for importing tools
+# needed for importing tools and modules
sys.path.append(toolpath)
+sys.path.append(modulespath)
import Blender
import btools
@@ -176,6 +178,16 @@ if crossbuild and platform not in ('win32-vc', 'win64-vc'):
env['OURPLATFORM'] = platform
+# Put all auto configuration run-time tests here
+
+from FindSharedPtr import FindSharedPtr
+from FindUnorderedMap import FindUnorderedMap
+
+conf = Configure(env)
+FindSharedPtr(conf)
+FindUnorderedMap(conf)
+env = conf.Finish()
+
configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
if os.path.exists(configfile):
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index c6caef4..bfd1cf6 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -791,6 +791,78 @@ macro(TEST_UNORDERED_MAP_SUPPORT)
endif()
endmacro()
+macro(TEST_SHARED_PTR_SUPPORT)
+ # This check are coming from Ceres library.
+ #
+ # Find shared pointer header and namespace.
+ #
+ # This module defines the following variables:
+ #
+ # SHARED_PTR_FOUND: TRUE if shared_ptr found.
+ # SHARED_PTR_TR1_MEMORY_HEADER: True if <tr1/memory> header is to be used
+ # for the shared_ptr object, otherwise use <memory>.
+ # SHARED_PTR_TR1_NAMESPACE: TRUE if shared_ptr is defined in std::tr1 namespace,
+ # otherwise it's assumed to be defined in std namespace.
+
+ include(CheckIncludeFileCXX)
+ set(SHARED_PTR_FOUND FALSE)
+ CHECK_INCLUDE_FILE_CXX(memory HAVE_STD_MEMORY_HEADER)
+ if(HAVE_STD_MEMORY_HEADER)
+ # Finding the memory header doesn't mean that shared_ptr is in std
+ # namespace.
+ #
+ # In particular, MSVC 2008 has shared_ptr declared in std::tr1. In
+ # order to support this, we do an extra check to see which namespace
+ # should be used.
+ include(CheckCXXSourceCompiles)
+ CHECK_CXX_SOURCE_COMPILES("#include <memory>
+ int main() {
+ std::shared_ptr<int> int_ptr;
+ return 0;
+ }"
+ HAVE_SHARED_PTR_IN_STD_NAMESPACE)
+
+ if(HAVE_SHARED_PTR_IN_STD_NAMESPACE)
+ message("-- Found shared_ptr in std namespace using <memory> header.")
+ set(SHARED_PTR_FOUND TRUE)
+ else()
+ CHECK_CXX_SOURCE_COMPILES("#include <memory>
+ int main() {
+ std::tr1::shared_ptr<int> int_ptr;
+ return 0;
+ }"
+ HAVE_SHARED_PTR_IN_TR1_NAMESPACE)
+ if(HAVE_SHARED_PTR_IN_TR1_NAMESPACE)
+ message("-- Found shared_ptr in std::tr1 namespace using <memory> header.")
+ set(SHARED_PTR_TR1_NAMESPACE TRUE)
+ set(SHARED_PTR_FOUND TRUE)
+ endif()
+ endif()
+ endif()
+
+ if(NOT SHARED_PTR_FOUND)
+ # Further, gcc defines shared_ptr in std::tr1 namespace and
+ # <tr1/memory> is to be included for this. And what makes things
+ # even more tricky is that gcc does have <memory> header, so
+ # all the checks above wouldn't find shared_ptr.
+ CHECK_INCLUDE_FILE_CXX("tr1/memory" HAVE_TR1_MEMORY_HEADER)
+ if(HAVE_TR1_MEMORY_HEADER)
+ CHECK_CXX_SOURCE_COMPILES("#include <tr1/memory>
+ int main() {
+ std::tr1::shared_ptr<int> int_ptr;
+ return 0;
+ }"
+ HAVE_SHARED_PTR_IN_TR1_NAMESPACE_FROM_TR1_MEMORY_HEADER)
+ if(HAVE_SHARED_PTR_IN_TR1_NAMESPACE_FROM_TR1_MEMORY_HEADER)
+ message("-- Found shared_ptr in std::tr1 namespace using <tr1/memory> header.")
+ set(SHARED_PTR_TR1_MEMORY_HEADER TRUE)
+ set(SHARED_PTR_TR1_NAMESPACE TRUE)
+ set(SHARED_PTR_FOUND TRUE)
+ endif()
+ endif()
+ endif()
+endmacro()
+
# when we have warnings as errors applied globally this
# needs to be removed for some external libs which we dont maintain.
diff --git a/build_files/scons/config/Modules/FindPython.py b/build_files/scons/Modules/FindPython.py
similarity index 100%
rename from build_files/scons/config/Modules/FindPython.py
rename to build_files/scons/Modules/FindPython.py
diff --git a/build_files/scons/Modules/FindSharedPtr.py b/build_files/scons/Modules/FindSharedPtr.py
new file mode 100644
index 0000000..848431f
--- /dev/null
+++ b/build_files/scons/Modules/FindSharedPtr.py
@@ -0,0 +1,42 @@
+def FindSharedPtr(conf):
+ """
+ Detect shared_ptr availability
+ """
+
+ found = False
+ namespace = None
+ header = None
+
+ if conf.CheckCXXHeader("memory"):
+ # Finding the memory header doesn't mean that shared_ptr is in std
+ # namespace.
+ #
+ # In particular, MSVC 2008 has shared_ptr declared in std::tr1. In
+ # order to support this, we do an extra check to see which namespace
+ # should be used.
+
+ if conf.CheckType('std::shared_ptr<int>', language = 'CXX', includes="#include <memory>"):
+ print("-- Found shared_ptr in std namespace using <memory> header.")
+ namespace = 'std'
+ header = 'memory'
+ elif conf.CheckType('std::tr1::shared_ptr<int>', language = 'CXX', includes="#include <memory>"):
+ print("-- Found shared_ptr in std::tr1 namespace using <memory> header..")
+ namespace = 'std::tr1'
+ header = 'memory'
+
+ if not namespace and conf.CheckCXXHeader("tr1/memory"):
+ # Further, gcc defines shared_ptr in std::tr1 namespace and
+ # <tr1/memory> is to be included for this. And what makes things
+ # even more tricky is that gcc does have <memory> header, so
+ # all the checks above wouldn't find shared_ptr.
+ if conf.CheckType('std::tr1::shared_ptr<int>', language = 'CXX', includes="#include <tr1/memory>"):
+ print("-- Found shared_ptr in std::tr1 namespace using <tr1/memory> header..")
+ namespace = 'std::tr1'
+ header = 'tr1/memory'
+
+ if not namespace:
+ print("-- Unable to find shared_ptrred_map>.")
+
+ conf.env['WITH_SHARED_PTR_SUPPORT'] = namespace and header
+ conf.env['SHARED_PTR_NAMESPACE'] = namespace
+ conf.env['SHARED_PTR_HEADER'] = header
diff --git a/build_files/scons/tools/unordered_map.py b/build_files/scons/Modules/FindUnorderedMap.py
similarity index 73%
rename from build_files/scons/tools/unordered_map.py
rename to build_files/scons/Modules/FindUnorderedMap.py
index d314a77..34073c1 100644
--- a/build_files/scons/tools/unordered_map.py
+++ b/build_files/scons/Modules/FindUnorderedMap.py
@@ -1,10 +1,11 @@
-def test_unordered_map(conf):
+def FindUnorderedMap(conf):
"""
Detect unordered_map availability
-
- Returns (True/False, namespace, include prefix)
"""
+ namespace = None
+ header = None
+
if conf.CheckCXXHeader("unordered_map"):
# Even so we've found unordered_map header file it doesn't
# mean unordered_map and unordered_set will be declared in
@@ -17,16 +18,21 @@ def test_unordered_map(conf):
if conf.CheckType('std::unordered_map<int, int>', language = 'CXX', includes="#include <unordered_map>"):
print("-- Found unordered_map/set in std namespace.")
- return True, 'std', ''
+ namespace = 'std'
+ header = 'unordered_map'
elif conf.CheckType('std::tr1::unordered_map<int, int>', language = 'CXX', includes="#include <unordered_map>"):
print("-- Found unordered_map/set in std::tr1 namespace.")
- return True, 'std::tr1', ''
+ namespace = 'std::tr1'
+ header = 'unordered_map'
else:
print("-- Found <unordered_map> but can not find neither std::unordered_map nor std::tr1::unordered_map.")
- return False, '', ''
elif conf.CheckCXXHeader("tr1/unordered_map"):
print("-- Found unordered_map/set in std::tr1 namespace.")
- return True, 'std::tr1', 'tr1/'
+ namespace = 'std::tr1'
+ header = 'tr1/unordered_map'
else:
print("-- Unable to find <unordered_map> or <tr1/unordered_map>. ")
- return False, '', ''
+
+ conf.env['WITH_UNORDERED_MAP_SUPPORT'] = namespace and header
+ conf.env['UNORDERED_MAP_NAMESPACE'] = namespace
+ conf.env['UNORDERED_MAP_HEADER'] = header
diff --git a/build_files/scons/config/Modules/__init__.py b/build_files/scons/Modules/__init__.py
similarity index 100%
rename from build_files/scons/config/Modules/__init__.py
rename to build_files/scons/Modules/__init__.py
diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py
index 8f2c5ca..0c76aec 100644
--- a/build_files/scons/config/linux-config.py
+++ b/build_files/scons/config/linux-config.py
@@ -1,4 +1,4 @@
-from Modules.FindPython import FindPython
+from FindPython import FindPython
py = FindPython()
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index e1595ce..5388570 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -46,10 +46,23 @@ if(WITH_LIBMV)
-DLIBMV_NO_FAST_DETECTOR=
)
+ 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()
+
list(APPEND INC
third_party/gflags
third_party/glog/src
third_party/ceres/include
+ third_party/ceres/config
../../intern/guardedalloc
)
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript
index a267c96..6156dd4 100644
--- a/extern/libmv/SConscript
+++ b/extern/libmv/SConscript
@@ -6,6 +6,7 @@
import sys
import os
+from FindSharedPtr import FindSharedPtr
Import('env')
@@ -13,6 +14,15 @@ defs
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list