Skip to content

2251 Update type hints for act and norm #2254

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 1 commit into from
May 26, 2021
Merged

2251 Update type hints for act and norm #2254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions monai/networks/blocks/aspp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from typing import Sequence
from typing import Optional, Sequence, Tuple, Union

import torch
import torch.nn as nn

from monai.networks.blocks.convolutions import Convolution
from monai.networks.layers import same_padding
from monai.networks.layers.factories import Act, Conv, Norm
from monai.networks.layers.factories import Conv


class SimpleASPP(nn.Module):
Expand All @@ -37,8 +37,8 @@ def __init__(
conv_out_channels: int,
kernel_sizes: Sequence[int] = (1, 3, 3, 3),
dilations: Sequence[int] = (1, 2, 4, 6),
norm_type=Norm.BATCH,
acti_type=Act.LEAKYRELU,
norm_type: Optional[Union[Tuple, str]] = "BATCH",
acti_type: Optional[Union[Tuple, str]] = "LEAKYRELU",
Comment on lines +40 to +41

@rijobro rijobro May 26, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's wrong with leaving the right sight of the equals as they were? E.g., Norm.BATCH and Act.LEAKYRELU?

@yiheng-wang-nv yiheng-wang-nv May 26, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing wrong, I just try to use the same format as in https://github.com/Project-MONAI/MONAI/blob/dev/monai/networks/blocks/convolutions.py#L104

@rijobro rijobro May 26, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, thanks!

) -> None:
"""
Args:
Expand Down
4 changes: 2 additions & 2 deletions tests/test_simple_aspp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

TEST_CASES = [
[ # 32-channel 2D, batch 7
{"spatial_dims": 2, "in_channels": 32, "conv_out_channels": 3},
{"spatial_dims": 2, "in_channels": 32, "conv_out_channels": 3, "norm_type": ("batch", {"affine": False})},
(7, 32, 18, 20),
(7, 12, 18, 20),
],
[ # 4-channel 1D, batch 16
{"spatial_dims": 1, "in_channels": 4, "conv_out_channels": 8},
{"spatial_dims": 1, "in_channels": 4, "conv_out_channels": 8, "acti_type": ("PRELU", {"num_parameters": 32})},
(16, 4, 17),
(16, 32, 17),
],
Expand Down