Skip to content

Commit 8be748f

Browse files
committed
added saving as zip
1 parent 419feab commit 8be748f

File tree

11 files changed

+32
-22
lines changed

11 files changed

+32
-22
lines changed

napari_cellseg3d/_tests/test_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ def test_get_padding_dim():
6767

6868
assert pad == [2048, 32, 64]
6969

70-
tensor = torch.randn(65,70,80)
70+
tensor = torch.randn(65, 70, 80)
7171
size = tensor.size()
7272

7373
pad = utils.get_padding_dim(size)
7474

75-
assert pad == [128,128,128]
75+
assert pad == [128, 128, 128]
7676

7777

7878
def test_normalize_x():

napari_cellseg3d/interface.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from qtpy.QtCore import QUrl
21
from qtpy.QtCore import Qt
2+
from qtpy.QtCore import QUrl
33
from qtpy.QtGui import QDesktopServices
44
from qtpy.QtWidgets import QCheckBox
55
from qtpy.QtWidgets import QComboBox

napari_cellseg3d/model_framework.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
from napari_cellseg3d import interface as ui
1414
from napari_cellseg3d import utils
1515
from napari_cellseg3d.log_utility import Log
16-
from napari_cellseg3d.models import TRAILMAP_test as TMAP
1716
from napari_cellseg3d.models import model_SegResNet as SegResNet
1817
from napari_cellseg3d.models import model_TRAILMAP as TRAILMAP
1918
from napari_cellseg3d.models import model_VNet as VNet
19+
from napari_cellseg3d.models import TRAILMAP_test as TMAP
2020
from napari_cellseg3d.plugin_base import BasePluginFolder
2121

2222
warnings.formatwarning = utils.format_Warning

napari_cellseg3d/model_workers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
from monai.data import CacheDataset
1010
from monai.data import DataLoader
1111
from monai.data import Dataset
12-
from monai.data import PatchDataset
1312
from monai.data import decollate_batch
1413
from monai.data import pad_list_data_collate
14+
from monai.data import PatchDataset
1515
from monai.inferers import sliding_window_inference
1616
from monai.metrics import DiceMetric
1717
from monai.transforms import AsDiscrete

napari_cellseg3d/models/unet/model.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import torch.nn as nn
22

3-
from napari_cellseg3d.models.unet.buildingblocks import (
4-
DoubleConv,
5-
create_encoders,
6-
create_decoders,
7-
)
3+
from napari_cellseg3d.models.unet.buildingblocks import create_decoders
4+
from napari_cellseg3d.models.unet.buildingblocks import create_encoders
5+
from napari_cellseg3d.models.unet.buildingblocks import DoubleConv
86

97

108
def number_of_features_per_level(init_channel_number, num_levels):

napari_cellseg3d/plugin_convert.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44

55
import napari_cellseg3d.interface as ui
66
from napari_cellseg3d import utils
7-
from napari_cellseg3d.model_instance_seg import (
8-
to_semantic,
9-
to_instance,
10-
clear_small_objects,
11-
)
7+
from napari_cellseg3d.model_instance_seg import clear_small_objects
8+
from napari_cellseg3d.model_instance_seg import to_instance
9+
from napari_cellseg3d.model_instance_seg import to_semantic
1210
from napari_cellseg3d.plugin_base import BasePluginFolder
1311

1412

napari_cellseg3d/plugin_metrics.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
FigureCanvasQTAgg as FigureCanvas,
55
)
66
from matplotlib.figure import Figure
7-
from monai.transforms import SpatialPad, ToTensor
7+
from monai.transforms import SpatialPad
8+
from monai.transforms import ToTensor
89
from tifffile import imread
910

1011
from napari_cellseg3d import interface as ui

napari_cellseg3d/plugin_model_inference.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import os
22
import warnings
3-
import numpy as np
43

54
import napari
5+
import numpy as np
66

77
# Qt
88
from qtpy.QtWidgets import QLabel

napari_cellseg3d/plugin_model_training.py

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import os
2+
import shutil
23
import warnings
3-
import torch
4-
from torch import nn
4+
import zipfile
55
from pathlib import Path
66

77
import matplotlib.pyplot as plt
88
import napari
99
import numpy as np
10+
import torch
1011
from matplotlib.backends.backend_qt5agg import (
1112
FigureCanvasQTAgg as FigureCanvas,
1213
)
@@ -866,9 +867,21 @@ def on_finish(self):
866867

867868
del self.worker
868869
self.worker = None
869-
self.results_path_folder = ""
870870
self.empty_cuda_cache()
871871

872+
shutil.make_archive(
873+
self.results_path_folder, "zip", self.results_path_folder
874+
)
875+
876+
# if zipfile.is_zipfile(self.results_path_folder+".zip"):
877+
878+
# if not shutil.rmtree.avoids_symlink_attacks:
879+
# raise RuntimeError("shutil.rmtree is not safe on this platform")
880+
881+
# shutil.rmtree(self.results_path_folder)
882+
883+
self.results_path_folder = ""
884+
872885
# self.clean_cache() # trying to fix memory leak
873886

874887
def on_error(self):
@@ -958,6 +971,7 @@ def plot_loss(self, loss, dice_metric):
958971

959972
plot_path = self.results_path_folder + "/Loss_plots"
960973
os.makedirs(plot_path, exist_ok=True)
974+
961975
if self.canvas is not None:
962976
self.canvas.figure.savefig(
963977
(

napari_cellseg3d/plugin_utilities.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import napari
22

33
# Qt
4-
from qtpy.QtWidgets import QTabWidget
54
from qtpy.QtWidgets import QSizePolicy
5+
from qtpy.QtWidgets import QTabWidget
66

77
from napari_cellseg3d.plugin_convert import ConvertUtils
88

0 commit comments

Comments
 (0)