ultralytics-thop 2.0.16__tar.gz → 2.0.17__tar.gz

{ultralytics_thop-2.0.16 → ultralytics_thop-2.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ultralytics-thop
-Version: 2.0.16
+Version: 2.0.17
 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>
@@ -56,7 +56,7 @@ THOP offers an intuitive API designed to profile PyTorch models by calculating t
 
 Get started with THOP quickly by installing it via pip:
 
-[![PyPI - Version](https://img.shields.io/pypi/v/ultralytics-thop?logo=pypi&logoColor=white)](https://pypi.org/project/ultralytics-thop/) [![Downloads](https://static.pepy.tech/badge/ultralytics-thop)](https://www.pepy.tech/projects/ultralytics-thop) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ultralytics-thop?logo=python&logoColor=gold)](https://pypi.org/project/ultralytics-thop/)
+[![PyPI - Version](https://img.shields.io/pypi/v/ultralytics-thop?logo=pypi&logoColor=white)](https://pypi.org/project/ultralytics-thop/) [![Downloads](https://static.pepy.tech/badge/ultralytics-thop)](https://clickpy.clickhouse.com/dashboard/ultralytics-thop) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ultralytics-thop?logo=python&logoColor=gold)](https://pypi.org/project/ultralytics-thop/)
 
 ```bash
 pip install ultralytics-thop
@@ -74,7 +74,7 @@ This ensures you have the most recent version, incorporating the latest improvem
 
 ### Basic Usage
 
-Profiling a standard PyTorch model like [ResNet50](https://pytorch.org/vision/main/models/generated/torchvision.models.resnet50.html) is straightforward. Import the necessary libraries, load your model and a sample input tensor, then use the `profile` function:
+Profiling a standard PyTorch model like [ResNet50](https://docs.pytorch.org/vision/main/models/generated/torchvision.models.resnet50.html) is straightforward. Import the necessary libraries, load your model and a sample input tensor, then use the `profile` function:
 
 ```python
 import torch
@@ -230,7 +230,7 @@ The table below showcases the parameters and MACs for several popular [computer
 
 ## 🙌 Contribute
 
-We actively welcome and encourage community contributions to make THOP even better! Whether it's adding support for new [PyTorch layers](https://pytorch.org/docs/stable/nn.html), improving existing calculations, enhancing documentation, or fixing bugs, your input is valuable. Please see our [Contributing Guide](https://docs.ultralytics.com/help/contributing/) for detailed instructions on how to participate. Together, we can ensure THOP remains a state-of-the-art tool for the [machine learning](https://www.ultralytics.com/glossary/machine-learning-ml) community. Don't hesitate to share your feedback and suggestions!
+We actively welcome and encourage community contributions to make THOP even better! Whether it's adding support for new [PyTorch layers](https://docs.pytorch.org/docs/stable/nn.html), improving existing calculations, enhancing documentation, or fixing bugs, your input is valuable. Please see our [Contributing Guide](https://docs.ultralytics.com/help/contributing/) for detailed instructions on how to participate. Together, we can ensure THOP remains a state-of-the-art tool for the [machine learning](https://www.ultralytics.com/glossary/machine-learning-ml) community. Don't hesitate to share your feedback and suggestions!
 
 ## 📜 License
 

{ultralytics_thop-2.0.16 → ultralytics_thop-2.0.17}/README.md

@@ -17,7 +17,7 @@ THOP offers an intuitive API designed to profile PyTorch models by calculating t
 
 Get started with THOP quickly by installing it via pip:
 
-[![PyPI - Version](https://img.shields.io/pypi/v/ultralytics-thop?logo=pypi&logoColor=white)](https://pypi.org/project/ultralytics-thop/) [![Downloads](https://static.pepy.tech/badge/ultralytics-thop)](https://www.pepy.tech/projects/ultralytics-thop) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ultralytics-thop?logo=python&logoColor=gold)](https://pypi.org/project/ultralytics-thop/)
+[![PyPI - Version](https://img.shields.io/pypi/v/ultralytics-thop?logo=pypi&logoColor=white)](https://pypi.org/project/ultralytics-thop/) [![Downloads](https://static.pepy.tech/badge/ultralytics-thop)](https://clickpy.clickhouse.com/dashboard/ultralytics-thop) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ultralytics-thop?logo=python&logoColor=gold)](https://pypi.org/project/ultralytics-thop/)
 
 ```bash
 pip install ultralytics-thop
@@ -35,7 +35,7 @@ This ensures you have the most recent version, incorporating the latest improvem
 
 ### Basic Usage
 
-Profiling a standard PyTorch model like [ResNet50](https://pytorch.org/vision/main/models/generated/torchvision.models.resnet50.html) is straightforward. Import the necessary libraries, load your model and a sample input tensor, then use the `profile` function:
+Profiling a standard PyTorch model like [ResNet50](https://docs.pytorch.org/vision/main/models/generated/torchvision.models.resnet50.html) is straightforward. Import the necessary libraries, load your model and a sample input tensor, then use the `profile` function:
 
 ```python
 import torch
@@ -191,7 +191,7 @@ The table below showcases the parameters and MACs for several popular [computer
 
 ## 🙌 Contribute
 
-We actively welcome and encourage community contributions to make THOP even better! Whether it's adding support for new [PyTorch layers](https://pytorch.org/docs/stable/nn.html), improving existing calculations, enhancing documentation, or fixing bugs, your input is valuable. Please see our [Contributing Guide](https://docs.ultralytics.com/help/contributing/) for detailed instructions on how to participate. Together, we can ensure THOP remains a state-of-the-art tool for the [machine learning](https://www.ultralytics.com/glossary/machine-learning-ml) community. Don't hesitate to share your feedback and suggestions!
+We actively welcome and encourage community contributions to make THOP even better! Whether it's adding support for new [PyTorch layers](https://docs.pytorch.org/docs/stable/nn.html), improving existing calculations, enhancing documentation, or fixing bugs, your input is valuable. Please see our [Contributing Guide](https://docs.ultralytics.com/help/contributing/) for detailed instructions on how to participate. Together, we can ensure THOP remains a state-of-the-art tool for the [machine learning](https://www.ultralytics.com/glossary/machine-learning-ml) community. Don't hesitate to share your feedback and suggestions!
 
 ## 📜 License
 

{ultralytics_thop-2.0.16 → ultralytics_thop-2.0.17}/tests/test_matmul.py

@@ -17,7 +17,7 @@ class TestUtils:
         print(flops, params)
         assert flops == n * in_c * out_c
 
-    def test_matmul_case2(self):
+    def test_matmul_case3(self):  # Note renamed to case3 by Glenn Jocher as duplicated above function name
         """Tests matrix multiplication to profile FLOPs and parameters of nn.Linear layer using random dimensions."""
         for _ in range(10):
             n, in_c, out_c = torch.randint(1, 500, (3,)).tolist()

{ultralytics_thop-2.0.16 → ultralytics_thop-2.0.17}/thop/__init__.py

@@ -1,7 +1,6 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
-__version__ = "2.0.16"
-
+__version__ = "2.0.17"
 
 import torch
 
@@ -9,3 +8,5 @@ from .profile import profile, profile_origin
 from .utils import clever_format
 
 default_dtype = torch.float64
+
+__all__ = ["profile", "profile_origin", "clever_format", "default_dtype"]

{ultralytics_thop-2.0.16 → ultralytics_thop-2.0.17}/thop/fx_profile.py

@@ -6,6 +6,11 @@ from distutils.version import LooseVersion
 import torch
 import torch as th
 import torch.nn as nn
+from torch.fx import symbolic_trace
+from torch.fx.passes.shape_prop import ShapeProp
+
+from .utils import prRed, prYellow
+from .vision.calc_func import calculate_conv
 
 if LooseVersion(torch.__version__) < LooseVersion("1.8.0"):
     logging.warning(
@@ -40,9 +45,6 @@ def count_fn_linear(input_shapes, output_shapes, *args, **kwargs):
     return flops
 
 
-from .vision.calc_func import calculate_conv
-
-
 def count_fn_conv2d(input_shapes, output_shapes, *args, **kwargs):
     """Calculates total operations (FLOPs) for a 2D conv layer based on input and output shapes using
     `calculate_conv`.
@@ -118,11 +120,6 @@ for k in zero_ops:
 
 missing_maps = {}
 
-from torch.fx import symbolic_trace
-from torch.fx.passes.shape_prop import ShapeProp
-
-from .utils import prRed, prYellow
-
 
 def null_print(*args, **kwargs):
     """A no-op print function that takes any arguments without performing any actions."""
@@ -211,11 +208,15 @@ def fx_profile(mod: nn.Module, input: th.Tensor, verbose=False):
 if __name__ == "__main__":
 
     class MyOP(nn.Module):
+        """Custom operator that performs a simple forward pass dividing input by 1."""
+
         def forward(self, input):
             """Performs forward pass on given input data."""
             return input / 1
 
     class MyModule(torch.nn.Module):
+        """Neural network module with two linear layers and a custom MyOP operator."""
+
         def __init__(self):
             """Initializes MyModule with two linear layers and a custom MyOP operator."""
             super().__init__()

{ultralytics_thop-2.0.16 → ultralytics_thop-2.0.17}/thop/profile.py

@@ -1,7 +1,30 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
-from thop.rnn_hooks import *
-from thop.vision.basic_hooks import *
+from thop.rnn_hooks import (
+    count_gru,
+    count_gru_cell,
+    count_lstm,
+    count_lstm_cell,
+    count_rnn,
+    count_rnn_cell,
+    torch,
+)
+from thop.vision.basic_hooks import (
+    count_adap_avgpool,
+    count_avgpool,
+    count_convNd,
+    count_convtNd,
+    count_linear,
+    count_normalization,
+    count_parameters,
+    count_prelu,
+    count_relu,
+    count_softmax,
+    count_upsample,
+    logging,
+    nn,
+    zero_ops,
+)
 
 from .utils import prRed
 

{ultralytics_thop-2.0.16 → ultralytics_thop-2.0.17}/thop/vision/basic_hooks.py

@@ -2,10 +2,24 @@
 
 import logging
 
+import torch
 import torch.nn as nn
 from torch.nn.modules.conv import _ConvNd
 
-from .calc_func import *
+from thop.vision.calc_func import (
+    calculate_adaptive_avg,
+    calculate_avgpool,
+    calculate_conv,
+    calculate_conv2d_flops,
+    calculate_linear,
+    calculate_norm,
+    calculate_parameters,
+    calculate_relu,
+    calculate_relu_flops,
+    calculate_softmax,
+    calculate_upsample,
+    calculate_zero_ops,
+)
 
 multiply_adds = 1
 

{ultralytics_thop-2.0.16 → ultralytics_thop-2.0.17}/ultralytics_thop.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ultralytics-thop
-Version: 2.0.16
+Version: 2.0.17
 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>
@@ -56,7 +56,7 @@ THOP offers an intuitive API designed to profile PyTorch models by calculating t
 
 Get started with THOP quickly by installing it via pip:
 
-[![PyPI - Version](https://img.shields.io/pypi/v/ultralytics-thop?logo=pypi&logoColor=white)](https://pypi.org/project/ultralytics-thop/) [![Downloads](https://static.pepy.tech/badge/ultralytics-thop)](https://www.pepy.tech/projects/ultralytics-thop) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ultralytics-thop?logo=python&logoColor=gold)](https://pypi.org/project/ultralytics-thop/)
+[![PyPI - Version](https://img.shields.io/pypi/v/ultralytics-thop?logo=pypi&logoColor=white)](https://pypi.org/project/ultralytics-thop/) [![Downloads](https://static.pepy.tech/badge/ultralytics-thop)](https://clickpy.clickhouse.com/dashboard/ultralytics-thop) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ultralytics-thop?logo=python&logoColor=gold)](https://pypi.org/project/ultralytics-thop/)
 
 ```bash
 pip install ultralytics-thop
@@ -74,7 +74,7 @@ This ensures you have the most recent version, incorporating the latest improvem
 
 ### Basic Usage
 
-Profiling a standard PyTorch model like [ResNet50](https://pytorch.org/vision/main/models/generated/torchvision.models.resnet50.html) is straightforward. Import the necessary libraries, load your model and a sample input tensor, then use the `profile` function:
+Profiling a standard PyTorch model like [ResNet50](https://docs.pytorch.org/vision/main/models/generated/torchvision.models.resnet50.html) is straightforward. Import the necessary libraries, load your model and a sample input tensor, then use the `profile` function:
 
 ```python
 import torch
@@ -230,7 +230,7 @@ The table below showcases the parameters and MACs for several popular [computer
 
 ## 🙌 Contribute
 
-We actively welcome and encourage community contributions to make THOP even better! Whether it's adding support for new [PyTorch layers](https://pytorch.org/docs/stable/nn.html), improving existing calculations, enhancing documentation, or fixing bugs, your input is valuable. Please see our [Contributing Guide](https://docs.ultralytics.com/help/contributing/) for detailed instructions on how to participate. Together, we can ensure THOP remains a state-of-the-art tool for the [machine learning](https://www.ultralytics.com/glossary/machine-learning-ml) community. Don't hesitate to share your feedback and suggestions!
+We actively welcome and encourage community contributions to make THOP even better! Whether it's adding support for new [PyTorch layers](https://docs.pytorch.org/docs/stable/nn.html), improving existing calculations, enhancing documentation, or fixing bugs, your input is valuable. Please see our [Contributing Guide](https://docs.ultralytics.com/help/contributing/) for detailed instructions on how to participate. Together, we can ensure THOP remains a state-of-the-art tool for the [machine learning](https://www.ultralytics.com/glossary/machine-learning-ml) community. Don't hesitate to share your feedback and suggestions!
 
 ## 📜 License