biapy 3.3.7__tar.gz → 3.3.8__tar.gz

{biapy-3.3.7/biapy.egg-info → biapy-3.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: biapy
-Version: 3.3.7
+Version: 3.3.8
 Summary: BiaPy: Bioimage analysis pipelines in Python
 Home-page: https://github.com/BiaPyX/BiaPy
 Author: BiaPy Contributors

{biapy-3.3.7 → biapy-3.3.8}/biapy/_biapy.py

@@ -119,12 +119,13 @@ class BiaPy():
         set_seed(self.cfg.SYSTEM.SEED)
         
         # Number of CPU calculation
-        if self.cfg.SYSTEM.NUM_WORKERS == -1:
+        if self.cfg.SYSTEM.NUM_CPUS == -1:
             self.cpu_count = multiprocessing.cpu_count()
         else:
-            self.cpu_count = self.cfg.SYSTEM.NUM_WORKERS
+            self.cpu_count = self.cfg.SYSTEM.NUM_CPUS
+        if self.cpu_count < 1: self.cpu_count = 1 # At least 1 CPU
         torch.set_num_threads(self.cpu_count)
-        self.cfg.merge_from_list(['SYSTEM.NUM_WORKERS', self.cpu_count])
+        self.cfg.merge_from_list(['SYSTEM.NUM_CPUS', self.cpu_count])
 
         check_configuration(self.cfg, self.job_identifier)
         print("Configuration details:")

{biapy-3.3.7 → biapy-3.3.8}/biapy/config/config.py

@@ -18,9 +18,10 @@ class Config:
         # System
         #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         _C.SYSTEM = CN()
-        # Maximum number of workers to load data in parallel. Set it to "-1" to set any limit. Normally a few cores 
-        # will be used in this last case, as the biggest calculations will be on the GPU.
-        _C.SYSTEM.NUM_WORKERS = -1
+        # Maximum number of CPUs to use. Set it to "-1" to not set a limit.
+        _C.SYSTEM.NUM_CPUS = -1
+        # Maximum number of workers to load data in parallel. You can disable this option by setting 0.
+        _C.SYSTEM.NUM_WORKERS = 5
         # Do not set it as its value will be calculated based in --gpu input arg
         _C.SYSTEM.NUM_GPUS = 0
 
@@ -173,7 +174,7 @@ class Config:
         _C.DATA.W_FOREGROUND = 0.94 # Used when _C.DATA.PROBABILITY_MAP=True
         _C.DATA.W_BACKGROUND = 0.06 # Used when _C.DATA.PROBABILITY_MAP=True
 
-        # Whether to reshape de dimensions that does not satisfy the pathc shape selected by padding it with reflect.
+        # Whether to reshape the dimensions that does not satisfy the patch shape selected by padding it with reflect.
         _C.DATA.REFLECT_TO_COMPLETE_SHAPE = False
 
         _C.DATA.NORMALIZATION = CN()

{biapy-3.3.7 → biapy-3.3.8}/biapy/data/generators/__init__.py

@@ -219,9 +219,8 @@ def create_train_val_augmentors(cfg, X_train, Y_train, X_val, Y_val, world_size,
     # Training dataset
     total_batch_size = cfg.TRAIN.BATCH_SIZE * world_size * cfg.TRAIN.ACCUM_ITER
     training_samples = len(train_generator)
-    num_workers = max(cfg.SYSTEM.NUM_WORKERS // cfg.SYSTEM.NUM_GPUS, 1) if dist else cfg.SYSTEM.NUM_WORKERS
     # Reduce number of workers in case there is no training data 
-    num_workers = min(num_workers, training_samples)
+    num_workers = min(cfg.SYSTEM.NUM_WORKERS, training_samples)
     # To not create more than 8 processes per GPU
     if cfg.SYSTEM.NUM_GPUS >= 1:
         num_workers = min(num_workers, 8*cfg.SYSTEM.NUM_GPUS)

{biapy-3.3.7 → biapy-3.3.8/biapy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: biapy
-Version: 3.3.7
+Version: 3.3.8
 Summary: BiaPy: Bioimage analysis pipelines in Python
 Home-page: https://github.com/BiaPyX/BiaPy
 Author: BiaPy Contributors

{biapy-3.3.7 → biapy-3.3.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "biapy"
-version = "3.3.7"
+version = "3.3.8"
 description = "BiaPy: Bioimage analysis pipelines in Python"
 readme = "README.md"
 authors = [{ name = "Daniel Franco-Barranco", email = "daniel.franco@dipc.org" }]

{biapy-3.3.7 → biapy-3.3.8}/setup.py

@@ -31,7 +31,7 @@ def getInclude():
 
 
 def setup_package():
-    __version__ = '3.3.7'
+    __version__ = '3.3.8'
     url = 'https://github.com/BiaPyX/BiaPy'
 
     setup(name='biapy',