bundle_adjust: Use multiple-threads for non-ISIS sessions

zmoratto · Aug 25, 2014 · 408aae7 · 408aae7
1 parent f598447
commit 408aae7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -5,6 +5,13 @@
      disparities are computed from it to the other ones, and joint
      triangulation is performed.
 
+ - stereo
+   * Fix a crash in interest point matching for a planetoid flyby
+     testcase.
+
+ - bundle_adjust
+   * Use multiple-threads for non-ISIS sessions.
+
  - dem_geoid
    * Support the EGM2008 geoid. The geoid surface across all Earth
      is computed with an error of less than 1.5 cm compared to the

diff --git a/src/asp/Tools/bundle_adjust.cc b/src/asp/Tools/bundle_adjust.cc
@@ -283,7 +283,12 @@ void do_ba_ceres(ModelT & ba_model, Options const& opt ){
 
   options.max_num_iterations = opt.max_iterations;
   options.minimizer_progress_to_stdout = (opt.report_level >= vw::ba::ReportFile);
-  options.num_threads = 1; //FLAGS_num_threads;
+
+  if (opt.stereo_session_string == "isis")
+    options.num_threads = 1;
+  else
+    options.num_threads = opt.num_threads;
+
   options.linear_solver_type = ceres::SPARSE_SCHUR;
   //options.ordering_type = ceres::SCHUR;
   //options.eta = 1e-3; // FLAGS_eta;