PyOPIA 2.7.0__tar.gz → 2.8.0__tar.gz

{pyopia-2.7.0 → pyopia-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyOPIA
-Version: 2.7.0
+Version: 2.8.0
 Summary: A Python Ocean Particle Image Analysis toolbox.
 Home-page: https://github.com/sintef/pyopia
 Keywords: Ocean,Particles,Imaging,Measurement,Size distribution
@@ -20,6 +20,7 @@ Requires-Dist: h5py (>=3.9.0,<4.0.0)
 Requires-Dist: imageio (>=2.31.3,<3.0.0)
 Requires-Dist: ipykernel (>=6.19.4)
 Requires-Dist: jupyter-book (>=0.15.1,<0.16.0)
+Requires-Dist: keras (==3.5.0) ; extra == "classification-arm64" or extra == "classification"
 Requires-Dist: matplotlib (>=3.7)
 Requires-Dist: myst-nb (>=0.17.2,<0.18.0)
 Requires-Dist: nbclient (==0.7)

pyopia-2.8.0/pyopia/__init__.py

@@ -0,0 +1 @@
+__version__ = '2.8.0'

{pyopia-2.7.0 → pyopia-2.8.0}/pyopia/cli.py

@@ -13,7 +13,7 @@ from rich.progress import Progress
 from rich.logging import RichHandler
 import rich.progress
 import pandas as pd
-import threading
+import multiprocessing
 
 import pyopia
 import pyopia.background
@@ -187,19 +187,22 @@ def process(config_filename: str, num_chunks: int = 1, strategy: str = 'block'):
                     logger.error(e)
                     logger.debug(''.join(traceback.format_tb(e.__traceback__)))
 
-    # With one chunk we keep the non-threaded functionality to ensure backwards compatibility
+    # With one chunk we keep the non-multiprocess functionality to ensure backwards compatibility
     job_list = []
     if num_chunks == 1:
         process_file_list(raw_files, 0)
     else:
         for c, chunk in enumerate(raw_files.chunked_files):
-            job = threading.Thread(target=process_file_list, args=(chunk, c, ))
-            job.start()
+            job = multiprocessing.Process(target=process_file_list, args=(chunk, c))
             job_list.append(job)
 
-    # Calculate and print total processing time
-    # If we are using threads, make sure all jobs have finished
+    # Start all the jobs
+    [job.start() for job in job_list]
+
+    # If we are using multiprocessing, make sure all jobs have finished
     [job.join() for job in job_list]
+
+    # Calculate and print total processing time
     time_total = pd.to_timedelta(time.time() - t1, 'seconds')
     with Progress(transient=True) as progress:
         progress.console.print(f"[blue]PROCESSING COMPLETED IN {time_total}")
@@ -256,7 +259,7 @@ def setup_logging(pipeline_config):
         handlers = [logging.FileHandler(log_file, mode='a')]
 
     # Configure logger
-    log_format = '%(asctime)s %(levelname)s %(threadName)s [%(module)s.%(funcName)s] %(message)s'
+    log_format = '%(asctime)s %(levelname)s %(processName)s [%(module)s.%(funcName)s] %(message)s'
     logging.basicConfig(level=log_level, datefmt='%Y-%m-%d %H:%M:%S', format=log_format, handlers=handlers)
 
 

{pyopia-2.7.0 → pyopia-2.8.0}/pyproject.toml

@@ -43,14 +43,15 @@ h5py = "^3.9.0"
 poetry-version-plugin = "^0.2.0"
 tensorflow-macos = {version = "^2.16.2", optional = true, markers = "sys_platform == 'darwin' and platform_machine == 'arm64'"}
 tensorflow-cpu = {version = "^2.16.2", optional = true}
+keras = {version = "3.5.0", optional = true}
 dask = ">=2024.8.1"
 nbconvert = "^7.16.4"
 h5netcdf = ">= 1.3.0"
 scikit-image = "^0.24.0"
 
 [tool.poetry.extras]
-classification-arm64 = ["tensorflow-macos"]
-classification = ["tensorflow-cpu"]
+classification-arm64 = ["tensorflow-macos", "keras"]
+classification = ["tensorflow-cpu", "keras"]
 
 [tool.poetry-version-plugin]
 source = "init"

pyopia-2.7.0/pyopia/__init__.py

@@ -1 +0,0 @@
-__version__ = '2.7.0'