pyMOTO 1.5.1__py3-none-any.whl → 1.5.1b1__py3-none-any.whl

pymoto/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.5.1'
+__version__ = '1.5.1-beta1'
 
 from .common.domain import DomainDefinition
 

pymoto/common/domain.py

@@ -288,7 +288,7 @@ class DomainDefinition:
             patch.set_path(self.get_path(x + u, y + v))
 
     # flake8: noqa: C901
-    def write_to_vti(self, vectors: dict, filename="out.vti", scale=1.0, origin=(0.0, 0.0, 0.0)):
+    def write_to_vti(self, vectors: dict, filename="out.vti", scale=1.0):
         """ Write all given vectors to a Paraview (VTI) file
 
         The size of the vectors should be a multiple of ``nel`` or ``nnodes``. Based on their size they are marked as
@@ -300,7 +300,6 @@ class DomainDefinition:
             vectors: A dictionary of vectors to write. Keys are used as vector names.
             filename (str): The file loction
             scale: Uniform scaling of the gridpoints
-            origin: Origin of the domain
         """
         ext = '.vti'
         if ext not in os.path.splitext(filename)[-1].lower():
@@ -337,7 +336,7 @@ class DomainDefinition:
             file.write(f"<ImageData WholeExtent=\"0 {self.nelx} 0 {self.nely} 0 {self.nelz}\"".encode())
 
             # Origin of domain
-            file.write(f" Origin=\"{origin[0]*scale} {origin[1]*scale} {origin[2]*scale}\"".encode())
+            file.write(f" Origin=\"{self.origin[0]*scale} {self.origin[1]*scale} {self.origin[2]*scale}\"".encode())
 
             # Spacing of points (dx, dy, dz)
             dx, dy, dz = self.element_size[0:3]*scale

pymoto/core_objects.py

@@ -5,6 +5,7 @@ import time
 import copy
 from typing import Union, List, Any
 from abc import ABC, abstractmethod
+from collections.abc import Callable
 from .utils import _parse_to_list, _concatenate_to_array, _split_from_array
 
 
@@ -325,30 +326,54 @@ def _is_valid_module(mod: Any):
     return False
 
 
-def _check_function_signature(fn, signals):
+# Type definition for bound method
+class BoundMethod:
+    __self__: object
+
+
+BoundMethodT = Union[Callable, BoundMethod]
+
+
+def _check_function_signature(fn: BoundMethodT, signals: list = None) -> (int, int):
     """ Checks the function signature against given signal list
-    :param fn: response_ or sensitivity_ function of a Module
-    :param signals: The signals involved
+
+    - Only positional-only or positional-or-keyword arguments are allowed
+      (https://peps.python.org/pep-0362/#parameter-object)
+    - If `signals` is provided, the number of them is compared with the allowed min/max number of arguments
+
+    Args:
+        fn: response_ or sensitivity_ function of a Module
+        signals (optional): The signals involved, which are checked with the function signature
+
+    Returns:
+        (min_args, max_args): Minimum and maximum number of accepted arguments to the function;
+          `None` denotes an unlimited number of maximum arguments (caused by `*args`)
     """
     min_args, max_args = 0, 0
     callstr = f"{type(fn.__self__).__name__}.{fn.__name__}{inspect.signature(fn)}"
+    # Loop over all the parameters defined for the function
     for s, p in inspect.signature(fn).parameters.items():
         if p.kind == inspect.Parameter.POSITIONAL_ONLY or p.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD:
-            if p.default != inspect.Parameter.empty:
-                raise SyntaxError(f"{callstr} must not have default values \"{p}\"")
-            min_args += 1
-            if max_args >= 0:
+            if p.default == inspect.Parameter.empty:
+                # No default argument is provided, a value MUST be provided
+                min_args += 1
+            if max_args is not None:
                 max_args += 1
         elif p.kind == inspect.Parameter.VAR_POSITIONAL:
-            max_args = -1
+            # If *args is passed, the maximum number of arguments is unknown. Does not affect minimum number
+            max_args = None
         elif p.kind == inspect.Parameter.KEYWORD_ONLY:
-            raise SyntaxError(f"{callstr} may not contain keyword arguments \"{p}\"")
+            raise SyntaxError(f"{callstr} may not contain keyword-only arguments \"{p}\"")
         elif p.kind == inspect.Parameter.VAR_KEYWORD:
-            raise SyntaxError(f"{callstr} may not contain \"{p}\"")
-    if len(signals) < min_args:
-        raise TypeError(f"Not enough arguments ({len(signals)}) for {callstr}")
-    if max_args >= 0 and len(signals) > max_args:
-        raise TypeError(f"Too many arguments ({len(signals)}) for {callstr}")
+            raise SyntaxError(f"{callstr} may not contain dict of keyword-only arguments \"{p}\"")
+
+    # Check with signal list
+    if signals is not None:
+        if len(signals) < min_args:
+            raise TypeError(f"Not enough arguments ({len(signals)}) for {callstr}; expected {min_args}")
+        if max_args is not None and len(signals) > max_args:
+            raise TypeError(f"Too many arguments ({len(signals)}) for {callstr}; expected {max_args}")
+    return min_args, max_args
 
 
 class RegisteredClass(object):
