cars 1.0.0a3__cp311-cp311-win_amd64.whl → 1.0.0a4__cp311-cp311-win_amd64.whl

cars/orchestrator/cluster/mp_cluster/multiprocessing_profiler.py

@@ -73,7 +73,7 @@ class MultiprocessingProfiler:  # pylint: disable=too-few-public-methods
     Used to profile memory in processes
     """
 
-    def __init__(
+    def __init__(  # pylint: disable=too-many-positional-arguments
         self, pool, out_dir, max_ram_per_worker, mp_dataframe=None, timer=None
     ):
         """
@@ -88,7 +88,7 @@ class MultiprocessingProfiler:  # pylint: disable=too-few-public-methods
         self.pool = pool
         self.out_dir = out_dir
         self.file_plot = os.path.join(
-            self.out_dir, "logs", "profiling", "memory_profiling.png"
+            self.out_dir, "profiling", "memory_profiling.png"
         )
         os.makedirs(os.path.dirname(self.file_plot), exist_ok=True)
         self.max_ram_per_worker = max_ram_per_worker

cars/orchestrator/cluster/pbs_dask_cluster.py

@@ -108,7 +108,7 @@ class PbsDaskCluster(abstract_dask_cluster.AbstractDaskCluster):
         logging.info("Dask cluster closed")
 
 
-def start_cluster(
+def start_cluster(  # pylint: disable=too-many-positional-arguments
     nb_workers,
     walltime,
     out_dir,

cars/orchestrator/cluster/sequential_cluster.py

@@ -37,7 +37,7 @@ class SequentialCluster(abstract_cluster.AbstractCluster):
     SequentialCluster
     """
 
-    def __init__(self, conf_cluster, out_dir, launch_worker=True):
+    def __init__(self, conf_cluster, out_dir, log_dir, launch_worker=True):
         """
         Init function of SequentialCluster
 
@@ -45,7 +45,9 @@ class SequentialCluster(abstract_cluster.AbstractCluster):
 
         """
         # call parent init
-        super().__init__(conf_cluster, out_dir, launch_worker=launch_worker)
+        super().__init__(
+            conf_cluster, out_dir, log_dir, launch_worker=launch_worker
+        )
 
         # retrieve parameters
         self.profiling = self.checked_conf_cluster["profiling"]
@@ -134,5 +136,4 @@ class SequentialCluster(abstract_cluster.AbstractCluster):
         :param future_list: future_list list
         """
 
-        for future in future_list:
-            yield future
+        yield from future_list

cars/orchestrator/cluster/slurm_dask_cluster.py

@@ -120,7 +120,7 @@ class SlurmDaskCluster(abstract_dask_cluster.AbstractDaskCluster):
         logging.info("Dask cluster closed")
 
 
-def start_cluster(
+def start_cluster(  # pylint: disable=too-many-positional-arguments
     nb_workers,
     walltime,
     out_dir,

cars/orchestrator/orchestrator.py

@@ -80,10 +80,11 @@ class Orchestrator:
     # pylint: disable=too-many-instance-attributes
 
     # flake8: noqa: C901
-    def __init__(
+    def __init__(  # pylint: disable=too-many-positional-arguments
         self,
         orchestrator_conf=None,
         out_dir=None,
+        log_dir=None,
         launch_worker=True,
         out_json_path=None,
     ):
@@ -105,6 +106,11 @@ class Orchestrator:
             self.add_to_clean(self.out_dir)
             logging.debug("No out_dir defined")
 
+        if log_dir is not None:
+            self.log_dir = log_dir
+        else:
+            self.log_dir = os.path.join(self.out_dir, "logs")
+
         self.launch_worker = launch_worker
 
         # overload orchestrator_conf
@@ -137,7 +143,10 @@ class Orchestrator:
 
         # init cluster
         self.cluster = AbstractCluster(  # pylint: disable=E0110
-            orchestrator_conf, self.out_dir, launch_worker=self.launch_worker
+            orchestrator_conf,
+            self.out_dir,
+            self.log_dir,
+            launch_worker=self.launch_worker,
         )
         self.conf = self.cluster.get_conf()
 
@@ -202,7 +211,8 @@ class Orchestrator:
 
         return self.conf
 
-    def add_to_save_lists(
+    @cars_profile(name="Add to save lists", interval=0.5)
+    def add_to_save_lists(  # pylint: disable=too-many-positional-arguments
         self,
         file_name,
         tag,
@@ -546,6 +556,7 @@ class Orchestrator:
         self.cluster = AbstractCluster(  # pylint: disable=E0110
             self.orchestrator_conf,
             self.out_dir,
+            self.log_dir,
             launch_worker=self.launch_worker,
             data_to_propagate=data_to_propagate,
         )

cars/orchestrator/registry/id_generator.py

@@ -72,6 +72,7 @@ class IdGenerator:
         # Check if dataset already registered
         registered = False
         allready_registered_id = None
+        returned_id = None
         for registry in self.registries:
             (
                 is_registered,

cars/orchestrator/registry/saver_registry.py

@@ -158,7 +158,7 @@ class CarsDatasetsRegistrySaver(AbstractCarsDatasetRegistry):
             else:
                 logging.debug("Future result tile is None -> not saved")
 
-    def add_file_to_save(
+    def add_file_to_save(  # pylint: disable=too-many-positional-arguments
         self,
         file_name,
         cars_ds,
@@ -247,7 +247,7 @@ class SingleCarsDatasetSaver:
         self.count = 0
         self.folder_name = None
 
-    def add_file(
+    def add_file(  # pylint: disable=too-many-positional-arguments
         self,
         file_name,
         tag=None,

cars/pipelines/conf_resolution/conf_final_resolution.json

@@ -1,7 +1,9 @@
 {
-    "dense_matching": {
-        "confidence_filtering": {
-            "activated": false
+    "applications" : {
+        "dense_matching": {
+            "confidence_filtering": {
+                "activated": false
+            }
         }
     }
 }