invrs-opt 0.9.3__py3-none-any.whl → 0.9.4__py3-none-any.whl

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/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.dist-info → invrs_opt-0.9.4.dist-info}/METADATA

@@ -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: pytest-cov; extra == "tests"
 Requires-Dist: pytest-subtests; extra == "tests"
 
 # invrs-opt - Optimization algorithms for inverse design
-`v0.9.3`
+`v0.9.4`
 
 ## Overview
 

{invrs_opt-0.9.3.dist-info → invrs_opt-0.9.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-invrs_opt/__init__.py,sha256=tCzzgk3fRw4_HT8YLg6RlXIrvv19H11TGJngEGL5Iyk,585
+invrs_opt/__init__.py,sha256=bVIs0NxPxNuRUOypBIE68qx-SA1lFCmqmo5cqvRpxmU,585
 invrs_opt/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 invrs_opt/experimental/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 invrs_opt/experimental/client.py,sha256=t4XxnditYbM9DWZeyBPj0Sa2acvkikT0ybhUdmH2r-Y,4852
@@ -10,11 +10,11 @@ invrs_opt/optimizers/wrapped_optax.py,sha256=VXdCteT2kumqhP81l3p6QiEqwBffoUuJ3Uj
 invrs_opt/parameterization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 invrs_opt/parameterization/base.py,sha256=BObzbz6efT2nBjib0_5BSdkCmFi2f0mcZ9VJYpDzO6Q,5278
 invrs_opt/parameterization/filter_project.py,sha256=7Jb8JVENmBTdx3-XmI-VRm4aMjxg_Wtin8tMKKKxWvQ,4309
-invrs_opt/parameterization/gaussian_levelset.py,sha256=Uagx7k69SWmass0YirD5JN8O4QDbwwKTBBjRfkIXvv8,24793
+invrs_opt/parameterization/gaussian_levelset.py,sha256=Ka4hW_OLxUaIPHQsyIOlryG7i1mC-LTIgiQQhCPwHPk,25626
 invrs_opt/parameterization/pixel.py,sha256=AwC4GBNNOysdICvYHv_D2tZdqJmYiRzOUZNq_-R9Z70,1617
 invrs_opt/parameterization/transforms.py,sha256=8GzaIsUuuXvMCLiqAEEfxmi9qE9KqHzbuTj_m0GjH3w,8216
-invrs_opt-0.9.3.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-invrs_opt-0.9.3.dist-info/METADATA,sha256=eMtr2aqWLeT2y6dOzEyETbNWbbeTzh2iCcfGu4G2cuQ,32641
-invrs_opt-0.9.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-invrs_opt-0.9.3.dist-info/top_level.txt,sha256=hOziS2uJ_NgwaW9yhtOfeuYnm1X7vobPBcp_6eVWKfM,10
-invrs_opt-0.9.3.dist-info/RECORD,,
+invrs_opt-0.9.4.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+invrs_opt-0.9.4.dist-info/METADATA,sha256=SOt6aECrbTQNI0QuznoPrWKzUdMeahaST0G4Q7sccxE,32641
+invrs_opt-0.9.4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+invrs_opt-0.9.4.dist-info/top_level.txt,sha256=hOziS2uJ_NgwaW9yhtOfeuYnm1X7vobPBcp_6eVWKfM,10
+invrs_opt-0.9.4.dist-info/RECORD,,

{invrs_opt-0.9.3.dist-info → invrs_opt-0.9.4.dist-info}/WHEEL

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