pytme 0.2.9__tar.gz → 0.2.9.post1__tar.gz

{pytme-0.2.9 → pytme-0.2.9.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytme
-Version: 0.2.9
+Version: 0.2.9.post1
 Summary: Python Template Matching Engine
 Author: Valentin Maurer
 Author-email: Valentin Maurer <valentin.maurer@embl-hamburg.de>
@@ -18,6 +18,7 @@ Requires-Dist: pyfftw>=0.13.1
 Requires-Dist: pytest>=6.2.5
 Requires-Dist: PyYAML>=6.0
 Requires-Dist: scikit-image>=0.19.0
+Requires-Dist: scikit_learn>=1.2.1
 Requires-Dist: pybind11
 Requires-Dist: psutil
 Requires-Dist: h5py

{pytme-0.2.9 → pytme-0.2.9.post1}/pyproject.toml

@@ -7,7 +7,7 @@ name="pytme"
 authors = [
   { name = "Valentin Maurer", email = "valentin.maurer@embl-hamburg.de" },
 ]
-version="0.2.9"
+version="0.2.9.post1"
 description="Python Template Matching Engine"
 readme="README.md"
 requires-python = ">=3.11"
@@ -19,6 +19,7 @@ dependencies=[
     "pytest>=6.2.5",
     "PyYAML>=6.0",
     "scikit-image>=0.19.0",
+    "scikit_learn>=1.2.1",
     "pybind11",
     "psutil",
     "h5py",

{pytme-0.2.9 → pytme-0.2.9.post1}/tests/test_matching_cli.py

@@ -252,6 +252,7 @@ class TestPostprocessing(TestMatchTemplate):
         }
         cmd = argdict_to_command(argdict, executable="postprocess.py")
         ret = subprocess.run(cmd, capture_output=True, shell=True)
+        print(ret.stdout, ret.stderr)
 
         match output_format:
             case "orientations":

{pytme-0.2.9 → pytme-0.2.9.post1}/tme/analyzer/aggregation.py

@@ -398,6 +398,7 @@ class MaxScoreOverRotations:
         """Boolean indicating whether class instance can be shared across processes."""
         return True
 
+
 class MaxScoreOverTranslations(MaxScoreOverRotations):
     """
     Determine the translation maximizing the score over all possible rotations.

{pytme-0.2.9 → pytme-0.2.9.post1}/tme/analyzer/peaks.py

@@ -197,6 +197,9 @@ class PeakCaller(ABC):
         self.rotations = be.full(
             (num_peaks, ndim, ndim), fill_value=0, dtype=be._float_dtype
         )
+        for i in range(ndim):
+            self.rotations[:, i, i] = 1.0
+
         self.scores = be.full((num_peaks,), fill_value=0, dtype=be._float_dtype)
         self.details = be.full((num_peaks,), fill_value=0, dtype=be._float_dtype)
 

{pytme-0.2.9 → pytme-0.2.9.post1}/tme/matching_utils.py

@@ -15,7 +15,6 @@ from concurrent.futures import ThreadPoolExecutor
 from typing import Tuple, Dict, Callable, Optional
 
 import numpy as np
-from tqdm import tqdm
 from scipy.spatial import ConvexHull
 from scipy.ndimage import gaussian_filter
 
@@ -1151,38 +1150,3 @@ def compute_extraction_box(
     keep = be.multiply(keep, clamp_change == 0)
 
     return obs_beg_clamp, obs_end_clamp, cand_beg, cand_end, keep
-
-
-class TqdmParallel(Parallel):
-    """
-    A minimal Parallel implementation using tqdm for progress reporting.
-
-    Parameters:
-    -----------
-    tqdm_args : dict, optional
-        Dictionary of arguments passed to tqdm.tqdm
-    *args, **kwargs:
-        Arguments to pass to joblib.Parallel
-    """
-
-    def __init__(self, tqdm_args: Dict = {}, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.pbar = tqdm(**tqdm_args)
-
-    def __call__(self, iterable, *args, **kwargs):
-        self.n_tasks = len(iterable) if hasattr(iterable, "__len__") else None
-        return super().__call__(iterable, *args, **kwargs)
-
-    def print_progress(self):
-        if self.n_tasks is None:
-            return super().print_progress()
-
-        if self.n_tasks != self.pbar.total:
-            self.pbar.total = self.n_tasks
-            self.pbar.refresh()
-
-        self.pbar.n = self.n_completed_tasks
-        self.pbar.refresh()
-
-        if self.n_completed_tasks >= self.n_tasks:
-            self.pbar.close()