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

invrs_opt/__init__.py

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

invrs_opt/optimizers/lbfgsb.py

@@ -3,7 +3,6 @@
 Copyright (c) 2023 The INVRS-IO authors.
 """
 
-import copy
 import dataclasses
 from typing import Any, Dict, Optional, Sequence, Tuple, Union
 
@@ -28,6 +27,7 @@ from invrs_opt.parameterization import (
 NDArray = onp.ndarray[Any, Any]
 PyTree = Any
 ElementwiseBound = Union[NDArray, Sequence[Optional[float]]]
+NumpyLbfgsbDict = Dict[str, NDArray]
 JaxLbfgsbDict = Dict[str, jnp.ndarray]
 LbfgsbState = Tuple[int, PyTree, PyTree, JaxLbfgsbDict]
 
@@ -299,7 +299,7 @@ def parameterized_lbfgsb(
     def init_fn(params: PyTree) -> LbfgsbState:
         """Initializes the optimization state."""
 
-        def _init_state_pure(latent_params: PyTree) -> Tuple[PyTree, JaxLbfgsbDict]:
+        def _init_state_pure(latent_params: PyTree) -> Tuple[PyTree, NumpyLbfgsbDict]:
             lower_bound = types.extract_lower_bound(latent_params)
             upper_bound = types.extract_upper_bound(latent_params)
             scipy_lbfgsb_state = ScipyLbfgsbState.init(
@@ -312,7 +312,7 @@ def parameterized_lbfgsb(
                 gtol=gtol,
             )
             latent_params = _to_pytree(scipy_lbfgsb_state.x, latent_params)
-            return latent_params, scipy_lbfgsb_state.to_jax()
+            return latent_params, scipy_lbfgsb_state.to_dict()
 
         latent_params = _init_latents(params)
         metadata, latents = param_base.partition_density_metadata(latent_params)
@@ -346,7 +346,7 @@ def parameterized_lbfgsb(
             flat_latent_grad: PyTree,
             value: jnp.ndarray,
             jax_lbfgsb_state: JaxLbfgsbDict,
-        ) -> Tuple[PyTree, JaxLbfgsbDict]:
+        ) -> Tuple[PyTree, NumpyLbfgsbDict]:
             assert onp.size(value) == 1
             scipy_lbfgsb_state = ScipyLbfgsbState.from_jax(jax_lbfgsb_state)
             scipy_lbfgsb_state.update(
@@ -354,7 +354,7 @@ def parameterized_lbfgsb(
                 value=onp.array(value, dtype=onp.float64),
             )
             flat_latent_params = jnp.asarray(scipy_lbfgsb_state.x)
-            return flat_latent_params, scipy_lbfgsb_state.to_jax()
+            return flat_latent_params, scipy_lbfgsb_state.to_dict()
 
         step, _, latent_params, jax_lbfgsb_state = state
         metadata, latents = param_base.partition_density_metadata(latent_params)
@@ -696,31 +696,30 @@ class ScipyLbfgsbState:
         _validate_array_dtype(self._upper_bound, onp.float64)
         _validate_array_dtype(self._bound_type, int)
 
-    def to_jax(self) -> Dict[str, jnp.ndarray]:
+    def to_dict(self) -> NumpyLbfgsbDict:
         """Generates a dictionary of jax arrays defining the state."""
         return dict(
-            x=jnp.asarray(self.x),
-            converged=jnp.asarray(self.converged),
-            _maxcor=jnp.asarray(self._maxcor),
-            _line_search_max_steps=jnp.asarray(self._line_search_max_steps),
-            _ftol=jnp.asarray(self._ftol),
-            _gtol=jnp.asarray(self._gtol),
-            _wa=jnp.asarray(self._wa),
-            _iwa=jnp.asarray(self._iwa),
+            x=onp.asarray(self.x),
+            converged=onp.asarray(self.converged),
+            _maxcor=onp.asarray(self._maxcor),
+            _line_search_max_steps=onp.asarray(self._line_search_max_steps),
+            _ftol=onp.asarray(self._ftol),
+            _gtol=onp.asarray(self._gtol),
+            _wa=onp.asarray(self._wa),
+            _iwa=onp.asarray(self._iwa),
             _task=_array_from_s60_str(self._task),
             _csave=_array_from_s60_str(self._csave),
-            _lsave=jnp.asarray(self._lsave),
-            _isave=jnp.asarray(self._isave),
-            _dsave=jnp.asarray(self._dsave),
-            _lower_bound=jnp.asarray(self._lower_bound),
-            _upper_bound=jnp.asarray(self._upper_bound),
-            _bound_type=jnp.asarray(self._bound_type),
+            _lsave=onp.asarray(self._lsave),
+            _isave=onp.asarray(self._isave),
+            _dsave=onp.asarray(self._dsave),
+            _lower_bound=onp.asarray(self._lower_bound),
+            _upper_bound=onp.asarray(self._upper_bound),
+            _bound_type=onp.asarray(self._bound_type),
         )
 
     @classmethod
-    def from_jax(cls, state_dict: Dict[str, jnp.ndarray]) -> "ScipyLbfgsbState":
+    def from_jax(cls, state_dict: JaxLbfgsbDict) -> "ScipyLbfgsbState":
         """Converts a dictionary of jax arrays to a `ScipyLbfgsbState`."""
-        state_dict = copy.deepcopy(state_dict)
         return ScipyLbfgsbState(
             x=onp.array(state_dict["x"], dtype=onp.float64),
             converged=onp.asarray(state_dict["converged"], dtype=bool),
@@ -730,8 +729,8 @@ class ScipyLbfgsbState:
             _gtol=onp.asarray(state_dict["_gtol"], dtype=onp.float64),
             _wa=onp.array(state_dict["_wa"], onp.float64),
             _iwa=onp.array(state_dict["_iwa"], dtype=FORTRAN_INT),
-            _task=_s60_str_from_array(state_dict["_task"]),
-            _csave=_s60_str_from_array(state_dict["_csave"]),
+            _task=_s60_str_from_array(onp.asarray(state_dict["_task"])),
+            _csave=_s60_str_from_array(onp.asarray(state_dict["_csave"])),
             _lsave=onp.array(state_dict["_lsave"], dtype=FORTRAN_INT),
             _isave=onp.array(state_dict["_isave"], dtype=FORTRAN_INT),
             _dsave=onp.array(state_dict["_dsave"], dtype=onp.float64),
@@ -898,15 +897,15 @@ def _configure_bounds(
     )
 
 
-def _array_from_s60_str(s60_str: NDArray) -> jnp.ndarray:
+def _array_from_s60_str(s60_str: NDArray) -> NDArray:
     """Return a jax array for a numpy s60 string."""
     assert s60_str.shape == (1,)
     chars = [int(o) for o in s60_str[0]]
     chars.extend([32] * (59 - len(chars)))
-    return jnp.asarray(chars, dtype=int)
+    return onp.asarray(chars, dtype=int)
 
 
-def _s60_str_from_array(array: jnp.ndarray) -> NDArray:
+def _s60_str_from_array(array: NDArray) -> NDArray:
     """Return a numpy s60 string for a jax array."""
     return onp.asarray(
         [b"".join(int(i).to_bytes(length=1, byteorder="big") for i in array)],

{invrs_opt-0.9.2.dist-info → invrs_opt-0.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: invrs_opt
-Version: 0.9.2
+Version: 0.9.3
 Summary: Algorithms for inverse design
 Author-email: "Martin F. Schubert" <mfschubert@gmail.com>
 Maintainer-email: "Martin F. Schubert" <mfschubert@gmail.com>
@@ -513,7 +513,7 @@ Keywords: topology,optimization,jax,inverse design
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: jax
+Requires-Dist: jax<=0.4.35
 Requires-Dist: jaxlib
 Requires-Dist: numpy
 Requires-Dist: requests
@@ -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.2`
+`v0.9.3`
 
 ## Overview
 

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

@@ -1,11 +1,11 @@
-invrs_opt/__init__.py,sha256=KoyFNAkv9psGOf-zbhFORZI4io0O1AmGuMyCitqeLVg,585
+invrs_opt/__init__.py,sha256=tCzzgk3fRw4_HT8YLg6RlXIrvv19H11TGJngEGL5Iyk,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
 invrs_opt/experimental/labels.py,sha256=dQDAMPyFMV6mXnMy295z8Ap205DRdVzysXny_Be8FmY,562
 invrs_opt/optimizers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 invrs_opt/optimizers/base.py,sha256=-wNwH0J475y8FzB5aLAkc_1602LvYeF4Hddr9OiBkDY,1276
-invrs_opt/optimizers/lbfgsb.py,sha256=8BPiEAqececL-zLnqrgN0CogGDkAd1tyAGndUB-kahc,36349
+invrs_opt/optimizers/lbfgsb.py,sha256=9DrmyCj4Ny04NFVRUTz3pJypbw_j5Gw4wpKfe0WKEv4,36336
 invrs_opt/optimizers/wrapped_optax.py,sha256=VXdCteT2kumqhP81l3p6QiEqwBffoUuJ3UjrAyX5ToA,13468
 invrs_opt/parameterization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 invrs_opt/parameterization/base.py,sha256=BObzbz6efT2nBjib0_5BSdkCmFi2f0mcZ9VJYpDzO6Q,5278
@@ -13,8 +13,8 @@ invrs_opt/parameterization/filter_project.py,sha256=7Jb8JVENmBTdx3-XmI-VRm4aMjxg
 invrs_opt/parameterization/gaussian_levelset.py,sha256=Uagx7k69SWmass0YirD5JN8O4QDbwwKTBBjRfkIXvv8,24793
 invrs_opt/parameterization/pixel.py,sha256=AwC4GBNNOysdICvYHv_D2tZdqJmYiRzOUZNq_-R9Z70,1617
 invrs_opt/parameterization/transforms.py,sha256=8GzaIsUuuXvMCLiqAEEfxmi9qE9KqHzbuTj_m0GjH3w,8216
-invrs_opt-0.9.2.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-invrs_opt-0.9.2.dist-info/METADATA,sha256=vpWyCF9sTpxzWBqce-AESwaNmeEWBimlWPFHSIniJFk,32633
-invrs_opt-0.9.2.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-invrs_opt-0.9.2.dist-info/top_level.txt,sha256=hOziS2uJ_NgwaW9yhtOfeuYnm1X7vobPBcp_6eVWKfM,10
-invrs_opt-0.9.2.dist-info/RECORD,,
+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.2.dist-info → invrs_opt-0.9.3.dist-info}/WHEEL

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