summaryrefslogtreecommitdiff
path: root/models/layers.py
diff options
context:
space:
mode:
authorJordan Gong <jordan.gong@protonmail.com>2021-02-18 18:38:31 +0800
committerJordan Gong <jordan.gong@protonmail.com>2021-02-18 18:38:31 +0800
commit8012fce3e595aad31f4a52dc316b46e558234dff (patch)
tree4a5e19a21ad8a4470931f5884777c127197153c0 /models/layers.py
parent2988c1b9afd4e869b629a8629abedbf63d2452aa (diff)
parent84a3d5991f2f7272d1be54ad6cfe6ce695f915a0 (diff)
Merge branch 'master' into data_parallel_py3.8
Diffstat (limited to 'models/layers.py')
-rw-r--r--models/layers.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/models/layers.py b/models/layers.py
index 98e4c10..ae61583 100644
--- a/models/layers.py
+++ b/models/layers.py
@@ -162,7 +162,7 @@ class BasicConv1d(nn.Module):
return self.conv(x)
-class HorizontalPyramidPooling(BasicConv2d):
+class HorizontalPyramidPooling(nn.Module):
def __init__(
self,
in_channels: int,
@@ -172,8 +172,10 @@ class HorizontalPyramidPooling(BasicConv2d):
use_max_pool: bool = False,
**kwargs
):
- super().__init__(in_channels, out_channels, kernel_size=1, **kwargs)
+ super().__init__()
self.use_1x1conv = use_1x1conv
+ if use_1x1conv:
+ self.conv = BasicConv2d(in_channels, out_channels, 1, **kwargs)
self.use_avg_pool = use_avg_pool
self.use_max_pool = use_max_pool
assert use_avg_pool or use_max_pool, 'Pooling layer(s) required.'
@@ -188,5 +190,5 @@ class HorizontalPyramidPooling(BasicConv2d):
elif not self.use_avg_pool and self.use_max_pool:
x = self.max_pool(x)
if self.use_1x1conv:
- x = super().forward(x)
+ x = self.conv(x)
return x