ultralytics-thop 2.0.15__py3-none-any.whl → 2.0.16__py3-none-any.whl

thop/__init__.py

@@ -1,6 +1,6 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
-__version__ = "2.0.15"
+__version__ = "2.0.16"
 
 
 import torch

thop/profile.py

@@ -12,9 +12,9 @@ register_hooks = {
     nn.Conv1d: count_convNd,
     nn.Conv2d: count_convNd,
     nn.Conv3d: count_convNd,
-    nn.ConvTranspose1d: count_convNd,
-    nn.ConvTranspose2d: count_convNd,
-    nn.ConvTranspose3d: count_convNd,
+    nn.ConvTranspose1d: count_convtNd,
+    nn.ConvTranspose2d: count_convtNd,
+    nn.ConvTranspose3d: count_convtNd,
     nn.BatchNorm1d: count_normalization,
     nn.BatchNorm2d: count_normalization,
     nn.BatchNorm3d: count_normalization,

thop/vision/basic_hooks.py

@@ -30,6 +30,7 @@ def count_convNd(m: _ConvNd, x, y: torch.Tensor):
         kernel_size=list(m.weight.shape),
         groups=m.groups,
         bias=m.bias,
+        transpose=False,
     )
     # N x Cout x H x W x  (Cin x Kw x Kh + bias)
     # m.total_ops += calculate_conv(
@@ -41,6 +42,20 @@ def count_convNd(m: _ConvNd, x, y: torch.Tensor):
     # )
 
 
+def count_convtNd(m: _ConvNd, x, y: torch.Tensor):
+    """Calculate and add the number of convolutional operations (FLOPs) for a ConvNd layer to the model's total ops."""
+    x = x[0]
+
+    m.total_ops += calculate_conv2d_flops(
+        input_size=list(x.shape),
+        output_size=list(y.shape),
+        kernel_size=list(m.weight.shape),
+        groups=m.groups,
+        bias=m.bias,
+        transpose=True,
+    )
+
+
 def count_convNd_ver2(m: _ConvNd, x, y: torch.Tensor):
     """Calculates and updates total operations (FLOPs) for a convolutional layer in a PyTorch model."""
     x = x[0]

thop/vision/calc_func.py

@@ -29,13 +29,18 @@ def calculate_zero_ops():
     return torch.DoubleTensor([0])
 
 
-def calculate_conv2d_flops(input_size: list, output_size: list, kernel_size: list, groups: int, bias: bool = False):
+def calculate_conv2d_flops(
+    input_size: list, output_size: list, kernel_size: list, groups: int, bias: bool = False, transpose: bool = False
+):
     """Calculate FLOPs for a Conv2D layer using input/output sizes, kernel size, groups, and the bias flag."""
     # n, in_c, ih, iw = input_size
     # out_c, in_c, kh, kw = kernel_size
-    in_c = input_size[1]
-    g = groups
-    return l_prod(output_size) * (in_c // g) * l_prod(kernel_size[2:])
+    if transpose:
+        out_c = output_size[1]
+        return l_prod(input_size) * (out_c // groups) * l_prod(kernel_size[2:])
+    else:
+        in_c = input_size[1]
+        return l_prod(output_size) * (in_c // groups) * l_prod(kernel_size[2:])
 
 
 def calculate_conv(bias, kernel_size, output_size, in_channel, group):

{ultralytics_thop-2.0.15.dist-info → ultralytics_thop-2.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ultralytics-thop
-Version: 2.0.15
+Version: 2.0.16
 Summary: Ultralytics THOP package for fast computation of PyTorch model FLOPs and parameters.
 Author-email: Ligeng Zhu <ligeng.zhu+github@gmail.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>

ultralytics_thop-2.0.16.dist-info/RECORD

@@ -0,0 +1,13 @@
+thop/__init__.py,sha256=uIP-Z82T22WjV4ZABASgzJpdE7KrxsGHmoAMbe9Dv1Y,219
+thop/fx_profile.py,sha256=ACI2RLyDYBLB7Cru9y2IAx_YCFX_uhYEArDR0np_tFc,8231
+thop/profile.py,sha256=CsS9mFIW3VWUA15pHQbGDZX-N624u10LZs5FtJOW_Fg,7983
+thop/rnn_hooks.py,sha256=JKZ2eSCvIKvhvCDqM4oWPZjmBkdyJ4R2Q7XSn63lsX0,6503
+thop/utils.py,sha256=IwFJQ1v-SLyhm-313Li535R6fhtomkm8Fem1Kfe6G_U,1484
+thop/vision/__init__.py,sha256=lm6MckFYCPTbqIoX7w0s_daxdjNeBeKW6DXppv1-QUM,70
+thop/vision/basic_hooks.py,sha256=jrq6HQtyMjO0PouGxiUZEehMVTozlUvslqMyOdoBcnQ,5156
+thop/vision/calc_func.py,sha256=2-LcoFg8ODy8EMb-xEsgLVPigLTki3dXnAg58dxVq80,4530
+ultralytics_thop-2.0.16.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+ultralytics_thop-2.0.16.dist-info/METADATA,sha256=EWJhKFCiDgN0tuXepxy0mF9Z_bxbzOYGYzddFWxqK_k,14922
+ultralytics_thop-2.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ultralytics_thop-2.0.16.dist-info/top_level.txt,sha256=HQ7D0gSvDJ31CNR-f0EuXNVve05RYBmwyIkHQKiEhU8,5
+ultralytics_thop-2.0.16.dist-info/RECORD,,

ultralytics_thop-2.0.15.dist-info/RECORD

@@ -1,13 +0,0 @@
-thop/__init__.py,sha256=mEWL6Ykse9frz8z9HIb5QWmXY9QpDL41UP2yStOsVaM,219
-thop/fx_profile.py,sha256=ACI2RLyDYBLB7Cru9y2IAx_YCFX_uhYEArDR0np_tFc,8231
-thop/profile.py,sha256=VaCR0K2oWTHp0y-W3SbuA4TdnyxTP6n6VSURltJGzrE,7980
-thop/rnn_hooks.py,sha256=JKZ2eSCvIKvhvCDqM4oWPZjmBkdyJ4R2Q7XSn63lsX0,6503
-thop/utils.py,sha256=IwFJQ1v-SLyhm-313Li535R6fhtomkm8Fem1Kfe6G_U,1484
-thop/vision/__init__.py,sha256=lm6MckFYCPTbqIoX7w0s_daxdjNeBeKW6DXppv1-QUM,70
-thop/vision/basic_hooks.py,sha256=UKMHbH-dP2wx0LCaWVMHtS9o5hJsClmFQrJrPFm0uxY,4714
-thop/vision/calc_func.py,sha256=s-_tRmimNBl4PYY_WQHb3C1H4nLy-oEW2kvsZDVjvdI,4362
-ultralytics_thop-2.0.15.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-ultralytics_thop-2.0.15.dist-info/METADATA,sha256=8pRLCm325cTHHSpygLu0DlmP8XR9rQR-qwytLJ4PYTw,14922
-ultralytics_thop-2.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ultralytics_thop-2.0.15.dist-info/top_level.txt,sha256=HQ7D0gSvDJ31CNR-f0EuXNVve05RYBmwyIkHQKiEhU8,5
-ultralytics_thop-2.0.15.dist-info/RECORD,,