[Bf-blender-cvs] [bb53c28] master: Ceres: Remove suitesparse related files

Sergey Sharybin noreply at git.blender.org
Mon Dec 28 14:23:37 CET 2015 

Commit: bb53c28704d279897f1ca8f3ee8061d07a1dd751
Author: Sergey Sharybin
Date:   Sun Dec 27 00:26:57 2015 +0500
Branches: master
https://developer.blender.org/rBbb53c28704d279897f1ca8f3ee8061d07a1dd751

Ceres: Remove suitesparse related files

It's quite small chance we'll be supporting suitesparse for Blender due to all
the complexity of 3rd party libraries, so removing implementation files which
are only needed when suitesparse is enabled.

===================================================================

M	extern/libmv/third_party/ceres/CMakeLists.txt
M	extern/libmv/third_party/ceres/files.txt
D	extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc
D	extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.h
D	extern/libmv/third_party/ceres/internal/ceres/cxsparse.cc
D	extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.cc
D	extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.h
D	extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
D	extern/libmv/third_party/ceres/internal/ceres/visibility.cc
D	extern/libmv/third_party/ceres/internal/ceres/visibility.h
D	extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc

===================================================================

diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt
index f9a7d06..cc72faa 100644
--- a/extern/libmv/third_party/ceres/CMakeLists.txt
+++ b/extern/libmv/third_party/ceres/CMakeLists.txt
@@ -52,7 +52,6 @@ set(SRC
 	internal/ceres/block_sparse_matrix.cc
 	internal/ceres/block_structure.cc
 	internal/ceres/callbacks.cc
-	internal/ceres/canonical_views_clustering.cc
 	internal/ceres/c_api.cc
 	internal/ceres/cgnr_solver.cc
 	internal/ceres/compressed_col_sparse_matrix_utils.cc
@@ -64,7 +63,6 @@ set(SRC
 	internal/ceres/corrector.cc
 	internal/ceres/covariance.cc
 	internal/ceres/covariance_impl.cc
-	internal/ceres/cxsparse.cc
 	internal/ceres/dense_normal_cholesky_solver.cc
 	internal/ceres/dense_qr_solver.cc
 	internal/ceres/dense_sparse_matrix.cc
@@ -110,21 +108,17 @@ set(SRC
 	internal/ceres/schur_eliminator.cc
 	internal/ceres/schur_jacobi_preconditioner.cc
 	internal/ceres/scratch_evaluate_preparer.cc
-	internal/ceres/single_linkage_clustering.cc
 	internal/ceres/solver.cc
 	internal/ceres/solver_utils.cc
 	internal/ceres/sparse_matrix.cc
 	internal/ceres/sparse_normal_cholesky_solver.cc
 	internal/ceres/split.cc
 	internal/ceres/stringprintf.cc
-	internal/ceres/suitesparse.cc
 	internal/ceres/triplet_sparse_matrix.cc
 	internal/ceres/trust_region_minimizer.cc
 	internal/ceres/trust_region_preprocessor.cc
 	internal/ceres/trust_region_strategy.cc
 	internal/ceres/types.cc
-	internal/ceres/visibility_based_preconditioner.cc
-	internal/ceres/visibility.cc
 	internal/ceres/wall_time.cc
 
 	include/ceres/autodiff_cost_function.h
@@ -178,7 +172,6 @@ set(SRC
 	internal/ceres/block_sparse_matrix.h
 	internal/ceres/block_structure.h
 	internal/ceres/callbacks.h
-	internal/ceres/canonical_views_clustering.h
 	internal/ceres/casts.h
 	internal/ceres/cgnr_linear_operator.h
 	internal/ceres/cgnr_solver.h
@@ -242,7 +235,6 @@ set(SRC
 	internal/ceres/schur_eliminator_impl.h
 	internal/ceres/schur_jacobi_preconditioner.h
 	internal/ceres/scratch_evaluate_preparer.h
-	internal/ceres/single_linkage_clustering.h
 	internal/ceres/small_blas.h
 	internal/ceres/solver_utils.h
 	internal/ceres/sparse_matrix.h
@@ -256,7 +248,6 @@ set(SRC
 	internal/ceres/trust_region_preprocessor.h
 	internal/ceres/trust_region_strategy.h
 	internal/ceres/visibility_based_preconditioner.h
-	internal/ceres/visibility.h
 	internal/ceres/wall_time.h
 )
 
diff --git a/extern/libmv/third_party/ceres/files.txt b/extern/libmv/third_party/ceres/files.txt
index 976200b..f49f1fb 100644
--- a/extern/libmv/third_party/ceres/files.txt
+++ b/extern/libmv/third_party/ceres/files.txt
@@ -8,6 +8,7 @@ include/ceres/cost_function_to_functor.h
 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
@@ -30,6 +31,7 @@ include/ceres/local_parameterization.h
 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
@@ -61,8 +63,6 @@ internal/ceres/block_structure.cc
 internal/ceres/block_structure.h
 internal/ceres/callbacks.cc
 internal/ceres/callbacks.h
-internal/ceres/canonical_views_clustering.cc
-internal/ceres/canonical_views_clustering.h
 internal/ceres/c_api.cc
 internal/ceres/casts.h
 internal/ceres/cgnr_linear_operator.h
@@ -85,7 +85,6 @@ internal/ceres/corrector.h
 internal/ceres/covariance.cc
 internal/ceres/covariance_impl.cc
 internal/ceres/covariance_impl.h
-internal/ceres/cxsparse.cc
 internal/ceres/cxsparse.h
 internal/ceres/dense_jacobian_writer.h
 internal/ceres/dense_normal_cholesky_solver.cc
@@ -114,6 +113,7 @@ internal/ceres/generated/partitioned_matrix_view_2_2_4.cc
 internal/ceres/generated/partitioned_matrix_view_2_2_d.cc
 internal/ceres/generated/partitioned_matrix_view_2_3_3.cc
 internal/ceres/generated/partitioned_matrix_view_2_3_4.cc
+internal/ceres/generated/partitioned_matrix_view_2_3_6.cc
 internal/ceres/generated/partitioned_matrix_view_2_3_9.cc
 internal/ceres/generated/partitioned_matrix_view_2_3_d.cc
 internal/ceres/generated/partitioned_matrix_view_2_4_3.cc
@@ -133,6 +133,7 @@ internal/ceres/generated/schur_eliminator_2_2_4.cc
 internal/ceres/generated/schur_eliminator_2_2_d.cc
 internal/ceres/generated/schur_eliminator_2_3_3.cc
 internal/ceres/generated/schur_eliminator_2_3_4.cc
+internal/ceres/generated/schur_eliminator_2_3_6.cc
 internal/ceres/generated/schur_eliminator_2_3_9.cc
 internal/ceres/generated/schur_eliminator_2_3_d.cc
 internal/ceres/generated/schur_eliminator_2_4_3.cc
@@ -155,6 +156,7 @@ internal/ceres/gradient_problem_evaluator.h
 internal/ceres/gradient_problem_solver.cc
 internal/ceres/graph_algorithms.h
 internal/ceres/graph.h
+internal/ceres/householder_vector.h
 internal/ceres/implicit_schur_complement.cc
 internal/ceres/implicit_schur_complement.h
 internal/ceres/integral_types.h
@@ -221,8 +223,6 @@ internal/ceres/schur_jacobi_preconditioner.cc
 internal/ceres/schur_jacobi_preconditioner.h
 internal/ceres/scratch_evaluate_preparer.cc
 internal/ceres/scratch_evaluate_preparer.h
-internal/ceres/single_linkage_clustering.cc
-internal/ceres/single_linkage_clustering.h
 internal/ceres/small_blas.h
 internal/ceres/solver.cc
 internal/ceres/solver_utils.cc
@@ -236,7 +236,6 @@ internal/ceres/split.h
 internal/ceres/stl_util.h
 internal/ceres/stringprintf.cc
 internal/ceres/stringprintf.h
-internal/ceres/suitesparse.cc
 internal/ceres/suitesparse.h
 internal/ceres/triplet_sparse_matrix.cc
 internal/ceres/triplet_sparse_matrix.h
@@ -247,10 +246,7 @@ internal/ceres/trust_region_preprocessor.h
 internal/ceres/trust_region_strategy.cc
 internal/ceres/trust_region_strategy.h
 internal/ceres/types.cc
-internal/ceres/visibility_based_preconditioner.cc
 internal/ceres/visibility_based_preconditioner.h
-internal/ceres/visibility.cc
-internal/ceres/visibility.h
 internal/ceres/wall_time.cc
 internal/ceres/wall_time.h
 config/ceres/internal/config.h
diff --git a/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc b/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc
deleted file mode 100644
index b655b1e..0000000
--- a/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc
+++ /dev/null
@@ -1,247 +0,0 @@
-// Ceres Solver - A fast non-linear least squares minimizer
-// Copyright 2015 Google Inc. All rights reserved.
-// http://ceres-solver.org/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice,
-//   this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-//   this list of conditions and the following disclaimer in the documentation
-//   and/or other materials provided with the distribution.
-// * Neither the name of Google Inc. nor the names of its contributors may be
-//   used to endorse or promote products derived from this software without
-//   specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: David Gallup (dgallup at google.com)
-//         Sameer Agarwal (sameeragarwal at google.com)
-
-// This include must come before any #ifndef check on Ceres compile options.
-#include "ceres/internal/port.h"
-
-#ifndef CERES_NO_SUITESPARSE
-
-#include "ceres/canonical_views_clustering.h"
-
-#include "ceres/collections_port.h"
-#include "ceres/graph.h"
-#include "ceres/internal/macros.h"
-#include "ceres/map_util.h"
-#include "glog/logging.h"
-
-namespace ceres {
-namespace internal {
-
-using std::vector;
-
-typedef HashMap<int, int> IntMap;
-typedef HashSet<int> IntSet;
-
-class CanonicalViewsClustering {
- public:
-  CanonicalViewsClustering() {}
-
-  // Compute the canonical views clustering of the vertices of the
-  // graph. centers will contain the vertices that are the identified
-  // as the canonical views/cluster centers, and membership is a map
-  // from vertices to cluster_ids. The i^th cluster center corresponds
-  // to the i^th cluster. It is possible depending on the
-  // configuration of the clustering algorithm that some of the
-  // vertices may not be assigned to any cluster. In this case they
-  // are assigned to a cluster with id = kInvalidClusterId.
-  void ComputeClustering(const CanonicalViewsClusteringOptions& options,
-                         const WeightedGraph<int>& graph,
-                         vector<int>* centers,
-                         IntMap* membership);
-
- private:
-  void FindValidViews(IntSet* valid_views) const;
-  double ComputeClusteringQualityDifference(const int candidate,
-                                            const vector<int>& centers) const;
-  void UpdateCanonicalViewAssignments(const int canonical_view);
-  void ComputeClusterMembership(const vector<int>& centers,
-                                IntMap* membership) const;
-
-  CanonicalViewsClusteringOptions options_;
-  const WeightedGraph<int>* graph_;
-  // Maps a view to its representative canonical view (its cluster
-  // center).
-  IntMap view_to_canonical_view_;
-  // Maps a view to its similarity to its current 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list