Fix camera pickling from the latest update. Restore parallelization f…

…or fitnmerge (#105)
cvg · Nov 29, 2024 · 09e4fca · 09e4fca
1 parent 6b5a6f0
commit 09e4fca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/cfgs/fitnmerge/default.yaml b/cfgs/fitnmerge/default.yaml
@@ -55,7 +55,7 @@ fitting:
     var2d: -1.0 # depends on the detector
     ransac_th: 0.75
     min_percentage_inliers: 0.9
-    n_jobs: 1
+    n_jobs: 4
 
 ##############################
 # merging config

diff --git a/limap/base/camera.cc b/limap/base/camera.cc
@@ -244,14 +244,12 @@ double Camera::uncertainty(double depth, double var2d) const {
 Camera::Camera(py::dict dict) {
   // model id
   int model_id_loaded;
-  ASSIGN_PYDICT_ITEM(dict, model_id_loaded, int);
+  ASSIGN_PYDICT_ITEM_TKEY(dict, model_id, model_id_loaded, int);
   model_id = static_cast<colmap::CameraModelId>(model_id_loaded);
 
   // params
-  std::vector<double> params_loaded;
-  ASSIGN_PYDICT_ITEM(dict, params_loaded, std::vector<double>);
-  THROW_CHECK_EQ(params_loaded.size(), params.size());
-  params = params_loaded;
+  ASSIGN_PYDICT_ITEM(dict, params, std::vector<double>);
+  THROW_CHECK(VerifyParams());
 
   // other fields
   ASSIGN_PYDICT_ITEM(dict, camera_id, int);

diff --git a/requirements.txt b/requirements.txt
@@ -26,6 +26,6 @@ ruff==0.6.7
 clang-format==19.1.0
 
 ./third-party/pytlsd
-./third-party/Hierarchical-Localization
 ./third-party/DeepLSD
 ./third-party/GlueStick
+-e ./third-party/Hierarchical-Localization