zoomy-core 0.1.6__tar.gz → 0.1.11__tar.gz

{zoomy_core-0.1.6 → zoomy_core-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zoomy_core
-Version: 0.1.6
+Version: 0.1.11
 Summary: A simulation software for dimensionally-reduced free surface flows.
 Author-email: Ingo Steldermann <steldermann@mbd.rwth-aachen.de>
 License: GNU
@@ -17,18 +17,20 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: attrs
-Requires-Dist: sympy>=1.13.3
+Requires-Dist: sympy>=1.14
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: loguru
+Requires-Dist: h5py
+Requires-Dist: matplotlib
+Requires-Dist: meshio
+Requires-Dist: pytest
 Provides-Extra: gui
 Requires-Dist: pyvista; extra == "gui"
 Requires-Dist: trame; extra == "gui"
 Requires-Dist: trame-vtk; extra == "gui"
 Requires-Dist: trame-vuetify; extra == "gui"
 Requires-Dist: panel; extra == "gui"
-Provides-Extra: hdf5
-Requires-Dist: h5py; extra == "hdf5"
 Provides-Extra: coupling
 Requires-Dist: precice; extra == "coupling"
 Provides-Extra: testing
@@ -37,12 +39,10 @@ Requires-Dist: pyswashes; extra == "testing"
 Provides-Extra: mesh
 Requires-Dist: gmsh; extra == "mesh"
 Requires-Dist: python-gmsh; extra == "mesh"
-Requires-Dist: meshio; extra == "mesh"
 Requires-Dist: rasterio; extra == "mesh"
 Provides-Extra: dev
 Requires-Dist: watchfiles; extra == "dev"
 Requires-Dist: Cython; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-html; extra == "dev"
 Dynamic: license-file
 

{zoomy_core-0.1.6 → zoomy_core-0.1.11}/library/zoomy_core/mesh/mesh.py

@@ -33,7 +33,6 @@ import zoomy_core.mesh.mesh_extrude as extrude
 import zoomy_core.mesh.mesh_util as mesh_util
 from zoomy_core.mesh.mesh_util import compute_subvolume, get_extruded_mesh_type
 from zoomy_core.misc.custom_types import CArray, FArray, IArray
-from zoomy_core.misc.static_class import register_static_pytree
 from zoomy_core.model.boundary_conditions import Periodic
 
 # petsc4py.init(sys.argv)
@@ -364,7 +363,6 @@ def _fill_neighborhood(dm, neighbors, max_neighbors, cStart=0):
         return _fill_neighborhood(dm, neighbors, max_neighbors, cStart=cStart)
 
 
-@register_static_pytree
 @define(slots=True, frozen=True)
 class Mesh:
     dimension: int

{zoomy_core-0.1.6 → zoomy_core-0.1.11}/library/zoomy_core/misc/io.py

@@ -370,7 +370,8 @@ def generate_vtk(
     filename="out",
     warp=False,
 ):
-    main_dir = os.getenv("ZOOMY_DIR")
+    # main_dir = os.getenv("ZOOMY_DIR")
+    main_dir = ""
     abs_filepath = os.path.join(main_dir, filepath)
     path = os.path.dirname(abs_filepath)
     full_filepath_out = os.path.join(path, filename)

{zoomy_core-0.1.6 → zoomy_core-0.1.11}/library/zoomy_core/misc/misc.py

@@ -12,7 +12,6 @@ from sympy import MatrixSymbol
 from sympy import MutableDenseNDimArray as ZArray
 
 from zoomy_core.misc.custom_types import FArray
-from zoomy_core.misc.static_class import register_static_pytree
 from zoomy_core.misc.logger_config import logger
 
 
@@ -20,7 +19,6 @@ from zoomy_core.misc.logger_config import logger
 
 
 
-@register_static_pytree
 @define(slots=True, frozen=False, kw_only=True)
 class Zstruct(SimpleNamespace):
     def __init__(self, **kwargs):
@@ -118,7 +116,6 @@ class Zstruct(SimpleNamespace):
         return cls(**d)
 
     
-@register_static_pytree
 @define(slots=True, frozen=False, kw_only=True)
 class Settings(Zstruct):
     """

{zoomy_core-0.1.6 → zoomy_core-0.1.11}/library/zoomy_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zoomy_core
-Version: 0.1.6
+Version: 0.1.11
 Summary: A simulation software for dimensionally-reduced free surface flows.
 Author-email: Ingo Steldermann <steldermann@mbd.rwth-aachen.de>
 License: GNU
@@ -17,18 +17,20 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: attrs
-Requires-Dist: sympy>=1.13.3
+Requires-Dist: sympy>=1.14
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: loguru
+Requires-Dist: h5py
+Requires-Dist: matplotlib
+Requires-Dist: meshio
+Requires-Dist: pytest
 Provides-Extra: gui
 Requires-Dist: pyvista; extra == "gui"
 Requires-Dist: trame; extra == "gui"
 Requires-Dist: trame-vtk; extra == "gui"
 Requires-Dist: trame-vuetify; extra == "gui"
 Requires-Dist: panel; extra == "gui"
-Provides-Extra: hdf5
-Requires-Dist: h5py; extra == "hdf5"
 Provides-Extra: coupling
 Requires-Dist: precice; extra == "coupling"
 Provides-Extra: testing
@@ -37,12 +39,10 @@ Requires-Dist: pyswashes; extra == "testing"
 Provides-Extra: mesh
 Requires-Dist: gmsh; extra == "mesh"
 Requires-Dist: python-gmsh; extra == "mesh"
-Requires-Dist: meshio; extra == "mesh"
 Requires-Dist: rasterio; extra == "mesh"
 Provides-Extra: dev
 Requires-Dist: watchfiles; extra == "dev"
 Requires-Dist: Cython; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-html; extra == "dev"
 Dynamic: license-file
 

{zoomy_core-0.1.6 → zoomy_core-0.1.11}/library/zoomy_core.egg-info/SOURCES.txt

@@ -21,7 +21,6 @@ library/zoomy_core/misc/interpolation.py
 library/zoomy_core/misc/io.py
 library/zoomy_core/misc/logger_config.py
 library/zoomy_core/misc/misc.py
-library/zoomy_core/misc/static_class.py
 library/zoomy_core/model/analysis.py
 library/zoomy_core/model/basefunction.py
 library/zoomy_core/model/basemodel.py

{zoomy_core-0.1.6 → zoomy_core-0.1.11}/library/zoomy_core.egg-info/requires.txt

@@ -1,8 +1,12 @@
 attrs
-sympy>=1.13.3
+sympy>=1.14
 numpy
 scipy
 loguru
+h5py
+matplotlib
+meshio
+pytest
 
 [coupling]
 precice
@@ -10,7 +14,6 @@ precice
 [dev]
 watchfiles
 Cython
-pytest
 pytest-html
 
 [gui]
@@ -20,13 +23,9 @@ trame-vtk
 trame-vuetify
 panel
 
-[hdf5]
-h5py
-
 [mesh]
 gmsh
 python-gmsh
-meshio
 rasterio
 
 [testing]

{zoomy_core-0.1.6 → zoomy_core-0.1.11}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "zoomy_core"
-version = "0.1.6"
+version = "0.1.11"
 description = "A simulation software for dimensionally-reduced free surface flows."
 readme = "README.md"
 requires-python = ">=3.9"
@@ -23,10 +23,14 @@ classifiers = [
 
 dependencies = [
   "attrs",
-  "sympy>=1.13.3",
+  "sympy>=1.14",
   "numpy",
   "scipy",
   "loguru",
+  "h5py",
+  "matplotlib",
+  "meshio",
+  "pytest",
 ]
 
 
@@ -38,9 +42,6 @@ gui = [
   "trame-vuetify",
   "panel",
 ]
-hdf5 = [
-  "h5py",
-]
 coupling = [
   "precice",
 ]
@@ -51,13 +52,11 @@ testing = [
 mesh = [
   "gmsh",
   "python-gmsh",
-  "meshio",
   "rasterio"
 ]
 dev = [
   "watchfiles",
   "Cython",
-  "pytest", 
   "pytest-html"
 ]
 

zoomy_core-0.1.6/library/zoomy_core/misc/static_class.py

@@ -1,96 +0,0 @@
-import attrs
-from functools import partial
-from typing import Any, Tuple, Type
-import attr
-
-try:
-    import jax
-    import jax.numpy as jnp
-
-    _HAVE_JAX = True
-except ImportError:
-    import numpy as jnp
-
-    _HAVE_JAX = False
-
-
-def register_static_pytree(cls: Type[Any]) -> Type[Any]:
-    """
-    Class decorator that registers the class as a JAX pytree node,
-    treating all member variables as static.
-
-    Parameters:
-    cls (Type[Any]): The class to register.
-
-    Returns:
-    Type[Any]: The registered class.
-    """
-    if not _HAVE_JAX:
-        # no-op decorator
-        return cls
-    if not attrs.has(cls):
-        raise TypeError(
-            "register_static_pytree can only be applied to classes decorated with @attrs.define or @attr.s"
-        )
-
-    # Extract field names from attrs
-    field_names = [field.name for field in attrs.fields(cls)]
-
-    # Define the flatten function
-    def flatten(instance: Any) -> Tuple[Tuple, Tuple]:
-        aux_data = tuple(getattr(instance, name) for name in field_names)
-        children = ()  # No dynamic children since all are static
-        return children, aux_data
-
-    # Define the unflatten function
-    def unflatten(aux_data: Tuple, children: Tuple) -> Any:
-        return cls(*aux_data)
-
-    # Register the class as a pytree node with JAX
-    jax.tree_util.register_pytree_node(cls, flatten, unflatten)
-
-    return cls
-
-
-# 2. Define the Mesh class using attrs and the decorator
-@register_static_pytree
-@attrs.define(frozen=True)
-class Mesh:
-    x: jnp.ndarray
-    y: jnp.ndarray
-    # Use factory for mutable default fields
-    z: jnp.ndarray = attr.field(factory=lambda: jnp.array([0.0]))
-    # Example additional fields
-    w: jnp.ndarray = attr.field(factory=lambda: jnp.array([[1.0, 2.0], [3.0, 4.0]]))
-    description: str = "Default Mesh Description"
-
-
-# 3. Define the SpaceOperator class with JAX's jit
-class SpaceOperator:
-    @partial(jax.jit, static_argnums=(0,))  # Marks 'self' as static
-    def solve(self, q: jnp.ndarray, mesh: Mesh) -> jnp.ndarray:
-        """
-        Example operation: Element-wise multiplication of mesh.x with q,
-        then add mesh.y for demonstration.
-        """
-        return mesh.x * q + mesh.y
-
-
-if __name__ == "__main__":
-    # Create mesh data using JAX arrays
-    x = jnp.linspace(0, 1, 10)
-    y = jnp.linspace(1, 2, 10)
-    # Initialize Mesh with x and y; z and w use default_factory
-    mesh = Mesh(x, y)
-
-    # Initialize the operator
-    space_op = SpaceOperator()
-
-    # Define the input Q as a JAX array
-    Q = jnp.linspace(0, 1, 10)
-
-    # Use the solve method
-    Q_result = space_op.solve(Q, mesh)
-
-    # Print the result
-    print("Q_result:", Q_result)