valor-lite 0.34.1__tar.gz → 0.34.3__tar.gz

{valor_lite-0.34.1 → valor_lite-0.34.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valor-lite
-Version: 0.34.1
+Version: 0.34.3
 Summary: Evaluate machine learning models.
 Project-URL: homepage, https://www.striveworks.com
 Requires-Python: >=3.10

{valor_lite-0.34.1 → valor_lite-0.34.3}/valor_lite/classification/computation.py

@@ -1,6 +1,8 @@
 import numpy as np
 from numpy.typing import NDArray
 
+import valor_lite.classification.numpy_compatibility as npc
+
 
 def _compute_rocauc(
     data: NDArray[np.float64],
@@ -56,7 +58,7 @@ def _compute_rocauc(
     np.maximum.accumulate(tpr, axis=1, out=tpr)
 
     # compute rocauc
-    rocauc = np.trapezoid(x=fpr, y=tpr, axis=1)
+    rocauc = npc.trapezoid(x=fpr, y=tpr, axis=1)
 
     # compute mean rocauc
     mean_rocauc = rocauc.mean()

valor_lite-0.34.3/valor_lite/classification/numpy_compatibility.py

@@ -0,0 +1,13 @@
+import numpy as np
+from numpy.typing import NDArray
+
+try:
+    _numpy_trapezoid = np.trapezoid  # numpy v2
+except AttributeError:
+    _numpy_trapezoid = np.trapz  # numpy v1
+
+
+def trapezoid(
+    x: NDArray[np.float64], y: NDArray[np.float64], axis: int
+) -> NDArray[np.float64]:
+    return _numpy_trapezoid(x=x, y=y, axis=axis)  # type: ignore - NumPy compatibility

{valor_lite-0.34.1 → valor_lite-0.34.3}/valor_lite/object_detection/computation.py

@@ -282,7 +282,6 @@ def compute_precion_recall(
     ],
     NDArray[np.float64],
     NDArray[np.float64],
-    NDArray[np.float64],
 ]:
     """
     Computes Object Detection metrics.
@@ -314,8 +313,6 @@ def compute_precion_recall(
         Average Precision results.
     tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64], float]
         Average Recall results.
-    NDArray[np.float64]
-        Accuracy.
     NDArray[np.float64]
         Precision, Recall, TP, FP, FN, F1 Score.
     NDArray[np.float64]
@@ -334,7 +331,6 @@ def compute_precion_recall(
 
     average_precision = np.zeros((n_ious, n_labels), dtype=np.float64)
     average_recall = np.zeros((n_scores, n_labels), dtype=np.float64)
-    accuracy = np.zeros((n_ious, n_scores), dtype=np.float64)
     counts = np.zeros((n_ious, n_scores, n_labels, 6), dtype=np.float64)
 
     pd_labels = data[:, 5].astype(np.int32)
@@ -383,37 +379,38 @@ def compute_precion_recall(
             )
             mask_gt_unique = np.zeros(tp_candidates.shape[0], dtype=np.bool_)
             mask_gt_unique[indices_gt_unique] = True
+
             true_positives_mask = np.zeros(n_rows, dtype=np.bool_)
             true_positives_mask[mask_tp_inner] = mask_gt_unique
 
+            mask_fp_inner |= mask_tp_inner & ~true_positives_mask
+
             # calculate intermediates
-            pd_count = np.bincount(pd_labels, minlength=n_labels).astype(
-                np.float64
-            )
             tp_count = np.bincount(
                 pd_labels,
                 weights=true_positives_mask,
                 minlength=n_labels,
             ).astype(np.float64)
-
             fp_count = np.bincount(
                 pd_labels[mask_fp_inner],
                 minlength=n_labels,
             ).astype(np.float64)
-
             fn_count = np.bincount(
                 pd_labels[mask_fn_inner],
                 minlength=n_labels,
             )
 
+            fn_count = gt_count - tp_count
+            tp_fp_count = tp_count + fp_count
+
             # calculate component metrics
             recall = np.zeros_like(tp_count)
             np.divide(tp_count, gt_count, where=gt_count > 1e-9, out=recall)
 
             precision = np.zeros_like(tp_count)
-            np.divide(tp_count, pd_count, where=pd_count > 1e-9, out=precision)
-
-            fn_count = gt_count - tp_count
+            np.divide(
+                tp_count, tp_fp_count, where=tp_fp_count > 1e-9, out=precision
+            )
 
             f1_score = np.zeros_like(precision)
             np.divide(
@@ -436,14 +433,6 @@ def compute_precion_recall(
                 axis=1,
             )
 
-            # caluculate accuracy
-            total_pd_count = label_metadata[:, 1].sum()
-            accuracy[iou_idx, score_idx] = (
-                (tp_count.sum() / total_pd_count)
-                if total_pd_count > 1e-9
-                else 0.0
-            )
-
             # calculate recall for AR
             average_recall[score_idx] += recall
 
@@ -562,7 +551,6 @@ def compute_precion_recall(
     return (
         ap_results,  # type: ignore[reportReturnType]
         ar_results,
-        accuracy,
         counts,
         pr_curve,
     )

{valor_lite-0.34.1 → valor_lite-0.34.3}/valor_lite/object_detection/metric.py

@@ -6,7 +6,6 @@ from valor_lite.schemas import BaseMetric
 
 class MetricType(str, Enum):
     Counts = "Counts"
-    Accuracy = "Accuracy"
     Precision = "Precision"
     Recall = "Recall"
     F1 = "F1"
@@ -175,41 +174,6 @@ class Metric(BaseMetric):
             },
         )
 
-    @classmethod
-    def accuracy(
-        cls,
-        value: float,
-        iou_threshold: float,
-        score_threshold: float,
-    ):
-        """
-        Accuracy metric for the object detection task type.
-
-        This class encapsulates a metric value at a specific Intersection
-        over Union (IOU) threshold and confidence score threshold.
-
-        Parameters
-        ----------
-        value : float
-            The metric value.
-        iou_threshold : float
-            The IOU threshold used to determine matches between predicted and ground truth boxes.
-        score_threshold : float
-            The confidence score threshold above which predictions are considered.
-
-        Returns
-        -------
-        Metric
-        """
-        return cls(
-            type=MetricType.Accuracy.value,
-            value=value,
-            parameters={
-                "iou_threshold": iou_threshold,
-                "score_threshold": score_threshold,
-            },
-        )
-
     @classmethod
     def average_precision(
         cls,

{valor_lite-0.34.1 → valor_lite-0.34.3}/valor_lite/object_detection/utilities.py

@@ -22,7 +22,6 @@ def unpack_precision_recall_into_metric_lists(
         ],
         NDArray[np.float64],
         NDArray[np.float64],
-        NDArray[np.float64],
     ],
     iou_thresholds: list[float],
     score_thresholds: list[float],
@@ -42,7 +41,6 @@ def unpack_precision_recall_into_metric_lists(
             average_recall_averaged_over_scores,
             mean_average_recall_averaged_over_scores,
         ),
-        accuracy,
         precision_recall,
         pr_curves,
     ) = results
@@ -125,16 +123,6 @@ def unpack_precision_recall_into_metric_lists(
         )
     ]
 
-    metrics[MetricType.Accuracy] = [
-        Metric.accuracy(
-            value=float(accuracy[iou_idx, score_idx]),
-            iou_threshold=iou_threshold,
-            score_threshold=score_threshold,
-        )
-        for iou_idx, iou_threshold in enumerate(iou_thresholds)
-        for score_idx, score_threshold in enumerate(score_thresholds)
-    ]
-
     metrics[MetricType.PrecisionRecallCurve] = [
         Metric.precision_recall_curve(
             precisions=pr_curves[iou_idx, label_idx, :, 0].tolist(),  # type: ignore[reportArgumentType]

{valor_lite-0.34.1 → valor_lite-0.34.3}/valor_lite.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valor-lite
-Version: 0.34.1
+Version: 0.34.3
 Summary: Evaluate machine learning models.
 Project-URL: homepage, https://www.striveworks.com
 Requires-Python: >=3.10

{valor_lite-0.34.1 → valor_lite-0.34.3}/valor_lite.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ valor_lite/classification/annotation.py
 valor_lite/classification/computation.py
 valor_lite/classification/manager.py
 valor_lite/classification/metric.py
+valor_lite/classification/numpy_compatibility.py
 valor_lite/classification/utilities.py
 valor_lite/object_detection/__init__.py
 valor_lite/object_detection/annotation.py