visualtorch 0.2.2__tar.gz → 0.2.4__tar.gz

{visualtorch-0.2.2 → visualtorch-0.2.4}/LICENSE

@@ -1,5 +1,7 @@
 MIT License
 
+Copyright (c) 2020 Paul Gavrikov
+
 Copyright (c) 2024 Willy Fitra Hendria
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

{visualtorch-0.2.2/visualtorch.egg-info → visualtorch-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: visualtorch
-Version: 0.2.2
+Version: 0.2.4
 Summary: Architecture visualization of Torch models
 Home-page: https://github.com/willyfh/visualtorch
 Author: Willy Fitra Hendria
@@ -14,6 +14,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+Provides-Extra: dev
 License-File: LICENSE
 
 <div align="center">
@@ -49,11 +50,11 @@ See the [Usage Examples page](https://visualtorch.readthedocs.io/en/latest/usage
 
 ## Contributing
 
-Please feel free to send a pull request to contribute to this project.
+Please feel free to send a pull request to contribute to this project by following this [guideline](https://github.com/willyfh/visualtorch/blob/main/CONTRIBUTING.md).
 
 ## License
 
-This poject is available as open source under the terms of the [MIT License](https://github.com/willyfh/visualtorch/blob/update-readme/LICENSE).
+This poject is available as open source under the terms of the [MIT License](https://github.com/willyfh/visualtorch/blob/main/LICENSE).
 
 Originally, this project was based on the [visualkeras](https://github.com/paulgavrikov/visualkeras) (under the MIT license), with additional modifications inspired by [pytorchviz](https://github.com/szagoruyko/pytorchviz), and [pytorch-summary](https://github.com/sksq96/pytorch-summary), both of which are also licensed under the MIT license.
 

{visualtorch-0.2.2 → visualtorch-0.2.4}/README.md

@@ -31,11 +31,11 @@ See the [Usage Examples page](https://visualtorch.readthedocs.io/en/latest/usage
 
 ## Contributing
 
-Please feel free to send a pull request to contribute to this project.
+Please feel free to send a pull request to contribute to this project by following this [guideline](https://github.com/willyfh/visualtorch/blob/main/CONTRIBUTING.md).
 
 ## License
 
-This poject is available as open source under the terms of the [MIT License](https://github.com/willyfh/visualtorch/blob/update-readme/LICENSE).
+This poject is available as open source under the terms of the [MIT License](https://github.com/willyfh/visualtorch/blob/main/LICENSE).
 
 Originally, this project was based on the [visualkeras](https://github.com/paulgavrikov/visualkeras) (under the MIT license), with additional modifications inspired by [pytorchviz](https://github.com/szagoruyko/pytorchviz), and [pytorch-summary](https://github.com/sksq96/pytorch-summary), both of which are also licensed under the MIT license.
 

{visualtorch-0.2.2 → visualtorch-0.2.4}/setup.py

@@ -11,9 +11,17 @@ file_path = Path("README.md")
 with file_path.open("r") as fh:
     long_description = fh.read()
 
+
+def _read_requirements(file: str) -> list:
+    file_path = Path(file)
+    with file_path.open("r") as fh:
+        reqs = fh.read()
+    return reqs.strip().split("\n")
+
+
 setuptools.setup(
     name="visualtorch",
-    version="0.2.2",
+    version="0.2.4",
     author="Willy Fitra Hendria",
     author_email="willyfitrahendria@gmail.com",
     description="Architecture visualization of Torch models",
@@ -29,12 +37,8 @@ setuptools.setup(
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
-    install_requires=[
-        "pillow>=10.0.0",
-        "numpy>=1.18.1",
-        "aggdraw>=1.3.11",
-        "torch>=2.0.0",
-    ],
+    install_requires=_read_requirements("requirements.txt"),
+    extras_require={"dev": _read_requirements("docs/requirements.txt") + _read_requirements("dev-requirements.txt")},
     python_requires=">=3.10",
     license="MIT",
     license_files=("LICENSE",),

{visualtorch-0.2.2 → visualtorch-0.2.4}/visualtorch/graph.py

@@ -1,5 +1,6 @@
 """Graph View module for pytorch model visualization."""
 
+# Copyright (C) 2020 Paul Gavrikov
 # Copyright (C) 2024 Willy Fitra Hendria
 # SPDX-License-Identifier: MIT
 
@@ -168,7 +169,6 @@ def _draw_connector(
 
 def _retrieve_isbox_units(layer: torch.autograd.Function, show_neurons: bool) -> tuple[bool, int]:
     """Return the number of units and the flag whether to visualize using a box or not."""
-    print("test: ", type(layer))
     is_box = True
     units = 1
     if show_neurons:

{visualtorch-0.2.2 → visualtorch-0.2.4}/visualtorch/layered.py

@@ -1,5 +1,6 @@
 """Layered View module for pytorch model visualization."""
 
+# Copyright (C) 2020 Paul Gavrikov
 # Copyright (C) 2024 Willy Fitra Hendria
 # SPDX-License-Identifier: MIT
 

{visualtorch-0.2.2 → visualtorch-0.2.4}/visualtorch/utils/layer_utils.py

@@ -1,5 +1,6 @@
 """Layer Utils module for pytorch model visualization."""
 
+# Copyright (C) 2020 Paul Gavrikov
 # Copyright (C) 2024 Willy Fitra Hendria
 # SPDX-License-Identifier: MIT
 
@@ -184,8 +185,13 @@ def register_hook(
         m_key = "%s-%i" % (class_name, module_idx + 1)
         layers[m_key] = OrderedDict()
         layers[m_key]["module"] = module
-        if isinstance(out, list | tuple):
-            layers[m_key]["output_shape"] = tuple((-1,) + o.size()[1:] for o in out)
+        if isinstance(out, tuple):
+            if hasattr(out[0], "size"):
+                layers[m_key]["output_shape"] = out[0].size()
+            else:
+                layers[m_key]["output_shape"] = tuple(o.size() for o in out if hasattr(o, "size"))
+        elif isinstance(out, list):
+            layers[m_key]["output_shape"] = tuple(o.size() for o in out if hasattr(o, "size"))
         else:
             layers[m_key]["output_shape"] = out.size()
 

{visualtorch-0.2.2 → visualtorch-0.2.4}/visualtorch/utils/utils.py

@@ -1,5 +1,6 @@
 """Utils module for pytorch model visualization."""
 
+# Copyright (C) 2020 Paul Gavrikov
 # Copyright (C) 2024 Willy Fitra Hendria
 # SPDX-License-Identifier: MIT
 

{visualtorch-0.2.2 → visualtorch-0.2.4/visualtorch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: visualtorch
-Version: 0.2.2
+Version: 0.2.4
 Summary: Architecture visualization of Torch models
 Home-page: https://github.com/willyfh/visualtorch
 Author: Willy Fitra Hendria
@@ -14,6 +14,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+Provides-Extra: dev
 License-File: LICENSE
 
 <div align="center">
@@ -49,11 +50,11 @@ See the [Usage Examples page](https://visualtorch.readthedocs.io/en/latest/usage
 
 ## Contributing
 
-Please feel free to send a pull request to contribute to this project.
+Please feel free to send a pull request to contribute to this project by following this [guideline](https://github.com/willyfh/visualtorch/blob/main/CONTRIBUTING.md).
 
 ## License
 
-This poject is available as open source under the terms of the [MIT License](https://github.com/willyfh/visualtorch/blob/update-readme/LICENSE).
+This poject is available as open source under the terms of the [MIT License](https://github.com/willyfh/visualtorch/blob/main/LICENSE).
 
 Originally, this project was based on the [visualkeras](https://github.com/paulgavrikov/visualkeras) (under the MIT license), with additional modifications inspired by [pytorchviz](https://github.com/szagoruyko/pytorchviz), and [pytorch-summary](https://github.com/sksq96/pytorch-summary), both of which are also licensed under the MIT license.
 

visualtorch-0.2.4/visualtorch.egg-info/requires.txt

@@ -0,0 +1,18 @@
+pillow>=10.0.0
+numpy>=1.18.1
+aggdraw>=1.3.11
+torch>=2.0.0
+
+[dev]
+myst-parser
+nbsphinx
+pandoc
+sphinx<7.0
+sphinx_autodoc_typehints
+sphinx_book_theme
+sphinx-copybutton
+sphinx_design
+sphinx_gallery
+matplotlib
+pre-commit
+pytest

visualtorch-0.2.2/visualtorch.egg-info/requires.txt

@@ -1,4 +0,0 @@
-pillow>=10.0.0
-numpy>=1.18.1
-aggdraw>=1.3.11
-torch>=2.0.0