From 1ab1a55d9f1de823d988921cddcdc4cd5852fb3b Mon Sep 17 00:00:00 2001 From: ydengbi <100134239+ydengbi@users.noreply.github.com> Date: Mon, 26 Dec 2022 15:36:39 +0800 Subject: [PATCH 1/6] Update nafnet_c64eb11128mb1db1111_8xb8-lr1e-3-400k_gopro.py --- .../nafnet/nafnet_c64eb11128mb1db1111_8xb8-lr1e-3-400k_gopro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/nafnet/nafnet_c64eb11128mb1db1111_8xb8-lr1e-3-400k_gopro.py b/configs/nafnet/nafnet_c64eb11128mb1db1111_8xb8-lr1e-3-400k_gopro.py index 79145a99c4..9a75bda591 100644 --- a/configs/nafnet/nafnet_c64eb11128mb1db1111_8xb8-lr1e-3-400k_gopro.py +++ b/configs/nafnet/nafnet_c64eb11128mb1db1111_8xb8-lr1e-3-400k_gopro.py @@ -12,7 +12,7 @@ type='BaseEditModel', generator=dict( type='NAFNetLocal', - img_channel=3, + img_channels=3, mid_channels=64, enc_blk_nums=[1, 1, 1, 28], middle_blk_num=1, From 4f06cb078bc2ca7f49c791e45ab7e8beea64b5a2 Mon Sep 17 00:00:00 2001 From: ydengbi <100134239+ydengbi@users.noreply.github.com> Date: Mon, 26 Dec 2022 15:36:59 +0800 Subject: [PATCH 2/6] Update nafnet_c64eb2248mb12db2222_8xb8-lr1e-3-400k_sidd.py --- .../nafnet/nafnet_c64eb2248mb12db2222_8xb8-lr1e-3-400k_sidd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/nafnet/nafnet_c64eb2248mb12db2222_8xb8-lr1e-3-400k_sidd.py b/configs/nafnet/nafnet_c64eb2248mb12db2222_8xb8-lr1e-3-400k_sidd.py index 49784ae3d6..cf71119a4c 100644 --- a/configs/nafnet/nafnet_c64eb2248mb12db2222_8xb8-lr1e-3-400k_sidd.py +++ b/configs/nafnet/nafnet_c64eb2248mb12db2222_8xb8-lr1e-3-400k_sidd.py @@ -12,7 +12,7 @@ type='BaseEditModel', generator=dict( type='NAFNet', - img_channel=3, + img_channels=3, mid_channels=64, enc_blk_nums=[2, 2, 4, 8], middle_blk_num=12, From d675cfd49e4edc6e7d5d57cec4c57ad1db650517 Mon Sep 17 00:00:00 2001 From: ydengbi <100134239+ydengbi@users.noreply.github.com> Date: Mon, 26 Dec 2022 15:38:51 +0800 Subject: [PATCH 3/6] Update nafnet_net.py --- mmedit/models/editors/nafnet/nafnet_net.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmedit/models/editors/nafnet/nafnet_net.py b/mmedit/models/editors/nafnet/nafnet_net.py index f4280762b1..9347c731e6 100644 --- a/mmedit/models/editors/nafnet/nafnet_net.py +++ b/mmedit/models/editors/nafnet/nafnet_net.py @@ -25,7 +25,7 @@ class NAFNet(BaseModule): """ def __init__(self, - img_channel=3, + img_channels=3, mid_channels=16, middle_blk_num=1, enc_blk_nums=[], From 2bdc906e51966002e89ada4ccc2db0caf6bbc899 Mon Sep 17 00:00:00 2001 From: ydengbi <100134239+ydengbi@users.noreply.github.com> Date: Mon, 26 Dec 2022 15:52:12 +0800 Subject: [PATCH 4/6] Update nafnet_net.py --- mmedit/models/editors/nafnet/nafnet_net.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mmedit/models/editors/nafnet/nafnet_net.py b/mmedit/models/editors/nafnet/nafnet_net.py index 9347c731e6..f4b627d88d 100644 --- a/mmedit/models/editors/nafnet/nafnet_net.py +++ b/mmedit/models/editors/nafnet/nafnet_net.py @@ -33,7 +33,7 @@ def __init__(self, super().__init__() self.intro = nn.Conv2d( - in_channels=img_channel, + in_channels=img_channels, out_channels=mid_channels, kernel_size=3, padding=1, @@ -42,7 +42,7 @@ def __init__(self, bias=True) self.ending = nn.Conv2d( in_channels=mid_channels, - out_channels=img_channel, + out_channels=img_channels, kernel_size=3, padding=1, stride=1, From 6b51ffba62f2ab4f99774e1d3369a94d271f9b7b Mon Sep 17 00:00:00 2001 From: ydengbi <100134239+ydengbi@users.noreply.github.com> Date: Mon, 26 Dec 2022 15:55:14 +0800 Subject: [PATCH 5/6] Update test_nafnet.py --- tests/test_models/test_editors/test_nafnet/test_nafnet.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test_models/test_editors/test_nafnet/test_nafnet.py b/tests/test_models/test_editors/test_nafnet/test_nafnet.py index 5ed69bcfcb..40eac7c580 100644 --- a/tests/test_models/test_editors/test_nafnet/test_nafnet.py +++ b/tests/test_models/test_editors/test_nafnet/test_nafnet.py @@ -7,7 +7,7 @@ def test_nafnet(): model = NAFNet( - img_channel=3, + img_channels=3, mid_channels=64, enc_blk_nums=[2, 2, 4, 8], middle_blk_num=12, @@ -25,6 +25,8 @@ def test_nafnet(): output = model(inputs) assert torch.is_tensor(output) assert output.shape == targets.shape + + # test on gpu if torch.cuda.is_available(): @@ -39,7 +41,7 @@ def test_nafnet(): def test_nafnet_local(): model = NAFNetLocal( - img_channel=3, + img_channels=3, mid_channels=64, enc_blk_nums=[1, 1, 1, 28], middle_blk_num=1, From 105a0a4bb6f7bdc6103e29f17639c291ca6f16fd Mon Sep 17 00:00:00 2001 From: ydengbi <100134239+ydengbi@users.noreply.github.com> Date: Mon, 26 Dec 2022 18:54:55 +0800 Subject: [PATCH 6/6] Update test_nafnet.py --- tests/test_models/test_editors/test_nafnet/test_nafnet.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_models/test_editors/test_nafnet/test_nafnet.py b/tests/test_models/test_editors/test_nafnet/test_nafnet.py index 40eac7c580..2d9c699392 100644 --- a/tests/test_models/test_editors/test_nafnet/test_nafnet.py +++ b/tests/test_models/test_editors/test_nafnet/test_nafnet.py @@ -25,8 +25,6 @@ def test_nafnet(): output = model(inputs) assert torch.is_tensor(output) assert output.shape == targets.shape - - # test on gpu if torch.cuda.is_available():