careamics 0.0.7__tar.gz → 0.0.9__tar.gz

{careamics-0.0.7 → careamics-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: careamics
-Version: 0.0.7
+Version: 0.0.9
 Summary: Toolbox for running N2V and friends.
 Project-URL: homepage, https://careamics.github.io/
 Project-URL: repository, https://github.com/CAREamics/careamics

{careamics-0.0.7 → careamics-0.0.9}/src/careamics/lvae_training/eval_utils.py

@@ -107,6 +107,15 @@ def get_first_index(bin_count, quantile):
     return None
 
 
+def get_device():
+    if torch.cuda.is_available():
+        return "cuda"
+    elif torch.backends.mps.is_available():
+        return "mps"
+    else:
+        return "cpu"
+
+
 def show_for_one(
     idx,
     val_dset,
@@ -470,6 +479,7 @@ def get_predictions(
     dset: Dataset,
     batch_size: int,
     tile_size: Optional[tuple[int, int]] = None,
+    grid_size: Optional[int] = None,
     mmse_count: int = 1,
     num_workers: int = 4,
 ) -> tuple[dict, dict, dict]:
@@ -510,11 +520,12 @@ def get_predictions(
                 dset=d,
                 batch_size=batch_size,
                 tile_size=tile_size,
+                grid_size=grid_size,
                 mmse_count=mmse_count,
                 num_workers=num_workers,
             )
             # get filename without extension and path
-            filename = str(d._fpath).split("/")[-1].split(".")[0]
+            filename = d._fpath.name
             multifile_stitched_predictions[filename] = stitched_predictions
             multifile_stitched_stds[filename] = stitched_stds
         return (
@@ -527,11 +538,12 @@ def get_predictions(
             dset=dset,
             batch_size=batch_size,
             tile_size=tile_size,
+            grid_size=grid_size,
             mmse_count=mmse_count,
             num_workers=num_workers,
         )
         # get filename without extension and path
-        filename = str(dset._fpath).split("/")[-1].split(".")[0]
+        filename = dset._fpath.name
         return (
             {filename: stitched_predictions},
             {filename: stitched_stds},
@@ -550,6 +562,8 @@ def get_single_file_predictions(
     if tile_size and grid_size:
         dset.set_img_sz(tile_size, grid_size)
 
+    device = get_device()
+
     dloader = DataLoader(
         dset,
         pin_memory=False,
@@ -558,14 +572,14 @@ def get_single_file_predictions(
         batch_size=batch_size,
     )
     model.eval()
-    model.cuda()
+    model.to(device)
     tiles = []
     logvar_arr = []
     with torch.no_grad():
         for batch in tqdm(dloader, desc="Predicting tiles"):
             inp, tar = batch
-            inp = inp.cuda()
-            tar = tar.cuda()
+            inp = inp.to(device)
+            tar = tar.to(device)
 
             # get model output
             rec, _ = model(inp)
@@ -589,10 +603,13 @@ def get_single_file_mmse(
     dset: Dataset,
     batch_size: int,
     tile_size: Optional[tuple[int, int]] = None,
+    grid_size: Optional[int] = None,
     mmse_count: int = 1,
     num_workers: int = 4,
 ) -> tuple[np.ndarray, np.ndarray]:
     """Get patch-wise predictions from a model for a single file dataset."""
+    device = get_device()
+
     dloader = DataLoader(
         dset,
         pin_memory=False,
@@ -600,18 +617,19 @@ def get_single_file_mmse(
         shuffle=False,
         batch_size=batch_size,
     )
-    if tile_size:
-        dset.set_img_sz(tile_size, tile_size[-1] // 2)
+    if tile_size and grid_size:
+        dset.set_img_sz(tile_size, grid_size)
+
     model.eval()
-    model.cuda()
+    model.to(device)
     tile_mmse = []
     tile_stds = []
     logvar_arr = []
     with torch.no_grad():
         for batch in tqdm(dloader, desc="Predicting tiles"):
             inp, tar = batch
-            inp = inp.cuda()
-            tar = tar.cuda()
+            inp = inp.to(device)
+            tar = tar.to(device)
 
             rec_img_list = []
             for _ in range(mmse_count):