emerge 0.6.11__tar.gz → 1.0.1__tar.gz

{emerge-0.6.11 → emerge-1.0.1}/.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.6.11"
+current_version = "1.0.1"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{emerge-0.6.11 → emerge-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emerge
-Version: 0.6.11
+Version: 1.0.1
 Summary: An open source EM FEM simulator in Python
 Project-URL: Homepage, https://github.com/FennisRobert/EMerge
 Project-URL: Issues, https://github.com/FennisRobert/EMerge/issues
@@ -20,6 +20,8 @@ Provides-Extra: cudss
 Requires-Dist: cupy-cuda12x; extra == 'cudss'
 Requires-Dist: nvidia-cudss-cu12; extra == 'cudss'
 Requires-Dist: nvmath-python[cu12]; extra == 'cudss'
+Provides-Extra: dxf
+Requires-Dist: ezdxf; extra == 'dxf'
 Provides-Extra: umfpack
 Requires-Dist: scikit-umfpack; (sys_platform != 'win32') and extra == 'umfpack'
 Description-Content-Type: text/markdown
@@ -82,17 +84,13 @@ To run this FEM library you need the following libraries
  - numba
  - matplotlib (for the matplotlib base display)
  - pyvista (for the PyVista base display)
- - numba-progress
+ - cloudpickle
  - mkl (x86 devices only)
 
 Optional:
  - scikit-umfpack
  - cudss
 
-## NOTICE
+## Resources / Manual
 
-First time runs will be very slow because Numba needs to generate local C-compiled functions of the assembler and other mathematical functions. These compilations are chached so this should only take time once.
-
-## Third Party License Notice
-
-“This package depends on Intel® Math Kernel Library (MKL), which is licensed separately under the Intel Simplified Software License (October 2022). Installing with pip will fetch the MKL wheel and prompt you to accept that licence.”
+You can find the latest versions of the manual on: **https://www.emerge-software.com/resources/**

{emerge-0.6.11 → emerge-1.0.1}/README.md

@@ -56,17 +56,13 @@ To run this FEM library you need the following libraries
  - numba
  - matplotlib (for the matplotlib base display)
  - pyvista (for the PyVista base display)
- - numba-progress
+ - cloudpickle
  - mkl (x86 devices only)
 
 Optional:
  - scikit-umfpack
  - cudss
 
-## NOTICE
+## Resources / Manual
 
-First time runs will be very slow because Numba needs to generate local C-compiled functions of the assembler and other mathematical functions. These compilations are chached so this should only take time once.
-
-## Third Party License Notice
-
-“This package depends on Intel® Math Kernel Library (MKL), which is licensed separately under the Intel Simplified Software License (October 2022). Installing with pip will fetch the MKL wheel and prompt you to accept that licence.”
+You can find the latest versions of the manual on: **https://www.emerge-software.com/resources/**

{emerge-0.6.11 → emerge-1.0.1}/emerge/__init__.py

@@ -18,7 +18,7 @@ along with this program; if not, see
 """
 import os
 
-__version__ = "0.6.11"
+__version__ = "1.0.1"
 
 ############################################################
 #               HANDLE ENVIRONMENT VARIABLES              #
@@ -27,7 +27,7 @@ __version__ = "0.6.11"
 NTHREADS = "1"
 os.environ["EMERGE_STD_LOGLEVEL"] = os.getenv("EMERGE_STD_LOGLEVEL", default="INFO")
 os.environ["EMERGE_FILE_LOGLEVEL"] = os.getenv("EMERGE_FILE_LOGLEVEL", default="DEBUG")
-os.environ["OMP_NUM_THREADS"] = os.getenv("OMP_NUM_THREADS", default="4")
+os.environ["OMP_NUM_THREADS"] = os.getenv("OMP_NUM_THREADS", default="1")
 os.environ["MKL_NUM_THREADS"] = os.getenv("MKL_NUM_THREADS", default="4")
 os.environ["OPENBLAS_NUM_THREADS"] = NTHREADS
 os.environ["VECLIB_MAXIMUM_THREADS"] = NTHREADS

{emerge-0.6.11 → emerge-1.0.1}/emerge/_emerge/bc.py

@@ -83,7 +83,7 @@ class BoundaryCondition:
             raise ValueError(f'All tags must have the same dimension, instead its {tags}')
         dimension = tags[0][0]
         if self.dimension is BCDimension.ANY:
-            logger.info(f'Assigning dimension {BCDimension(dimension)} to {self}')
+            logger.info(f'Assigning {self} to dimension{BCDimension(dimension)}')
             self.dimension = BCDimension(dimension)
         elif self.dimension != BCDimension(dimension):
             raise ValueError(f'Current boundary condition has dimension {self.dimension}, but tags have dimension {BCDimension(dimension)}')
@@ -131,6 +131,13 @@ class BoundaryConditionSet:
         self.boundary_conditions: list[BoundaryCondition] = []
         self._initialized: bool = False
     
+    def cleanup(self) -> None:
+        """ Removes non assigned boundary conditions"""
+        logger.trace("Cleaning up boundary conditions.")
+        toremove = [bc for bc in self.boundary_conditions if len(bc.tags)==0]
+        logger.trace(f"Removing: {toremove}")
+        self.boundary_conditions = [bc for bc in self.boundary_conditions if len(bc.tags)>0]
+        
     def _construct_bc(self, constructor: type) -> type:
         def constr(*args, **kwargs):
             obj = constructor(*args, **kwargs)
@@ -201,8 +208,6 @@ class BoundaryConditionSet:
 
         bc.add_tags(bc.selection.dimtags)
 
-        logger.info('Excluding other possible boundary conditions')
-
         for existing_bc in self.boundary_conditions:
             excluded = existing_bc.exclude_bc(bc)
             if excluded:

emerge-1.0.1/emerge/_emerge/cacherun.py

@@ -0,0 +1,79 @@
+# inside your module, e.g. utils.py
+import os
+import sys
+
+import ast
+import textwrap
+from pathlib import Path
+
+
+def _is_plain_check_run(test: ast.AST) -> bool:
+    """True only for a bare call to check_run() as the entire if-test."""
+    if not isinstance(test, ast.Call) or test.args or test.keywords:
+        return False
+    f = test.func
+    return (
+        isinstance(f, ast.Attribute) and f.attr == "cache_run"
+    ) or (
+        isinstance(f, ast.Name) and f.id == "cache_run"
+    )
+
+def get_run_block_str(source: str) -> str:
+    """
+    Return all source text before the first `if check_run():` / `if *.check_run():`.
+    Returns None if no matching if-statement exists.
+    """
+    tree = ast.parse(source)
+    candidates = [n for n in ast.walk(tree) if isinstance(n, ast.If) and _is_plain_check_run(n.test)]
+    if not candidates:
+        return None
+    first = min(candidates, key=lambda n: n.lineno)
+    lines = source.splitlines(keepends=True)
+    return "".join(lines[: first.lineno - 1])
+
+
+def get_build_block_str(source: str) -> str | None:
+    """Return the code string inside the first `if *.checkrun(...):` block, or None."""
+    tree = ast.parse(source)
+    for node in ast.walk(tree):
+        if isinstance(node, ast.If) and isinstance(node.test, ast.Call):
+            f = node.test.func
+            called = (isinstance(f, ast.Attribute) and f.attr == "cache_build") or \
+                     (isinstance(f, ast.Name) and f.id == "cache_build")
+            if called and node.body:
+                start = node.body[0].lineno - 1           # 0-based start line
+                end = node.body[-1].end_lineno            # 1-based end line (inclusive)
+                lines = source.splitlines()
+                block = "\n".join(lines[start:end])
+                return textwrap.dedent(block)
+    return None
+
+def entry_script_path():
+    main = sys.modules.get("__main__")
+    # Most normal runs: python path/to/app.py
+    if main and hasattr(main, "__file__"):
+        return os.path.abspath(main.__file__)
+    # Fallbacks (e.g. python -m pkg.mod)
+    if sys.argv and sys.argv[0] not in ("", "-c"):
+        return os.path.abspath(sys.argv[0])
+    # Interactive sessions, notebooks, or embedded interpreters
+    return None
+
+
+def get_build_section() -> str:
+    """ Returns the string section inside the check_build() if statement"""
+    name = entry_script_path()
+
+    lines = get_build_block_str(Path(name).read_text())
+    return lines
+
+def get_run_section() -> str:
+    """Return sthe string section before the check_run() if statement
+
+    Returns:
+        str: _description_
+    """
+    name = entry_script_path()
+
+    lines = get_run_block_str(Path(name).read_text())
+    return lines

{emerge-0.6.11 → emerge-1.0.1}/emerge/_emerge/geo/__init__.py

@@ -15,7 +15,7 @@
 # along with this program; if not, see
 # <https://www.gnu.org/licenses/>.
 
-from .pcb import PCB
+from .pcb import PCB, PCBLayer
 from .pmlbox import pmlbox
 from .horn import Horn
 from .shapes import Cylinder, CoaxCylinder, Box, XYPlate, HalfSphere, Sphere, Plate, OldBox, Alignment, Cone