-
Notifications
You must be signed in to change notification settings - Fork 19.5k
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.
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
Fixing batch_dim_name attribute #20674
base: master
Are you sure you want to change the base?
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #20674 +/- ##
=======================================
Coverage 81.95% 81.96%
=======================================
Files 543 543
Lines 50664 50668 +4
Branches 7828 7830 +2
=======================================
+ Hits 41524 41528 +4
Misses 7246 7246
Partials 1894 1894
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
jax_distribution_lib.distribute_data_input, data, layouts | ||
jax_dist_data_input = partial( | ||
jax_distribution_lib.distribute_data_input, | ||
batch_dim_name=distribution._batch_dim_name, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we do this without accessing the private variable _batch_dim_name
? Could we consider passing the batch_dim_name
as an argument to the relevant functions? Or, maybe the distribution
object provides a public method or property to access the batch dimension name?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I'll think of a cleaner way.
The goal at this point is to get a second pair of eyes on this fix and validate it is correct. See use cases at the end of the intro paragraph. Also, since you implemented the multi-host code, could you check if this fix does not break it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, I'll run the internal multi-host test to make sure it still works.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will also need more tests. The failure is not in a complex case. This should have been covered by tests. I can add the a couple of tests on 8-core TPUs, but I'll let you extend them to multi-host settings.
But right now, what is your opinion on the case where model and data parallelism are used at the same time and the "batch" dimension is also a sharding dimension for the model, as is the default for Gemma and Llama? How should data batches be split in that case ? (And I don't think my fix covers that case - I'm not sure I understand how that case makes sense..).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I ran the internal multi-host test with your changes and it passed! I think we should be able to merge this PR after updating private variable usage (_batch_dim_name
).
Sharding along the batch dimension should work! Our multi-host tests test that and they pass! We test all the following configs:
@parameterized.named_parameters([
("data_only", (8, 1), 2, False,),
("data_model", (4, 2), 2, False,),
("model_data", (2, 4), 4, False,),
("model_only", (1, 8), 8, True,),
])
Could you point me to the colab that shows sharding along the batch dimension doesn't work for a 2D mesh?
I think what is not supported yet is 3D+ mesh. I agree that this would be a great feature to have. Maybe we can create a feature request issue and plan for supporting it.
PS: US holidays will start tomorrow and I'll be back after the new year! Happy Holidays, Martin!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All the repro colabs are in the intro.
The tests may be passing but if we don't understand the use case, it could be by accident. The thing I do not understand and that the fix does not cover is:
num_model_replicas_total = layout.mesh.shape[batch_dim_name]
mesh_model_dim_size = nb_devices / num_model_replicas_total # not actual code but it amounts to this
It seems to me that these expressions assume that the model is NOT sharded on the 'batch' dimension. It is only when the model is replicated on the 'batch' dimension and sharded on all other dimensions that the expression num_model_replicas_total = layout.mesh.shape[batch_dim_name]
is true. If the model is also sharded on the 'batch' dimension, I'm not sure how many model replicas there are ?
@martin-gorner Could you clarify what you meant by 'no coverage' in this context? |
I meant "convergence", i.e. the loss is not decreasing. |
@SamanehSaadat is this LGTM? |
Not yet! I'll tag you when it's ready. |
ModelParallel(batch_dim_name='batch')
is currently dysfunctional and will work only if batch_dim_name corresponds to the first dimension of the mesh, which is the default anyway. There is also a problem for meshes with 3 and more dimensions.Minimal repro 1 (showing error):
https://colab.research.google.com/drive/1jzmCZ2WNlKtD4j2heSaq-mxBoG-9WeeS?usp=sharing
Minimal repro 2 with a 3D mesh (showing error):
https://colab.research.google.com/drive/1AGku4hjwhTN_2h5yiU7Q-a6vvSrc8nRH
Real-world repro 1 (showing successful run with fix):
https://colab.research.google.com/drive/1cyn_XUFwdLUJE4pRNWPgZ2H5wzKzto-T?usp=sharing
Real-world repro 2 (showing a run without errors - but unfortunately no convergence):
https://colab.research.google.com/drive/1kY9qq27YxpowqYDT3gL98U5RuN6CYQ7b?usp=sharing
The use case is not just hypothetical.
With
DeviceMesh((4,2), ("model", "batch"))
, fine-tuning proceeds at 147ms/step.With
DeviceMesh((2,4), ("batch", "model"))
, fine-tuning proceeds at 205ms/step.The fix makes the first, faster use case work, as tested with the real-world repro 1 notebook on TPU v5e.
Remaining issues:
**
num_model_replicas_total = layout.mesh.shape[batch_dim_name]
i.e. the number of model replicas is the nb of devices along the "batch" axis of the mesh**
mesh_model_dim_size
computation: data is replicated as many times as there are unique model shards.