ultralytics-thop 0.2.8__py3-none-any.whl → 0.2.9__py3-none-any.whl

thop/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.8"
+__version__ = "0.2.9"
 
 import torch
 

thop/fx_profile.py

@@ -33,10 +33,10 @@ def count_matmul(input_shapes, output_shapes):
 
 def count_fn_linear(input_shapes, output_shapes, *args, **kwargs):
     """Calculates total operations (FLOPs) for a linear layer given input and output shapes."""
-    mul_flops = count_matmul(input_shapes, output_shapes)
+    flops = count_matmul(input_shapes, output_shapes)
     if "bias" in kwargs:
-        add_flops = output_shapes[0].numel()
-    return mul_flops
+        flops += output_shapes[0].numel()
+    return flops
 
 
 from .vision.calc_func import calculate_conv
@@ -131,7 +131,6 @@ def fx_profile(mod: nn.Module, input: th.Tensor, verbose=False):
     information if verbose.
     """
     gm: torch.fx.GraphModule = symbolic_trace(mod)
-    g = gm.graph
     ShapeProp(gm).propagate(input)
 
     fprint = null_print

thop/vision/basic_hooks.py

@@ -10,7 +10,6 @@ multiply_adds = 1
 
 def count_parameters(m, x, y):
     """Calculate and update the total number of parameters in a given PyTorch model."""
-    total_params = sum(torch.DoubleTensor([p.numel()]) for p in m.parameters())
     m.total_params[0] = calculate_parameters(m.parameters())
 
 
@@ -22,10 +21,7 @@ def zero_ops(m, x, y):
 def count_convNd(m: _ConvNd, x, y: torch.Tensor):
     """Calculate and add the number of convolutional operations (FLOPs) to the model's total operations count."""
     x = x[0]
-
-    kernel_ops = torch.zeros(m.weight.size()[2:]).numel()  # Kw x Kh
-    bias_ops = 1 if m.bias is not None else 0
-
+    
     m.total_ops += calculate_conv2d_flops(
         input_size=list(x.shape),
         output_size=list(y.shape),
@@ -95,9 +91,6 @@ def count_prelu(m, x, y):
 def count_relu(m, x, y):
     """Calculate and update the total operation counts for a ReLU layer."""
     x = x[0]
-
-    nelements = x.numel()
-
     m.total_ops += calculate_relu_flops(list(x.shape))
 
 

{ultralytics_thop-0.2.8.dist-info → ultralytics_thop-0.2.9.dist-info}/METADATA

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

ultralytics_thop-0.2.9.dist-info/RECORD

@@ -0,0 +1,13 @@
+thop/__init__.py,sha256=FwqHv-84l6_m2nkYP6SRw4MC48bTdlMFoz2PzZi8-x8,146
+thop/fx_profile.py,sha256=NDObo07yrBf7B6ENltPMR9Cr1IolEumRkeTI6pXhpVs,8210
+thop/profile.py,sha256=z89mX1zVr_42axKbhgz9k2MJbgBLaBPt30lYT_PcWuA,7848
+thop/rnn_hooks.py,sha256=GYuKaNPEdZzTuqNCrJpTBjeQHsWs65UXCCaViS2giik,6485
+thop/utils.py,sha256=V_Pj_qC6RjqMyuiSX05eeUujT07hZQV-xobCIabjDds,1422
+thop/vision/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+thop/vision/basic_hooks.py,sha256=oOuHk5iPjRJjUuijY8Zppqr1s1abKV0y08N4DuqZGVg,4619
+thop/vision/calc_func.py,sha256=RE-qQWGjZIlRx8CNKjF-ZY7aS0WShPkvnOAYvQA8z8I,4130
+ultralytics_thop-0.2.9.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+ultralytics_thop-0.2.9.dist-info/METADATA,sha256=4DI3QPwUfOxFCXm7I_v8Yi_KJE7CZTWEEVUr7i3cJD0,8525
+ultralytics_thop-0.2.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+ultralytics_thop-0.2.9.dist-info/top_level.txt,sha256=HQ7D0gSvDJ31CNR-f0EuXNVve05RYBmwyIkHQKiEhU8,5
+ultralytics_thop-0.2.9.dist-info/RECORD,,

ultralytics_thop-0.2.8.dist-info/RECORD

@@ -1,13 +0,0 @@
-thop/__init__.py,sha256=nRitFGQJlu5vCs1JrMHYbmf8_rIcIfJ6ujcV9--_dOM,146
-thop/fx_profile.py,sha256=DSC3phrsDj08tey_OYVeiL6A8q3BE1er2YjH8W60VrM,8238
-thop/profile.py,sha256=z89mX1zVr_42axKbhgz9k2MJbgBLaBPt30lYT_PcWuA,7848
-thop/rnn_hooks.py,sha256=GYuKaNPEdZzTuqNCrJpTBjeQHsWs65UXCCaViS2giik,6485
-thop/utils.py,sha256=V_Pj_qC6RjqMyuiSX05eeUujT07hZQV-xobCIabjDds,1422
-thop/vision/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-thop/vision/basic_hooks.py,sha256=i_CSCC0o5olEbK2hOirehDKfD8ae19IjCkyHk0Zr4ko,4839
-thop/vision/calc_func.py,sha256=RE-qQWGjZIlRx8CNKjF-ZY7aS0WShPkvnOAYvQA8z8I,4130
-ultralytics_thop-0.2.8.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-ultralytics_thop-0.2.8.dist-info/METADATA,sha256=rIGQaLv_zrB6KB-qd35Z9L8igXLHf6xab4McW8d-Yhk,8525
-ultralytics_thop-0.2.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-ultralytics_thop-0.2.8.dist-info/top_level.txt,sha256=HQ7D0gSvDJ31CNR-f0EuXNVve05RYBmwyIkHQKiEhU8,5
-ultralytics_thop-0.2.8.dist-info/RECORD,,