Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
python-version: ["3.10"]
python-version: ["3.9", "3.10"]

steps:
- name: Checkout repository
Expand Down
5 changes: 1 addition & 4 deletions deer/deer_iter.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,6 @@ def deer_iteration_jvp(
inv_lin2 = partial(inv_lin, gts)
_, grad_yt = jax.jvp(inv_lin2, (rhs0, inv_lin_params), (grad_func, grad_inv_lin_params))

# Create the tangent for is_converged
is_converged_tangent = jnp.zeros_like(is_converged, dtype=jax.dtypes.float0)

result = Result(yt, success=is_converged)
grad_result = Result(grad_yt, success=is_converged_tangent)
grad_result = Result(grad_yt)
return result, grad_result
3 changes: 1 addition & 2 deletions deer/froot.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ def newton_iter_jvp(
_, grad_func = jax.jvp(func_partial_y, (params,), (grad_params,))

grad_y = jnp.linalg.solve(jac, -grad_func) # (ny,)
is_converged_tangent = jnp.zeros_like(is_converged, dtype=jax.dtypes.float0)
result = Result(yt, is_converged)
grad_result = Result(grad_y, success=is_converged_tangent)
grad_result = Result(grad_y)
return result, grad_result
3 changes: 0 additions & 3 deletions deer/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ def __init__(self, value: jnp.ndarray, success: Union[bool, None, jnp.ndarray] =
success = jnp.full_like(value, True, dtype=jnp.bool)
elif isinstance(success, bool):
success = jnp.full_like(value, success, dtype=jnp.bool)
elif hasattr(success, "dtype") and success.dtype == jax.dtypes.float0:
# The Bool outputs of `jax.custom_jvp` requires tangents with `float0` type since jax 0.4.34.
success = jnp.full_like(value, success, dtype=jax.dtypes.float0)
elif isinstance(success, jnp.ndarray):
assert success.dtype == jnp.bool
success = jnp.broadcast_to(success, value.shape)
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
author_email='muhammad@machine-discovery.com',
license='BSD-3',
packages=find_packages(),
python_requires=">=3.10",
python_requires=">=3.9",
install_requires=[
"jaxlib>=0.4.28",
"jax>=0.4.34",
"jaxlib<=0.4.30",
"jax[cuda12]<=0.4.30",
"numpy>=1.24.0",
"scipy>=1.10.1",
"equinox>=0.10.6",
Expand Down
Loading