Skip to content

Resolve TypeError and test failures in state_test_cpu by updating trace_to_jaxpr call sites to comply with the new API (strictly requiring debug_info). #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Resolve TypeError and test failures in state_test_cpu by updating trace_to_jaxpr call sites to comply with the new API (strictly requiring debug_info). #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions oryx/core/interpreters/harvest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,9 @@ def _get_harvest_metadata(closed_jaxpr, settings, *args):
in_avals = jax_util.safe_map(
lambda a: jax.typeof(a),
flat_args)
pe.trace_to_jaxpr_dynamic(flat_fun, in_avals)
pe.trace_to_jaxpr(
flat_fun, FlatTree.flatten_args(*in_avals), debug_info=flat_fun.debug_info
)
metadata = aux()
out_tree()
return metadata
Expand Down Expand Up @@ -1130,7 +1132,11 @@ def _reap_checkpoint_rule(trace, *invals, jaxpr, policy, prevent_cse,

@lu.cache
def _oryx_pjit_jaxpr(flat_fun, in_avals):
jaxpr, out_avals, consts = pe.trace_to_jaxpr_dynamic(flat_fun, in_avals)
closed_jaxpr, out_avals_tree = pe.trace_to_jaxpr(
flat_fun, FlatTree.flatten_args(*in_avals), debug_info=flat_fun.debug_info
)
jaxpr, consts = closed_jaxpr.jaxpr, closed_jaxpr.consts
out_avals = out_avals_tree.tree
if any(isinstance(c, jax_core.Tracer) for c in consts):
jaxpr = pe.convert_constvars_jaxpr(jaxpr)
jaxpr = pe.close_jaxpr(jaxpr)
Expand Down
9 changes: 6 additions & 3 deletions oryx/core/interpreters/propagate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,12 @@ def identity_reducer(env, eqn, state, new_state):

@lu.cache
def _to_jaxpr(flat_fun, in_avals):
new_jaxpr, _, consts = pe.trace_to_jaxpr_dynamic(flat_fun, in_avals)
new_jaxpr = jex.core.ClosedJaxpr(new_jaxpr, consts)
return new_jaxpr
from jax._src.tree_util import FlatTree

closed_jaxpr, _ = pe.trace_to_jaxpr(
flat_fun, FlatTree.flatten_args(*in_avals), debug_info=flat_fun.debug_info
)
return closed_jaxpr


def propagate(cell_type: Type[Cell],
Expand Down
9 changes: 6 additions & 3 deletions oryx/core/ppl/effect_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,12 @@ def default_call_interpreter_rule(primitive: jax_core.CallPrimitive,

@lu.cache
def _to_jaxpr(flat_fun, in_avals):
new_jaxpr, _, consts = pe.trace_to_jaxpr_dynamic(flat_fun, in_avals)
new_jaxpr = jex.core.ClosedJaxpr(new_jaxpr, consts)
return new_jaxpr
from jax._src.tree_util import FlatTree

closed_jaxpr, _ = pe.trace_to_jaxpr(
flat_fun, FlatTree.flatten_args(*in_avals), debug_info=flat_fun.debug_info
)
return closed_jaxpr


def _pjit_effect_handler_rule(rules, state, invals, **params):
Expand Down
9 changes: 6 additions & 3 deletions oryx/experimental/matching/jax_rewrite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,9 +697,12 @@ def __hash__(self):

@lu.cache
def _to_jaxpr(flat_fun, in_avals):
new_jaxpr, _, consts = pe.trace_to_jaxpr_dynamic(flat_fun, in_avals)
new_jaxpr = jex.core.ClosedJaxpr(new_jaxpr, consts)
return new_jaxpr
from jax._src.tree_util import FlatTree

closed_jaxpr, _ = pe.trace_to_jaxpr(
flat_fun, FlatTree.flatten_args(*in_avals), debug_info=flat_fun.debug_info
)
return closed_jaxpr


class PjitPrimitive(CallPrimitive):
Expand Down
Loading