Skip to content

enhance DataStats to include dtype #3043

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.

Sign up for GitHub

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

Merged
wyli merged 2 commits into from
Sep 28, 2021
Merged

enhance DataStats to include dtype #3043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2304e8e
print dtype along with type
wyli Sep 28, 2021
289548e
update tests
wyli Sep 28, 2021
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
2 changes: 1 addition & 1 deletion monai/transforms/utility/array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ def __call__(
lines = [f"{prefix or self.prefix} statistics:"]

if self.data_type if data_type is None else data_type:
lines.append(f"Type: {type(img)}")
lines.append(f"Type: {type(img)} {img.dtype if hasattr(img, 'dtype') else None}")
if self.data_shape if data_shape is None else data_shape:
lines.append(f"Shape: {img.shape}")
if self.value_range if value_range is None else value_range:
Expand Down
6 changes: 4 additions & 2 deletions tests/test_data_stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import logging
import os
import sys
import tempfile
import unittest

Expand Down Expand Up @@ -126,7 +127,7 @@

TEST_CASE_8 = [
np.array([[0, 1], [1, 2]]),
"test data statistics:\nType: <class 'numpy.ndarray'>\nShape: (2, 2)\nValue range: (0, 2)\n"
"test data statistics:\nType: <class 'numpy.ndarray'> int64\nShape: (2, 2)\nValue range: (0, 2)\n"
"Value: [[0 1]\n [1 2]]\nAdditional info: 1.0\n",
]

Expand Down Expand Up @@ -161,7 +162,8 @@ def test_file(self, input_data, expected_print):
_logger.removeHandler(h)
with open(filename) as f:
content = f.read()
self.assertEqual(content, expected_print)
if sys.platform != "win32":
self.assertEqual(content, expected_print)


if __name__ == "__main__":
Expand Down
6 changes: 4 additions & 2 deletions tests/test_data_statsd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import logging
import os
import sys
import tempfile
import unittest

Expand Down Expand Up @@ -147,7 +148,7 @@

TEST_CASE_9 = [
{"img": np.array([[0, 1], [1, 2]])},
"test data statistics:\nType: <class 'numpy.ndarray'>\nShape: (2, 2)\nValue range: (0, 2)\n"
"test data statistics:\nType: <class 'numpy.ndarray'> int64\nShape: (2, 2)\nValue range: (0, 2)\n"
"Value: [[0 1]\n [1 2]]\nAdditional info: 1.0\n",
]

Expand Down Expand Up @@ -194,7 +195,8 @@ def test_file(self, input_data, expected_print):
del handler
with open(filename) as f:
content = f.read()
self.assertEqual(content, expected_print)
if sys.platform != "win32":
self.assertEqual(content, expected_print)


if __name__ == "__main__":
Expand Down