Merge pull request #871 from alicevision/dev/cleanupBundlePano

[sfm] Remove useless ordering for panorama
alicevision · Sep 4, 2020 · 3a81e4d · 3a81e4d
2 parents 835f6ee + cfac9e2
commit 3a81e4d
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 11 deletions.
diff --git a/src/aliceVision/sfm/BundleAdjustmentPanoramaCeres.cpp b/src/aliceVision/sfm/BundleAdjustmentPanoramaCeres.cpp
@@ -394,14 +394,6 @@ void BundleAdjustmentPanoramaCeres::setSolverOptions(ceres::Solver::Options& sol
 #if CERES_VERSION_MAJOR < 2
   solverOptions.num_linear_solver_threads = _ceresOptions.nbThreads;
 #endif
-
-  if(_ceresOptions.useParametersOrdering)
-  {
-    solverOptions.linear_solver_ordering.reset(new ceres::ParameterBlockOrdering);
-
-    // copy ParameterBlockOrdering
-    *(solverOptions.linear_solver_ordering) = _ceresOptions.linearSolverOrdering;
-  }
 }
 
 void BundleAdjustmentPanoramaCeres::addExtrinsicsToProblem(const sfmData::SfMData& sfmData, BundleAdjustment::ERefineOptions refineOptions, ceres::Problem& problem)

diff --git a/src/aliceVision/sfm/BundleAdjustmentPanoramaCeres.hpp b/src/aliceVision/sfm/BundleAdjustmentPanoramaCeres.hpp
@@ -47,9 +47,7 @@ class BundleAdjustmentPanoramaCeres : public BundleAdjustment
     ceres::LinearSolverType linearSolverType;
     ceres::PreconditionerType preconditionerType;
     ceres::SparseLinearAlgebraLibraryType sparseLinearAlgebraLibraryType;
-    ceres::ParameterBlockOrdering linearSolverOrdering;
     unsigned int nbThreads;
-    bool useParametersOrdering = true;
     bool summary = false;
     bool verbose = true;
   };

diff --git a/src/aliceVision/sfm/pipeline/panorama/ReconstructionEngine_panorama.cpp b/src/aliceVision/sfm/pipeline/panorama/ReconstructionEngine_panorama.cpp
@@ -396,7 +396,6 @@ bool ReconstructionEngine_panorama::Compute_Global_Rotations(const rotationAvera
 bool ReconstructionEngine_panorama::Adjust()
 {
   BundleAdjustmentPanoramaCeres::CeresOptions options;
-  options.useParametersOrdering = false;
   options.summary = true;
 
   // Start bundle with rotation only