Merge branch 'master' of https://github.com/zylo117/Yet-Another-EfficientDet-Pytorch

Author: zylo117

efficientnet/utils_extra.py

@@ -33,6 +33,7 @@ def __init__(self, in_channels, out_channels, kernel_size, stride=1, bias=True,
     def forward(self, x):
         h, w = x.shape[-2:]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
         extra_h = (w - 1) * self.stride[1] - w + self.kernel_size[1]
         extra_v = (h - 1) * self.stride[0] - h + self.kernel_size[0]
@@ -43,6 +44,10 @@ def forward(self, x):
         extra_h = h_cover_len - w
         extra_v = v_cover_len - h
 >>>>>>> 21771ddb20591a2ff85cb2227f586e63f72c94f8
+=======
+        extra_h = (math.ceil(w / self.stride[1]) - 1) * self.stride[1] - w + self.kernel_size[1]
+        extra_v = (math.ceil(h / self.stride[0]) - 1) * self.stride[0] - h + self.kernel_size[0]
+>>>>>>> dc738a48daad9cc3530dd1beee5f4235b363687a
 
         left = extra_h // 2
         right = extra_h - left
@@ -80,13 +85,18 @@ def __init__(self, *args, **kwargs):
     def forward(self, x):
         h, w = x.shape[-2:]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
         extra_h = (w - 1) * self.stride[1] - w + self.kernel_size[1]
         extra_v = (h - 1) * self.stride[0] - h + self.kernel_size[0]
 =======
         extra_h = (math.ceil(w / self.stride[1]) - 1) * self.stride[1] - w + self.kernel_size[1]
         extra_v = (math.ceil(h / self.stride[0]) - 1) * self.stride[0] - h + self.kernel_size[0]
 >>>>>>> 21771ddb20591a2ff85cb2227f586e63f72c94f8
+=======
+        extra_h = (math.ceil(w / self.stride[1]) - 1) * self.stride[1] - w + self.kernel_size[1]
+        extra_v = (math.ceil(h / self.stride[0]) - 1) * self.stride[0] - h + self.kernel_size[0]
+>>>>>>> dc738a48daad9cc3530dd1beee5f4235b363687a
 
         left = extra_h // 2
         right = extra_h - left