refactor: use jnp.take_along_axis for return_last_only indexing#588
Open
stanley1208 wants to merge 1 commit intogoogle-deepmind:mainfrom
Open
refactor: use jnp.take_along_axis for return_last_only indexing#588stanley1208 wants to merge 1 commit intogoogle-deepmind:mainfrom
stanley1208 wants to merge 1 commit intogoogle-deepmind:mainfrom
Conversation
Replace manual fancy indexing with jnp.take_along_axis in Transformer and Gemma3nTransformer, as requested by TODO(epot). Cleaner and avoids constructing an arange index array.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Resolves
TODO(epot): Use jnp.take_along_axisin bothTransformer.__call__andGemma3nTransformer.__call__.The
return_last_onlycode path previously used manual fancy indexing withjnp.arangeto select the last non-padded token per batch element. This replaces it withjnp.take_along_axis, which is cleaner and avoids constructing an index array.Changes
gemma/gm/nn/_transformer.py(line ~253): replacedx[jnp.arange(len(x)), idx, ...]withjnp.take_along_axis(x, idx[:, None, None], axis=1)+ squeezegemma/gm/nn/gemma3n/_transformer.py(line ~323): same changeTest plan
test_prefillpasses (exercisesreturn_last_only=Truevia the standard Transformer)test_samplerpasses (end-to-end sampling using prefill)test_last_onlypasses (directly testsreturn_last_onlyon Gemma3n)