dsa-helpers 1.1.5.dev8__tar.gz → 1.1.5.dev10__tar.gz

{dsa_helpers-1.1.5.dev8/dsa_helpers.egg-info → dsa_helpers-1.1.5.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsa_helpers
-Version: 1.1.5.dev8
+Version: 1.1.5.dev10
 Summary: Utility functions for working with the DSA girder client.
 Author-email: "Juan C. Vizcarra" <jvizcar@emory.edu>
 Maintainer-email: "Juan C. Vizcarra" <jvizcar@emory.edu>

{dsa_helpers-1.1.5.dev8 → dsa_helpers-1.1.5.dev10}/dsa_helpers/__init__.py

@@ -3,7 +3,7 @@ from .imread import imread
 from .imwrite import imwrite
 
 # Version of the dsa-helpers package
-__version__ = "1.1.5.dev8"
+__version__ = "1.1.5.dev10"
 
 # To avoid slow downs, do not allow from dsa_helpers import * to import anything.
 __all__ = []

{dsa_helpers-1.1.5.dev8 → dsa_helpers-1.1.5.dev10}/dsa_helpers/ml/segformer_semantic_segmentation/evaluate.py

@@ -4,7 +4,7 @@ import numpy as np
 import torch
 
 from .transforms import val_transforms
-from .datasets import create_segformer_segmentation_dataset
+from .utils import create_segformer_segmentation_dataset
 
 
 def per_class_dice_on_dataset(

{dsa_helpers-1.1.5.dev8 → dsa_helpers-1.1.5.dev10}/dsa_helpers/ml/segformer_semantic_segmentation/train.py

@@ -128,14 +128,15 @@ def train_segformer_semantic_segmentation_model(
         train_data, transforms=train_transforms
     )
 
-    val_dataset = create_segformer_segmentation_dataset(
-        (
-            val_data
-            if max_val_size is None
-            else val_data.sample(n=max_val_size, random_state=random_state)
-        ),
-        transforms=val_transforms,
-    )
+    if val_data is not None and max_val_size < len(val_data):
+        val_dataset = create_segformer_segmentation_dataset(
+            val_data.sample(n=max_val_size, random_state=random_state),
+            transforms=val_transforms,
+        )
+    else:
+        val_dataset = create_segformer_segmentation_dataset(
+            val_data, transforms=val_transforms
+        )
 
     def compute_metrics(eval_pred):
         """Function for computing DICE coefficient metrics for each
@@ -183,11 +184,11 @@ def train_segformer_semantic_segmentation_model(
             denominator_value = denominator[label]
 
             if denominator_value:
-                metrics[label] = float(
+                metrics[f"{label}_dice"] = float(
                     2 * intersection[label] / denominator_value
                 )
             else:
-                metrics[label] = 1
+                metrics[f"{label}_dice"] = 1
 
         # Add the mean Dice.
         metrics["mean_dice"] = float(np.mean(list(metrics.values())))

{dsa_helpers-1.1.5.dev8 → dsa_helpers-1.1.5.dev10/dsa_helpers.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsa_helpers
-Version: 1.1.5.dev8
+Version: 1.1.5.dev10
 Summary: Utility functions for working with the DSA girder client.
 Author-email: "Juan C. Vizcarra" <jvizcar@emory.edu>
 Maintainer-email: "Juan C. Vizcarra" <jvizcar@emory.edu>

{dsa_helpers-1.1.5.dev8 → dsa_helpers-1.1.5.dev10}/pyproject.toml

@@ -38,7 +38,7 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
 ]
 keywords = ["dsa", "girder", "girder_client"]
-version = "v1.1.5.dev8"
+version = "v1.1.5.dev10"
 
 [project.urls]
 Repository = "https://github.com/Gutman-Lab/dsa-python-utils"