Skip to content

[pmap] Remove conditional jax.config.jax_pmap_shmap_merge logic as part of last phase of jax.pmap clean-up. #336

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

[pmap] Remove conditional jax.config.jax_pmap_shmap_merge logic as part of last phase of jax.pmap clean-up. #336

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
19 changes: 2 additions & 17 deletions learned_optimization/tasks/es_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,7 @@ def fn(theta, *args, es_key=None, **kwargs):
if has_aux:
losses, aux = aux_and_losses
if not vec_aux:
# Avoid degraded performance under the new jax.pmap. See
# https://docs.jax.dev/en/latest/migrate_pmap.html#int-indexing-into-sharded-arrays.
if jax.config.jax_pmap_shmap_merge:
aux = jax.tree_util.tree_map(
lambda x: x.addressable_shards[0].data.squeeze(0),
aux_and_losses[1],
)
else:
aux = jax.tree_util.tree_map(lambda x: x[0], aux_and_losses[1])
aux = jax.tree_util.tree_map(lambda x: x[0], aux_and_losses[1])
else:
losses = aux_and_losses

Expand Down Expand Up @@ -166,14 +158,7 @@ def new_vmap(key):
keys = jax.random.split(es_key, n_pairs)
if has_aux:
(value, aux), grad = jax.vmap(new_vmap)(keys)
# Avoid degraded performance under the new jax.pmap. See
# https://docs.jax.dev/en/latest/migrate_pmap.html#int-indexing-into-sharded-arrays.
if jax.config.jax_pmap_shmap_merge:
aux = jax.tree_util.tree_map(
lambda x: x.addressable_shards[0].data.squeeze(0), aux
)
else:
aux = jax.tree_util.tree_map(lambda x: x[0], aux)
aux = jax.tree_util.tree_map(lambda x: x[0], aux)
else:
value, grad = jax.vmap(new_vmap)(keys)

Expand Down
Loading