Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove print statements from code and test suite #38

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions torch_mesmer/backbone_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ def get_backbone(backbone, input_tensor=None, input_shape=None,
elif _backbone in resnet_backbones:
model_cls = resnet_backbones[_backbone]
if use_imagenet:
print("Using ImageNet")

# model_cls=resnet50(weights=ResNet50_Weights.DEFAULT)
model_cls=resnet50(weights=ResNet50_Weights.IMAGENET1K_V2)
else:
Expand Down Expand Up @@ -357,4 +355,4 @@ def get_all_children(l, layer_li):
layer_outputs = time_distributed_outputs

output_dict = {f'C{i + 1}': j for i, j in enumerate(specific_layers)}
return (model, output_dict) if return_dict else model
return (model, output_dict) if return_dict else model
4 changes: 0 additions & 4 deletions torch_mesmer/deep_watershed.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
"""Functions for pre- and post-processing image data"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import warnings

import numpy as np
Expand Down
4 changes: 0 additions & 4 deletions torch_mesmer/deep_watershed_test.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
"""Tests for post-processing functions"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import numpy as np

import pytest
Expand Down
2 changes: 0 additions & 2 deletions torch_mesmer/mesmer.py
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,6 @@ def __init__(self, model=None, device=None):
# "See e.g. https://github.com/pytorch/pytorch/issues/84936 for a discussion."
# )

print(f"using device: {device}")

if model is None:
raise Exception("Need to provide a model")

Expand Down
3 changes: 1 addition & 2 deletions torch_mesmer/model_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ def create_model(input_shape=(256, 256, 2), backbone="resnet50", lr=1e-4, device
location=True, # should always be true
include_top=True,
)
print("Model is using", device)

loss = []
model = model.to(device)
for n_classes in num_semantic_classes:
loss.append(semantic_loss(n_classes))

optimizer = torch.optim.Adam(model.parameters(), lr=lr)
return model, loss, optimizer
return model, loss, optimizer
4 changes: 0 additions & 4 deletions torch_mesmer/toolbox_processing.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
"""Functions for pre- and post-processing image data"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import logging

import numpy as np
Expand Down
4 changes: 0 additions & 4 deletions torch_mesmer/toolbox_utils.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
"""Utility functions that may be used in other transforms."""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import numpy as np
import cv2
from scipy.signal import windows
Expand Down
11 changes: 3 additions & 8 deletions torch_mesmer/transform_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,8 @@ def pixelwise_transform(mask, dilation_radius=None, data_format=None,
``[bg_cell_edge, cell_cell_edge, cell_interior, background]``.
"""
if data_format is None:
print("Please provide a data format")
assert(False)

if data_format == 'channels_first':
channel_axis = 0
else:
channel_axis = -1
raise ValueError("Please provide a data format")
channel_axis = 0 if data_format == "channels_first" else -1

# Detect the edges and interiors
edge = find_boundaries(mask, mode='inner').astype('int')
Expand Down Expand Up @@ -400,4 +395,4 @@ def inner_distance_transform_movie(mask, bins=None, erosion_width=None,

inner_distances = np.stack(inner_distances, axis=0)

return inner_distances
return inner_distances
3 changes: 0 additions & 3 deletions torch_mesmer/transform_utils_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ def test_pixelwise_transform_2d():
img = np.squeeze(img)
pw_img = pixelwise_transform(
img, data_format='channels_last', separate_edge_classes=False)
print(pw_img)
pw_img_dil = pixelwise_transform(
img, dilation_radius=1,
data_format='channels_last',
Expand Down Expand Up @@ -170,8 +169,6 @@ def test_outer_distance_transform_2d():

bins = 3
distance = outer_distance_transform_2d(img, bins=bins)
print(distance)
print(np.unique(distance))
# np.testing.assert_equal(np.unique(distance), np.array([0, 1, 2]))
np.testing.assert_equal(np.expand_dims(distance, axis=-1).shape,
img.shape)
Expand Down
Loading