Merge branch '895-suppression-pipelines' into 'master'

895 - Suppression des pipelines de CARS Closes #895 See merge request 3d/cars-park/cars!752
CNES · Oct 24, 2024 · 058cd61 · 058cd61
2 parents f356138 + 05d40c5
commit 058cd61
Show file tree

Hide file tree

Showing 30 changed files with 3,604 additions and 4,378 deletions.
diff --git a/cars/cars.py b/cars/cars.py
@@ -110,9 +110,24 @@ def main_cli(args, dry_run=False):  # noqa: C901
             del config["output"]["out_dir"]
 
         config_json_dir = os.path.abspath(os.path.dirname(args.conf))
-        pipeline_name = config.get(
-            "pipeline", "sensors_to_dense_dsm_no_merging"
-        )
+        pipeline_name = config.get("pipeline", "default")
+        old_pipelines = [
+            "sensors_to_dense_dsm",
+            "sensors_to_dense_dsm_no_merging",
+            "sensors_to_dense_depth_maps",
+            "sensors_to_dense_point_clouds",
+            "dense_point_clouds_to_dense_dsm",
+            "dense_point_clouds_to_dense_dsm_no_merging",
+        ]
+        if pipeline_name in old_pipelines:
+            warnings.warn(
+                f"The 'pipeline' value {pipeline_name} corresponds to"
+                " an old pipeline."
+                "Using the default CARS pipeline instead.",
+                FutureWarning,
+                stacklevel=2,
+            )
+            pipeline_name = "default"
 
         # Logging configuration with args Loglevel
         loglevel = getattr(args, "loglevel", "PROGRESS").upper()

diff --git a/cars/orchestrator/orchestrator.py b/cars/orchestrator/orchestrator.py
@@ -526,6 +526,10 @@ def reset_registries(self):
         """
         Reset registries
         """
+
+        # cleanup the current registry before replacing it, to save files
+        self.cars_ds_savers_registry.cleanup()
+
         # reset registries
         # CarsDataset savers registry
         self.cars_ds_savers_registry = saver_registry.CarsDatasetsRegistrySaver(

diff --git a/cars/pipelines/__init__.py b/cars/pipelines/__init__.py
@@ -23,6 +23,4 @@
 """
 
 # Imports needed in order to register pipeline for Pipeline factory
-from . import depth_maps_to_dsm  # noqa: F401
-from . import sensor_to_dense_dsm  # noqa: F401
-from . import sensor_to_sparse_dsm  # noqa: F401
+from . import default  # noqa: F401
diff --git a/cars/pipelines/conf_pipeline/depth_maps_to_dsm.json b/cars/pipelines/conf_pipeline/depth_maps_to_dsm.json
diff --git a/cars/pipelines/conf_pipeline/sensor_to_dense_dsm.json b/cars/pipelines/conf_pipeline/sensor_to_dense_dsm.json
diff --git a/cars/pipelines/conf_pipeline/sensor_to_pc.json b/cars/pipelines/conf_pipeline/sensor_to_pc.json
diff --git a/cars/pipelines/conf_pipeline/sensor_to_sparse_dsm.json b/cars/pipelines/conf_pipeline/sensor_to_sparse_dsm.json
diff --git a/cars/pipelines/conf_pipeline/__init__.py → cars/pipelines/default/__init__.py b/cars/pipelines/conf_pipeline/__init__.py → cars/pipelines/default/__init__.py
@@ -19,5 +19,8 @@
 # limitations under the License.
 #
 """
-CARS pipeline configuration init file
+CARS default pipeline module init file
 """
+
+# Cars imports
+from cars.pipelines.default import default_pipeline  # noqa: F401