From eade9b993f2684e0c651c01cc9fd0c4201c53613 Mon Sep 17 00:00:00 2001 From: Nic Ma Date: Tue, 7 Dec 2021 18:22:02 +0800 Subject: [PATCH 1/2] [DLMED] fix deprecated arg Signed-off-by: Nic Ma --- monai/data/dataset.py | 3 +++ monai/data/iterable_dataset.py | 3 +++ monai/networks/blocks/activation.py | 2 ++ 3 files changed, 8 insertions(+) diff --git a/monai/data/dataset.py b/monai/data/dataset.py index f0416a6bdb..38371f384b 100644 --- a/monai/data/dataset.py +++ b/monai/data/dataset.py @@ -1276,6 +1276,9 @@ def __init__( else: raise ValueError("`src` must be file path or pandas `DataFrame`.") + # in case treating deprecated arg `filename` as kwargs, remove it from `kwargs` + kwargs.pop("filename", None) + data = convert_tables_to_dicts( dfs=dfs, row_indices=row_indices, col_names=col_names, col_types=col_types, col_groups=col_groups, **kwargs ) diff --git a/monai/data/iterable_dataset.py b/monai/data/iterable_dataset.py index e463c8c6ed..4eca6cdec9 100644 --- a/monai/data/iterable_dataset.py +++ b/monai/data/iterable_dataset.py @@ -205,7 +205,10 @@ def __init__( self.col_groups = col_groups self.shuffle = shuffle self.seed = seed + # in case treating deprecated arg `filename` as kwargs, remove it from `kwargs` + kwargs.pop("filename", None) self.kwargs = kwargs + self.iters: List[Iterable] = self.reset() super().__init__(data=None, transform=transform) # type: ignore diff --git a/monai/networks/blocks/activation.py b/monai/networks/blocks/activation.py index 9b58be04e8..b136eb7f1f 100644 --- a/monai/networks/blocks/activation.py +++ b/monai/networks/blocks/activation.py @@ -19,6 +19,7 @@ def monai_mish(x, inplace: bool = False): return torch.nn.functional.mish(x, inplace=inplace) + else: def monai_mish(x, inplace: bool = False): @@ -30,6 +31,7 @@ def monai_mish(x, inplace: bool = False): def monai_swish(x, inplace: bool = False): return torch.nn.functional.silu(x, inplace=inplace) + else: def monai_swish(x, inplace: bool = False): From 3800ffa27f542314c982671b6ef2e07540d93ac6 Mon Sep 17 00:00:00 2001 From: monai-bot Date: Tue, 7 Dec 2021 10:28:28 +0000 Subject: [PATCH 2/2] [MONAI] python code formatting Signed-off-by: monai-bot --- monai/networks/blocks/activation.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/monai/networks/blocks/activation.py b/monai/networks/blocks/activation.py index b136eb7f1f..9b58be04e8 100644 --- a/monai/networks/blocks/activation.py +++ b/monai/networks/blocks/activation.py @@ -19,7 +19,6 @@ def monai_mish(x, inplace: bool = False): return torch.nn.functional.mish(x, inplace=inplace) - else: def monai_mish(x, inplace: bool = False): @@ -31,7 +30,6 @@ def monai_mish(x, inplace: bool = False): def monai_swish(x, inplace: bool = False): return torch.nn.functional.silu(x, inplace=inplace) - else: def monai_swish(x, inplace: bool = False):