quadra 2.7.0__py3-none-any.whl → 2.7.1__py3-none-any.whl

quadra/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.7.0"
+__version__ = "2.7.1"
 
 
 def get_version():

quadra/configs/experiment/base/anomaly/inference.yaml

@@ -19,3 +19,4 @@ task:
   model_path: ???
   use_training_threshold: false
   training_threshold_type: image
+  custom_normalized_threshold: null # Optional: Custom normalized threshold (e.g., 110 for 10% above training threshold)

quadra/tasks/anomaly.py

@@ -354,6 +354,9 @@ class AnomalibEvaluation(Evaluation[AnomalyDataModule]):
         use_training_threshold: Whether to use the training threshold for the evaluation or use the one that
             maximizes the F1 score on the test set.
         device: Device to use for evaluation. If None, the device is automatically determined.
+        custom_normalized_threshold: Custom normalized threshold to use for evaluation. If provided, this threshold
+            will be used instead of the training threshold or the optimal F1 threshold. The threshold should be
+            in the normalized scale (e.g., 100 means the training threshold, 110 means 10% higher than training).
     """
 
     def __init__(
@@ -363,6 +366,7 @@ class AnomalibEvaluation(Evaluation[AnomalyDataModule]):
         use_training_threshold: bool = False,
         device: str | None = None,
         training_threshold_type: Literal["image", "pixel"] | None = None,
+        custom_normalized_threshold: float | None = None,
     ):
         super().__init__(config=config, model_path=model_path, device=device)
 
@@ -375,7 +379,20 @@ class AnomalibEvaluation(Evaluation[AnomalyDataModule]):
             log.warning("Using training threshold but no training threshold type is provided, defaulting to image")
             training_threshold_type = "image"
 
+        # Default to image threshold type if custom threshold is provided but type is not specified
+        if training_threshold_type is None and custom_normalized_threshold is not None:
+            log.warning("Using custom threshold but no training threshold type is provided, defaulting to image")
+            training_threshold_type = "image"
+
         self.training_threshold_type = training_threshold_type
+        self.custom_normalized_threshold = custom_normalized_threshold
+
+        if self.use_training_threshold and self.custom_normalized_threshold is not None:
+            self.use_training_threshold = False
+            log.warning("Ignoring use_training_threshold since custom_normalized_threshold is provided")
+
+        if custom_normalized_threshold is not None and custom_normalized_threshold <= 0:
+            raise ValueError("Custom normalized threshold must be greater than 0")
 
     def prepare(self) -> None:
         """Prepare the evaluation."""
@@ -421,11 +438,18 @@ class AnomalibEvaluation(Evaluation[AnomalyDataModule]):
 
         anomaly_scores = torch.cat(anomaly_scores)
         anomaly_maps = torch.cat(anomaly_maps)
+        training_threshold = float(self.model_data[f"{self.training_threshold_type}_threshold"])
 
         if any(x != -1 for x in image_labels):
-            if self.use_training_threshold:
+            threshold = None
+            if self.custom_normalized_threshold is not None:
+                # normalized = (raw / training) * 100, so raw = (normalized * training) / 100
+                threshold = torch.tensor((self.custom_normalized_threshold * training_threshold) / 100.0)
+            elif self.use_training_threshold:
+                threshold = torch.tensor(training_threshold)
+
+            if threshold is not None:
                 _image_labels = torch.tensor(image_labels)
-                threshold = torch.tensor(float(self.model_data[f"{self.training_threshold_type}_threshold"]))
                 known_labels = torch.where(_image_labels != -1)[0]
 
                 _image_labels = _image_labels[known_labels]
@@ -438,9 +462,12 @@ class AnomalibEvaluation(Evaluation[AnomalyDataModule]):
                 optimal_f1_score = optimal_f1.compute()
                 threshold = optimal_f1.threshold
         else:
-            log.warning("No ground truth available during evaluation, use training image threshold for reporting")
             optimal_f1_score = torch.tensor(0)
-            threshold = torch.tensor(float(self.model_data["image_threshold"]))
+            if self.custom_normalized_threshold is None:
+                log.warning("No ground truth available during evaluation, use training image threshold for reporting")
+                threshold = torch.tensor(training_threshold)
+            else:
+                threshold = torch.tensor((self.custom_normalized_threshold * training_threshold) / 100.0)
 
         log.info("Computed F1 score: %s", optimal_f1_score.item())
         self.metadata["anomaly_scores"] = anomaly_scores

{quadra-2.7.0.dist-info → quadra-2.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quadra
-Version: 2.7.0
+Version: 2.7.1
 Summary: Deep Learning experiment orchestration library
 License: Apache-2.0
 License-File: LICENSE

{quadra-2.7.0.dist-info → quadra-2.7.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-quadra/__init__.py,sha256=6GiBpHwyZiEtMpxFsbhXJlAnmYsht8VrZM8V5h3MH-g,112
+quadra/__init__.py,sha256=77nl9nFDUmAMNnqEFiQyLIKnrlY4eE1eiMYXuA1h8SA,112
 quadra/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quadra/callbacks/anomalib.py,sha256=WLBEGhZA9HoP4Yh9UbbC2GzDOKYTkvU9EY1lkZcV7Fs,11971
 quadra/callbacks/lightning.py,sha256=qvtzDiv8ZUV7K11gKHKWCyo-a9XR_Jm_M-IEicTM1Yo,20242
@@ -56,7 +56,7 @@ quadra/configs/experiment/base/anomaly/csflow.yaml,sha256=h0fnpYQaN7WPEpHZVb_xpn
 quadra/configs/experiment/base/anomaly/draem.yaml,sha256=Q6lzy7tO5HJ5o4w5uxpGbCclwBvL9yKlgTr5FXun81M,1102
 quadra/configs/experiment/base/anomaly/efficient_ad.yaml,sha256=9RQovNcAJ_pJHm8xIuVh2NW3q1ufFEIUqWirj6HC5aY,1092
 quadra/configs/experiment/base/anomaly/fastflow.yaml,sha256=jN3TeJXPGT7_GOhu2EacpaCIOic-kPxT5I75PgBvoRU,1031
-quadra/configs/experiment/base/anomaly/inference.yaml,sha256=aLS3U0yC0Yb17BD1NSl-nhjJ9fcV6jDmxVQrrwZoMYI,446
+quadra/configs/experiment/base/anomaly/inference.yaml,sha256=F-VXF_tIdUp7ZDbTRCH7fBKDmEQsavgj0PTbHE_Z360,567
 quadra/configs/experiment/base/anomaly/padim.yaml,sha256=5trGY5kL7gKzRTQuWT-LHYVPf4-q9J2I_-196noIZd4,829
 quadra/configs/experiment/base/anomaly/patchcore.yaml,sha256=a795iOcdH6kSoeA7ufChjBGWYdBn0ztRVtLBk1vpI3Q,841
 quadra/configs/experiment/base/classification/classification.yaml,sha256=MNWrzDPpTIBc5gfIyeZmEiLqeI-FPjXJt2APD4gY0gU,1290
@@ -248,7 +248,7 @@ quadra/schedulers/__init__.py,sha256=mQivr18c0j36hpV3Lm8nlyBVKFevWp8TtLuTfvI9kQc
 quadra/schedulers/base.py,sha256=T1EdrLOJ0i9MzWoLCkrNA0uypm7hJ-L6NFhjIXFB6NE,1462
 quadra/schedulers/warmup.py,sha256=chzzrK7OqqlicBCxiF4CqMYNrWu6nflIbRE-C86Jrw0,4962
 quadra/tasks/__init__.py,sha256=tmAfMoH0k3UC7r2pNrgbBa1Pfc3tpLl3IObFF6Z0eRE,820
-quadra/tasks/anomaly.py,sha256=40ciWnkle45Hl6SjY_4OHWdT2Mb1Qfoog60alZG-uQ0,25899
+quadra/tasks/anomaly.py,sha256=Kv-Lh25E82BsycBPSXwx06fA_yQA3kSoeJfdek47-nM,27680
 quadra/tasks/base.py,sha256=piYlTFtvqH-4s4oEq4GczdAs_gL29UHAJGsOC5Sd3Bc,14187
 quadra/tasks/classification.py,sha256=_GQOPMGuOZ_uLA9jFhLEaJkW_Sid_WKHNn9ALXnGNmo,53407
 quadra/tasks/patch.py,sha256=nzo8o-ei7iF1Iarvd8-c08s0Rs_lPvVPDLAbkFMx-Qw,20251
@@ -293,8 +293,8 @@ quadra/utils/validator.py,sha256=wmVXycB90VNyAbKBUVncFCxK4nsYiOWJIY3ISXwxYCY,463
 quadra/utils/visualization.py,sha256=yYm7lPziUOlybxigZ2qTycNewb67Q80H4hjQGWUh788,16094
 quadra/utils/vit_explainability.py,sha256=Gh6BHaDEzWxOjJp1aqvCxLt9Rb8TXd5uKXOAx7-acUk,13351
 hydra_plugins/quadra_searchpath_plugin.py,sha256=AAn4TzR87zUK7nwSsK-KoqALiPtfQ8FvX3fgZPTGIJ0,1189
-quadra-2.7.0.dist-info/METADATA,sha256=wUVgExV2_fkLDND5oEZs_oGHVSh6riCbbZMOUbexYfc,17612
-quadra-2.7.0.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-quadra-2.7.0.dist-info/entry_points.txt,sha256=sRYonBZyx-sAJeWcQNQoVQIU5lm02cnCQt6b15k0WHU,43
-quadra-2.7.0.dist-info/licenses/LICENSE,sha256=8cTbQtcWa02YJoSpMeV_gxj3jpMTkxvl-w3WJ5gV_QE,11342
-quadra-2.7.0.dist-info/RECORD,,
+quadra-2.7.1.dist-info/METADATA,sha256=rq3319yhEWXyGTACbXBr6xbGdLdBuJ1KIn_CfpDQcio,17612
+quadra-2.7.1.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+quadra-2.7.1.dist-info/entry_points.txt,sha256=sRYonBZyx-sAJeWcQNQoVQIU5lm02cnCQt6b15k0WHU,43
+quadra-2.7.1.dist-info/licenses/LICENSE,sha256=8cTbQtcWa02YJoSpMeV_gxj3jpMTkxvl-w3WJ5gV_QE,11342
+quadra-2.7.1.dist-info/RECORD,,

{quadra-2.7.0.dist-info → quadra-2.7.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.3.0
+Generator: poetry-core 2.3.1
 Root-Is-Purelib: true
 Tag: py3-none-any