@@ -522,8 +547,12 @@ class Module(ABC, RegisteredClass):
             raise type(e)(str(e) + "\n\t| Above error was raised when calling response(). Module details:" +
                           self._err_str(fn=self._response)).with_traceback(sys.exc_info()[2])
 
-    def __call__(self):
-        return self.response()
+    def __call__(self, *args):
+        if len(args) == 0 and len(self.sig_in) > 0:
+            inp = [s.state for s in self.sig_in]
+            return self._response(*inp)
+        else:
+            return self._response(*args)
 
     def sensitivity(self):
         """  Calculate sensitivities using backpropagation

pymoto/modules/io.py

@@ -1,13 +1,9 @@
 import os
-import platform
 import numbers
-import sys
 from pathlib import Path
 import numpy as np
-if platform.system() == 'Darwin':  # Avoid "Python is not installed as a framework (Mac OS X)" error
-    # Change backend
-    import matplotlib
-    matplotlib.use('TkAgg')
+import matplotlib
+matplotlib.use('TkAgg')  # Change default backend -- TkAgg does not freeze during calculations
 import matplotlib.pyplot as plt
 
 from pymoto import Module

{pyMOTO-1.5.1.dist-info → pymoto-1.5.1b1.dist-info}/METADATA

@@ -1,29 +1,37 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyMOTO
-Version: 1.5.1
-Summary: A modular approach for topology optimization
-Home-page: https://github.com/aatmdelissen/pyMOTO
-Author: Arnoud Delissen
-Author-email: arnouddelissen+pymoto@gmail.com
-License: MIT License
-Keywords: topology optimization,generative design,structural,sensitivities,derivatives,framework,modular,blocks,pipeline
+Version: 1.5.1b1
+Summary: A modular approach to topology optimization
+Author-email: Arnoud Delissen <arnouddelissen+pymoto@gmail.com>
+License: MIT
+Project-URL: Homepage, https://pymoto.readthedocs.io/
+Project-URL: Code, https://github.com/aatmdelissen/pyMOTO
+Project-URL: Documentation, https://pymoto.readthedocs.io/
+Project-URL: Issues, https://github.com/aatmdelissen/pyMOTO/issues
+Project-URL: Release notes, https://github.com/aatmdelissen/pyMOTO/releases/latest
+Keywords: topology optimization,generative design,sensitivity analysis,gradients,finite element method,structural optimization,mechanics,engineering
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Science/Research
+Classifier: Topic :: Scientific/Engineering
+Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Topic :: Scientific/Engineering
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
-Requires-Dist: scipy >=1.7
+Requires-Dist: scipy>=1.7
 Requires-Dist: sympy
 Requires-Dist: matplotlib
 Provides-Extra: dev
-Requires-Dist: flake8 ; extra == 'dev'
-Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: cvxopt ; extra == 'dev'
-Requires-Dist: scikit-sparse ; extra == 'dev'
-Requires-Dist: pypardiso ; extra == 'dev'
-Requires-Dist: jax[cpu] ; extra == 'dev'
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: cvxopt; extra == "dev"
+Requires-Dist: scikit-sparse; extra == "dev"
+Requires-Dist: pypardiso; extra == "dev"
+Requires-Dist: opt-einsum; extra == "dev"
+Requires-Dist: jax[cpu]; extra == "dev"
+Dynamic: license-file
 
 [![10.5281/zenodo.8138859](https://zenodo.org/badge/DOI/10.5281/zenodo.8138859.svg)](https://doi.org/10.5281/zenodo.8138859) 
 [![anaconda.org/aatmdelissen/pymoto](https://anaconda.org/aatmdelissen/pymoto/badges/version.svg)](https://anaconda.org/aatmdelissen/pymoto)

{pyMOTO-1.5.1.dist-info → pymoto-1.5.1b1.dist-info}/RECORD

@@ -1,8 +1,8 @@
-pymoto/__init__.py,sha256=i4B3bc954raAJs0lh0vycgWQ3n6FQCL5oKllmaHtt8M,2058
-pymoto/core_objects.py,sha256=JDY5OBnzSnmXp35-gY_Gqawjh6C2x8dL1cEV8KAW944,27343
+pymoto/__init__.py,sha256=csgRTVQ2B0pIbQZYvpmL4RDcKYVoyc-vaio3UzlaQ-s,2064
+pymoto/core_objects.py,sha256=Amxn-338Igm2BT1O76wr6GgftQ3vgldj-aqHhJodGfA,28579
 pymoto/routines.py,sha256=inz5GbSnvmbD3WKmaNKATTc_SthKsAMPuRc8Jaub4xs,15568
 pymoto/utils.py,sha256=YJ-PNLJLc12Yx6TYCrEechS2aaBRx0o4mTM1soeeyz0,1122
-pymoto/common/domain.py,sha256=1peaQJuePBZCWjW2oMhRxlhOl1FuhthEE1aWW9dMumk,18168
+pymoto/common/domain.py,sha256=lstnJ-ITqtjLMQljoc5gN3XVgdFa7gXlMNWiG7IfcR4,18118
 pymoto/common/dyadcarrier.py,sha256=Q0MCIP4b-W_RuYxynvY-voCHfeZ4oF12ykAuVUnmLq4,19433
 pymoto/common/mma.py,sha256=SaFdZhpL5uoQRLWxQrElcjRMzGG4CL3BcPc77z3eMVE,24612
 pymoto/modules/aggregation.py,sha256=Oi17hIJ6dic4lOPw16zmjbdC72MjB6XK34H80bnbWAI,7580
@@ -11,7 +11,7 @@ pymoto/modules/autodiff.py,sha256=WAfoAOHBSozf7jbr9gQz9Vw4a_2G9wGJxLMMqUQP0Co,16
 pymoto/modules/complex.py,sha256=B_Obk-ABdV66lEudZ5s8o6qG9NsmYlBsX-PbWvbphhc,4429
 pymoto/modules/filter.py,sha256=6X9FaQMWYZ_TpHVTFiEibzlmAwmSWbydYM93LFrJ0Wo,25490
 pymoto/modules/generic.py,sha256=YzsGZ8J0oLCORt78Bf2p0v4GuqpWRI77NLoCk7gqidw,10666
-pymoto/modules/io.py,sha256=BHJgS5IvFTiYYH4cXqRwSid1bfB58HOQs_jhFeLbb3A,13639
+pymoto/modules/io.py,sha256=nWhXlDc3l-g-5GEY50yRLbbDAy7pay5Tm92pSgLfUIw,13553
 pymoto/modules/linalg.py,sha256=GIMqcIfVsMib5nIwrhx4sPT6-auLiHBJjbKCAdulLLE,22005
 pymoto/modules/scaling.py,sha256=uq88HHW9rP16XLz7UGc3CNBBpY2Z1glo8yjYxZEnXUg,2327
 pymoto/solvers/__init__.py,sha256=9JUeD2SgZbkYFullA7s7s6SuAVv0onqAqJ8hFvNOs2g,1033
@@ -21,9 +21,8 @@ pymoto/solvers/iterative.py,sha256=hfMRw2LChupr4sQf8qUKG6OHjhpeVAp6C9N7M4-845M,1
 pymoto/solvers/matrix_checks.py,sha256=bbrfjpTSWWnuQW3xY0_CYE8yrh5gA9K5b1LzHEOFAxI,1663
 pymoto/solvers/solvers.py,sha256=Srn44oRonZIjJq-XVpJY9KoTWV0R7zBWFaSmXKWsUCw,11870
 pymoto/solvers/sparse.py,sha256=BPw-2Q4lgbmtjCl8eLEmDdWhjqD7RSLrVYy_kQN_LdU,17144
-pyMOTO-1.5.1.dist-info/LICENSE,sha256=ZXMC2Txpzs-dBwz9Me4_1rQCSVl4P1B27MomNi43F30,1072
-pyMOTO-1.5.1.dist-info/METADATA,sha256=_ZZ3mHjsLTWtdHuM2k8VcO2t3xF6gt67gFVFHibXMJ8,5062
-pyMOTO-1.5.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-pyMOTO-1.5.1.dist-info/top_level.txt,sha256=EdvAUSmFMaiqhuEZW8jxANMiK-LdPtlmDWL6SfmCdUU,7
-pyMOTO-1.5.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pyMOTO-1.5.1.dist-info/RECORD,,
+pymoto-1.5.1b1.dist-info/licenses/LICENSE,sha256=ZXMC2Txpzs-dBwz9Me4_1rQCSVl4P1B27MomNi43F30,1072
+pymoto-1.5.1b1.dist-info/METADATA,sha256=Xt0HY8PX1nI1W1_xiWZNkin3vVXNenx-mvhMhn0F2wY,5510
+pymoto-1.5.1b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymoto-1.5.1b1.dist-info/top_level.txt,sha256=EdvAUSmFMaiqhuEZW8jxANMiK-LdPtlmDWL6SfmCdUU,7
+pymoto-1.5.1b1.dist-info/RECORD,,

{pyMOTO-1.5.1.dist-info → pymoto-1.5.1b1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pyMOTO-1.5.1.dist-info/zip-safe

@@ -1 +0,0 @@
-