Merge pull request #40 from 20treeAI/perf/multiprocessing

fix: this functions has internal subprocess calls

Author: roelofvandijkO

s2p/initialization.py

@@ -10,6 +10,7 @@
 import rasterio
 import numpy as np
 import rpcm
+from multiprocessing import cpu_count
 
 from s2p import common
 from s2p import geographiclib
@@ -379,10 +380,12 @@ def tiles_full_info(cfg, tw, th, tiles_txt, create_masks=False):
             with rasterio.open(img['img'], 'r') as f:
                 images_sizes.append(f.shape)
 
+        # compute all masks in parallel as numpy arrays
+        n_workers = cfg["max_processes"] if cfg["max_processes"] is not None else cpu_count()
         # compute all masks in parallel as numpy arrays
         tiles_usefulnesses = parallel.launch_calls(is_this_tile_useful,
                                                    tiles_coords,
-                                                   cfg['max_processes'],
+                                                   min(n_workers, cpu_count()//2),  # internal subprocess calls!,
                                                    cfg['images'],
                                                    images_sizes,
                                                    cfg['border_margin'],

setup.py

@@ -63,7 +63,7 @@ def finalize_options(self):
 }
 
 setup(name="s2p",
-      version="1.6.2",
+      version="1.6.3",
       description="Satellite Stereo Pipeline.",
       long_description=readme(),
       long_description_content_type='text/markdown',