invrs-opt 0.9.3__tar.gz → 0.9.4__tar.gz

{invrs_opt-0.9.3 → invrs_opt-0.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: invrs_opt
-Version: 0.9.3
+Version: 0.9.4
 Summary: Algorithms for inverse design
 Author-email: "Martin F. Schubert" <mfschubert@gmail.com>
 Maintainer-email: "Martin F. Schubert" <mfschubert@gmail.com>
@@ -533,7 +533,7 @@ Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 
 # invrs-opt - Optimization algorithms for inverse design
-`v0.9.3`
+`v0.9.4`
 
 ## Overview
 

{invrs_opt-0.9.3 → invrs_opt-0.9.4}/README.md

@@ -1,5 +1,5 @@
 # invrs-opt - Optimization algorithms for inverse design
-`v0.9.3`
+`v0.9.4`
 
 ## Overview
 

{invrs_opt-0.9.3 → invrs_opt-0.9.4}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 
 name = "invrs_opt"
-version = "v0.9.3"
+version = "v0.9.4"
 description = "Algorithms for inverse design"
 keywords = ["topology", "optimization", "jax", "inverse design"]
 readme = "README.md"

{invrs_opt-0.9.3 → invrs_opt-0.9.4}/src/invrs_opt/__init__.py

@@ -3,7 +3,7 @@
 Copyright (c) 2023 The INVRS-IO authors.
 """
 
-__version__ = "v0.9.3"
+__version__ = "v0.9.4"
 __author__ = "Martin F. Schubert <mfschubert@gmail.com>"
 
 from invrs_opt import parameterization as parameterization

{invrs_opt-0.9.3 → invrs_opt-0.9.4}/src/invrs_opt/parameterization/gaussian_levelset.py

@@ -218,34 +218,17 @@ def gaussian_levelset(
         pad_pixels: int = 2,
     ) -> jnp.ndarray:
         """Computes constraints associated with the params."""
-        length_scale_constraint, curvature_constraint = _levelset_constraints(
-            params,
-            beta=length_scale_constraint_beta,
+        return analytical_constraints(
+            params=params,
             length_scale_constraint_factor=length_scale_constraint_factor,
-            pad_pixels=pad_pixels,
-        )
-        fixed_pixel_constraint = _fixed_pixel_constraint(
-            params,
+            length_scale_constraint_beta=length_scale_constraint_beta,
+            length_scale_constraint_weight=length_scale_constraint_weight,
+            curvature_constraint_weight=curvature_constraint_weight,
+            fixed_pixel_constraint_weight=fixed_pixel_constraint_weight,
             mask_gradient=mask_gradient,
             pad_pixels=pad_pixels,
         )
 
-        constraints = jnp.stack(
-            [
-                length_scale_constraint * length_scale_constraint_weight,
-                curvature_constraint * curvature_constraint_weight,
-                fixed_pixel_constraint * fixed_pixel_constraint_weight,
-            ],
-            axis=-1,
-        )
-
-        # Normalize constraints to make them (somewhat) resolution-independent.
-        example_density = _example_density(params)
-        length_scale = 0.5 * (
-            example_density.minimum_spacing + example_density.minimum_width
-        )
-        return constraints / length_scale**2
-
     def update_fn(params: GaussianLevelsetParams, step: int) -> GaussianLevelsetParams:
         """Perform updates to `params` required for the given `step`."""
         del step
@@ -403,6 +386,46 @@ def _phi_from_params(
 # -----------------------------------------------------------------------------
 
 
+def analytical_constraints(
+    params: GaussianLevelsetParams,
+    length_scale_constraint_factor: float,
+    length_scale_constraint_beta: float,
+    length_scale_constraint_weight: float,
+    curvature_constraint_weight: float,
+    fixed_pixel_constraint_weight: float,
+    mask_gradient: bool,
+    pad_pixels: int,
+) -> jnp.ndarray:
+    """Computes analytical levelset constraints associated with the params."""
+    length_scale_constraint, curvature_constraint = _levelset_constraints(
+        params,
+        beta=length_scale_constraint_beta,
+        length_scale_constraint_factor=length_scale_constraint_factor,
+        pad_pixels=pad_pixels,
+    )
+    fixed_pixel_constraint = _fixed_pixel_constraint(
+        params,
+        mask_gradient=mask_gradient,
+        pad_pixels=pad_pixels,
+    )
+
+    constraints = jnp.stack(
+        [
+            length_scale_constraint * length_scale_constraint_weight,
+            curvature_constraint * curvature_constraint_weight,
+            fixed_pixel_constraint * fixed_pixel_constraint_weight,
+        ],
+        axis=-1,
+    )
+
+    # Normalize constraints to make them (somewhat) resolution-independent.
+    example_density = _example_density(params)
+    length_scale = 0.5 * (
+        example_density.minimum_spacing + example_density.minimum_width
+    )
+    return constraints / length_scale**2
+
+
 def _fixed_pixel_constraint(
     params: GaussianLevelsetParams,
     mask_gradient: bool,

{invrs_opt-0.9.3 → invrs_opt-0.9.4}/src/invrs_opt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: invrs_opt
-Version: 0.9.3
+Version: 0.9.4
 Summary: Algorithms for inverse design
 Author-email: "Martin F. Schubert" <mfschubert@gmail.com>
 Maintainer-email: "Martin F. Schubert" <mfschubert@gmail.com>
@@ -533,7 +533,7 @@ Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 
 # invrs-opt - Optimization algorithms for inverse design
-`v0.9.3`
+`v0.9.4`
 
 ## Overview