-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[WIP] Port MONAI Generative utils #7134
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
Merged
wyli
merged 17 commits into
Project-MONAI:dev
from
marksgraham:6676_port_generative_utils
Oct 30, 2023
Merged
Changes from 12 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
7aaeab0
Adds new enums
marksgraham 2090549
Add misc and component store
marksgraham 94f57ac
Updates docs
marksgraham f94e666
Update docs
marksgraham 1d95d92
Updates component store to make compliant with mypy
marksgraham 355b4d9
Fixes mypy issues
marksgraham 92044d5
Fix mypy issues and add test
marksgraham 536ce75
DCO Remediation Commit for Mark Graham <[email protected]>
marksgraham 57e4843
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 21950bb
DCO commit
marksgraham 2c72721
Merge branch '6676_port_generative_utils' of github.com:marksgraham/M…
marksgraham 8ee2065
Merge branch 'dev' into 6676_port_generative_utils
marksgraham f71fda0
Adds brief docstrings
marksgraham 64e8c9f
Tests with different datatypes
marksgraham 471d25d
DCO Remediation Commit for Mark Graham <[email protected]>
marksgraham 595c197
Merge branch 'dev' into 6676_port_generative_utils
marksgraham 7d69606
Merge branch 'dev' into 6676_port_generative_utils
marksgraham File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,117 @@ | ||
# Copyright (c) MONAI Consortium | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from __future__ import annotations | ||
|
||
from collections import namedtuple | ||
from keyword import iskeyword | ||
from textwrap import dedent, indent | ||
from typing import Any, Callable, Iterable, TypeVar | ||
|
||
T = TypeVar("T") | ||
|
||
|
||
def is_variable(name): | ||
"""Returns True if `name` is a valid Python variable name and also not a keyword.""" | ||
return name.isidentifier() and not iskeyword(name) | ||
|
||
|
||
class ComponentStore: | ||
""" | ||
Represents a storage object for other objects (specifically functions) keyed to a name with a description. | ||
|
||
These objects act as global named places for storing components for objects parameterised by component names. | ||
Typically this is functions although other objects can be added. Printing a component store will produce a | ||
list of members along with their docstring information if present. | ||
|
||
Example: | ||
|
||
.. code-block:: python | ||
|
||
TestStore = ComponentStore("Test Store", "A test store for demo purposes") | ||
|
||
@TestStore.add_def("my_func_name", "Some description of your function") | ||
def _my_func(a, b): | ||
'''A description of your function here.''' | ||
return a * b | ||
|
||
print(TestStore) # will print out name, description, and 'my_func_name' with the docstring | ||
|
||
func = TestStore["my_func_name"] | ||
result = func(7, 6) | ||
|
||
""" | ||
|
||
_Component = namedtuple("_Component", ("description", "value")) # internal value pair | ||
|
||
def __init__(self, name: str, description: str) -> None: | ||
self.components: dict[str, ComponentStore._Component] = {} | ||
self.name: str = name | ||
self.description: str = description | ||
|
||
self.__doc__ = f"Component Store '{name}': {description}\n{self.__doc__ or ''}".strip() | ||
|
||
def add(self, name: str, desc: str, value: T) -> T: | ||
"""Store the object `value` under the name `name` with description `desc`.""" | ||
if not is_variable(name): | ||
raise ValueError("Name of component must be valid Python identifier") | ||
|
||
self.components[name] = self._Component(desc, value) | ||
return value | ||
|
||
def add_def(self, name: str, desc: str) -> Callable: | ||
"""Returns a decorator which stores the decorated function under `name` with description `desc`.""" | ||
|
||
def deco(func): | ||
"""Decorator to add a function to a store.""" | ||
return self.add(name, desc, func) | ||
|
||
return deco | ||
|
||
def __contains__(self, name: str) -> bool: | ||
"""Returns True if the given name is stored.""" | ||
return name in self.components | ||
|
||
def __len__(self) -> int: | ||
"""Returns the number of stored components.""" | ||
return len(self.components) | ||
|
||
def __iter__(self) -> Iterable: | ||
"""Yields name/component pairs.""" | ||
for k, v in self.components.items(): | ||
yield k, v.value | ||
|
||
def __str__(self): | ||
result = f"Component Store '{self.name}': {self.description}\nAvailable components:" | ||
for k, v in self.components.items(): | ||
result += f"\n* {k}:" | ||
|
||
if hasattr(v.value, "__doc__"): | ||
doc = indent(dedent(v.value.__doc__.lstrip("\n").rstrip()), " ") | ||
result += f"\n{doc}\n" | ||
else: | ||
result += f" {v.description}" | ||
|
||
return result | ||
|
||
def __getattr__(self, name: str) -> Any: | ||
"""Returns the stored object under the given name.""" | ||
if name in self.components: | ||
return self.components[name].value | ||
else: | ||
return self.__getattribute__(name) | ||
|
||
def __getitem__(self, name: str) -> Any: | ||
"""Returns the stored object under the given name.""" | ||
if name in self.components: | ||
return self.components[name].value | ||
else: | ||
raise ValueError(f"Component '{name}' not found") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
# Copyright (c) MONAI Consortium | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from __future__ import annotations | ||
|
||
import unittest | ||
|
||
from monai.utils import ComponentStore | ||
|
||
|
||
class TestComponentStore(unittest.TestCase): | ||
def setUp(self): | ||
self.cs = ComponentStore("TestStore", "I am a test store, please ignore") | ||
|
||
def test_empty(self): | ||
self.assertEqual(len(self.cs), 0) | ||
self.assertEqual(list(self.cs), []) | ||
|
||
def test_add(self): | ||
test_obj = object() | ||
|
||
self.assertFalse("test_obj" in self.cs) | ||
|
||
self.cs.add("test_obj", "Test object", test_obj) | ||
|
||
self.assertTrue("test_obj" in self.cs) | ||
|
||
self.assertEqual(len(self.cs), 1) | ||
self.assertEqual(list(self.cs), [("test_obj", test_obj)]) | ||
|
||
self.assertEqual(self.cs.test_obj, test_obj) | ||
self.assertEqual(self.cs["test_obj"], test_obj) | ||
|
||
def test_add2(self): | ||
test_obj1 = object() | ||
test_obj2 = object() | ||
|
||
self.cs.add("test_obj1", "Test object", test_obj1) | ||
self.cs.add("test_obj2", "Test object", test_obj2) | ||
|
||
self.assertEqual(len(self.cs), 2) | ||
self.assertTrue("test_obj1" in self.cs) | ||
self.assertTrue("test_obj2" in self.cs) | ||
|
||
def test_add_def(self): | ||
self.assertFalse("test_func" in self.cs) | ||
|
||
@self.cs.add_def("test_func", "Test function") | ||
def test_func(): | ||
return 123 | ||
|
||
self.assertTrue("test_func" in self.cs) | ||
|
||
self.assertEqual(len(self.cs), 1) | ||
self.assertEqual(list(self.cs), [("test_func", test_func)]) | ||
|
||
self.assertEqual(self.cs.test_func, test_func) | ||
self.assertEqual(self.cs["test_func"], test_func) | ||
|
||
# try adding the same function again | ||
self.cs.add_def("test_func", "Test function but with new description")(test_func) | ||
|
||
self.assertEqual(len(self.cs), 1) | ||
self.assertEqual(self.cs.test_func, test_func) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
# Copyright (c) MONAI Consortium | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from __future__ import annotations | ||
|
||
import unittest | ||
|
||
import numpy as np | ||
import torch | ||
from parameterized import parameterized | ||
|
||
from monai.utils import unsqueeze_left, unsqueeze_right | ||
|
||
RIGHT_CASES = [(np.random.rand(3, 4), 5, (3, 4, 1, 1, 1)), (torch.rand(3, 4), 5, (3, 4, 1, 1, 1))] | ||
marksgraham marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
LEFT_CASES = [(np.random.rand(3, 4), 5, (1, 1, 1, 3, 4)), (torch.rand(3, 4), 5, (1, 1, 1, 3, 4))] | ||
|
||
ALL_CASES = [ | ||
(np.random.rand(3, 4), 2, (3, 4)), | ||
(np.random.rand(3, 4), 0, (3, 4)), | ||
(np.random.rand(3, 4), -1, (3, 4)), | ||
(np.array(3), 4, (1, 1, 1, 1)), | ||
(np.array(3), 0, ()), | ||
(torch.rand(3, 4), 2, (3, 4)), | ||
(torch.rand(3, 4), 0, (3, 4)), | ||
(torch.rand(3, 4), -1, (3, 4)), | ||
(torch.tensor(3), 4, (1, 1, 1, 1)), | ||
(torch.tensor(3), 0, ()), | ||
] | ||
|
||
|
||
class TestUnsqueeze(unittest.TestCase): | ||
@parameterized.expand(RIGHT_CASES + ALL_CASES) | ||
def test_unsqueeze_right(self, arr, ndim, shape): | ||
self.assertEqual(unsqueeze_right(arr, ndim).shape, shape) | ||
|
||
@parameterized.expand(LEFT_CASES + ALL_CASES) | ||
def test_unsqueeze_left(self, arr, ndim, shape): | ||
self.assertEqual(unsqueeze_left(arr, ndim).shape, shape) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.