invrs-opt 0.10.5__tar.gz → 0.10.7__tar.gz

{invrs_opt-0.10.5 → invrs_opt-0.10.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: invrs_opt
-Version: 0.10.5
+Version: 0.10.7
 Summary: Algorithms for inverse design
 Author-email: "Martin F. Schubert" <mfschubert@gmail.com>
 Maintainer-email: "Martin F. Schubert" <mfschubert@gmail.com>
@@ -531,6 +531,7 @@ Requires-Dist: bump-my-version; extra == "dev"
 Requires-Dist: darglint; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Dynamic: license-file
 
 # invrs-opt - Optimization algorithms for inverse design
 ![Continuous integration](https://github.com/invrs-io/opt/actions/workflows/build-ci.yml/badge.svg)

{invrs_opt-0.10.5 → invrs_opt-0.10.7}/pyproject.toml

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

{invrs_opt-0.10.5 → invrs_opt-0.10.7}/src/invrs_opt/__init__.py

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

{invrs_opt-0.10.5 → invrs_opt-0.10.7}/src/invrs_opt/optimizers/lbfgsb.py

@@ -380,10 +380,9 @@ def parameterized_lbfgsb(
         _, vjp_fn = jax.vjp(_params_from_latents, latents)
         (latents_grad,) = vjp_fn(grad)
 
-        if not (
-            tree_util.tree_structure(latents_grad)
-            == tree_util.tree_structure(latents)  # type: ignore[operator]
-        ):
+        treedef = tree_util.tree_structure(latents_grad)
+        expected_treedef = tree_util.tree_structure(latents)
+        if not treedef == expected_treedef:  # type: ignore[operator]
             raise ValueError(
                 f"Tree structure of `latents_grad` was different than expected, got \n"
                 f"{tree_util.tree_structure(latents_grad)} but expected \n"

{invrs_opt-0.10.5 → invrs_opt-0.10.7}/src/invrs_opt/optimizers/wrapped_optax.py

@@ -218,10 +218,9 @@ def parameterized_wrapped_optax(
         _, vjp_fn = jax.vjp(_params_from_latents, latents)
         (latents_grad,) = vjp_fn(grad)
 
-        if not (
-            tree_util.tree_structure(latents_grad)
-            == tree_util.tree_structure(latents)  # type: ignore[operator]
-        ):
+        treedef = tree_util.tree_structure(latents_grad)
+        expected_treedef = tree_util.tree_structure(latents)
+        if not treedef == expected_treedef:  # type: ignore[operator]
             raise ValueError(
                 f"Tree structure of `latents_grad` was different than expected, got \n"
                 f"{tree_util.tree_structure(latents_grad)} but expected \n"

{invrs_opt-0.10.5 → invrs_opt-0.10.7}/src/invrs_opt/parameterization/base.py

@@ -124,6 +124,22 @@ class Density2DMetadata:
         self.periodic = tuple(self.periodic)
         self.symmetries = tuple(self.symmetries)
 
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, Density2DMetadata):
+            return False
+        if not (
+            self.lower_bound == other.lower_bound
+            and self.upper_bound == other.upper_bound
+            and _arrays_equal_or_both_none(self.fixed_solid, other.fixed_solid)
+            and _arrays_equal_or_both_none(self.fixed_void, other.fixed_void)
+            and self.minimum_width == other.minimum_width
+            and self.minimum_spacing == other.minimum_spacing
+            and self.periodic == other.periodic
+            and self.symmetries == other.symmetries
+        ):
+            return False
+        return True
+
     @classmethod
     def from_density(self, density: types.Density2DArray) -> "Density2DMetadata":
         density_metadata_dict = dataclasses.asdict(density)
@@ -131,6 +147,21 @@ class Density2DMetadata:
         return Density2DMetadata(**density_metadata_dict)
 
 
+def _arrays_equal_or_both_none(a: Optional[Array], b: Optional[Array]) -> bool:
+    """Return `True` if `a` and `b` are equal arrays or both `None`."""
+    if (a is None, b is None) not in ((True, True), (False, False)):
+        return False
+    if a is None and b is None:
+        return True
+    assert isinstance(a, onp.ndarray)
+    assert isinstance(b, onp.ndarray)
+    if a.dtype != b.dtype:
+        return False
+    if a.shape != b.shape:
+        return False
+    return bool(onp.all(a == b))
+
+
 def _flatten_density_2d_metadata(
     metadata: Density2DMetadata,
 ) -> Tuple[

{invrs_opt-0.10.5 → invrs_opt-0.10.7}/src/invrs_opt/parameterization/gaussian_levelset.py

@@ -388,7 +388,7 @@ def _phi_from_params(
     assert array.shape[-2] % s_factor == 0
     assert array.shape[-1] % s_factor == 0
     array = symmetry.symmetrize(array, tuple(example_density.symmetries))
-    return array
+    return jnp.asarray(array)
 
 
 # -----------------------------------------------------------------------------
@@ -619,49 +619,12 @@ def _levelset_threshold(
 ) -> jnp.ndarray:
     """Thresholds a level set function `phi`."""
     if mask_gradient:
-        interface = _interface_pixels(phi, periodic)
+        interface = transforms.interface_pixels(phi, periodic)
         phi = jnp.where(interface, phi, jax.lax.stop_gradient(phi))
     thresholded = (phi > 0).astype(float) + (phi - jax.lax.stop_gradient(phi))
     return thresholded
 
 
-def _interface_pixels(phi: jnp.ndarray, periodic: Tuple[bool, bool]) -> jnp.ndarray:
-    """Identifies interface pixels of a level set function `phi`."""
-    batch_shape = phi.shape[:-2]
-    phi = phi.reshape((-1,) + phi.shape[-2:])
-
-    pad_mode = (
-        "wrap" if periodic[0] else "edge",
-        "wrap" if periodic[1] else "edge",
-    )
-    pad_width = ((1, 1), (1, 1))
-
-    kernel = jnp.asarray([[0, 1, 0], [1, 0, 1], [0, 1, 0]], dtype=float)
-
-    solid = phi > 0
-    void = ~solid
-
-    solid_padded = transforms.pad2d(solid, pad_width, pad_mode)
-    num_solid_adjacent = transforms.conv(
-        x=solid_padded[:, jnp.newaxis, :, :].astype(float),
-        kernel=kernel[jnp.newaxis, jnp.newaxis, :, :],
-        padding="VALID",
-    )
-    num_solid_adjacent = jnp.squeeze(num_solid_adjacent, axis=1)
-
-    void_padded = transforms.pad2d(void, pad_width, pad_mode)
-    num_void_adjacent = transforms.conv(
-        x=void_padded[:, jnp.newaxis, :, :].astype(float),
-        kernel=kernel[jnp.newaxis, jnp.newaxis, :, :],
-        padding="VALID",
-    )
-    num_void_adjacent = jnp.squeeze(num_void_adjacent, axis=1)
-
-    interface = solid & (num_void_adjacent > 0) | void & (num_solid_adjacent > 0)
-
-    return interface.reshape(batch_shape + interface.shape[-2:])
-
-
 def _downsample_spatial_dims(x: jnp.ndarray, downsample_factor: int) -> jnp.ndarray:
     """Downsamples the two trailing axes of `x` by `downsample_factor`."""
     shape = x.shape[:-2] + (

{invrs_opt-0.10.5 → invrs_opt-0.10.7}/src/invrs_opt/parameterization/transforms.py

@@ -231,3 +231,40 @@ def box_downsample(x: jnp.ndarray, shape: Tuple[int, ...]) -> jnp.ndarray:
     axes = list(range(1, 2 * x.ndim, 2))
     x = x.reshape(shape)
     return jnp.mean(x, axis=axes)
+
+
+def interface_pixels(phi: jnp.ndarray, periodic: Tuple[bool, bool]) -> jnp.ndarray:
+    """Identifies interface pixels of a level set function `phi`."""
+    batch_shape = phi.shape[:-2]
+    phi = phi.reshape((-1,) + phi.shape[-2:])
+
+    pad_mode = (
+        "wrap" if periodic[0] else "edge",
+        "wrap" if periodic[1] else "edge",
+    )
+    pad_width = ((1, 1), (1, 1))
+
+    kernel = jnp.asarray([[0, 1, 0], [1, 0, 1], [0, 1, 0]], dtype=float)
+
+    solid = phi > 0
+    void = ~solid
+
+    solid_padded = pad2d(solid, pad_width, pad_mode)
+    num_solid_adjacent = conv(
+        x=solid_padded[:, jnp.newaxis, :, :].astype(float),
+        kernel=kernel[jnp.newaxis, jnp.newaxis, :, :],
+        padding="VALID",
+    )
+    num_solid_adjacent = jnp.squeeze(num_solid_adjacent, axis=1)
+
+    void_padded = pad2d(void, pad_width, pad_mode)
+    num_void_adjacent = conv(
+        x=void_padded[:, jnp.newaxis, :, :].astype(float),
+        kernel=kernel[jnp.newaxis, jnp.newaxis, :, :],
+        padding="VALID",
+    )
+    num_void_adjacent = jnp.squeeze(num_void_adjacent, axis=1)
+
+    interface = solid & (num_void_adjacent > 0) | void & (num_solid_adjacent > 0)
+
+    return interface.reshape(batch_shape + interface.shape[-2:])

{invrs_opt-0.10.5 → invrs_opt-0.10.7}/src/invrs_opt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: invrs_opt
-Version: 0.10.5
+Version: 0.10.7
 Summary: Algorithms for inverse design
 Author-email: "Martin F. Schubert" <mfschubert@gmail.com>
 Maintainer-email: "Martin F. Schubert" <mfschubert@gmail.com>
@@ -531,6 +531,7 @@ Requires-Dist: bump-my-version; extra == "dev"
 Requires-Dist: darglint; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Dynamic: license-file
 
 # invrs-opt - Optimization algorithms for inverse design
 ![Continuous integration](https://github.com/invrs-io/opt/actions/workflows/build-ci.yml/badge.svg)