-
Notifications
You must be signed in to change notification settings - Fork 261
fix: handle Conv dtype mismatch under mixed-precision autocast #552
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -4080,6 +4080,10 @@ def replaced_tqdm(*args, **kwargs): | |||||||||
|
|
||||||||||
| patch_torch_functions() | ||||||||||
|
|
||||||||||
| _conv_modules = frozenset([ | ||||||||||
| "Conv1d", "Conv2d", "Conv3d", | ||||||||||
| "ConvTranspose1d", "ConvTranspose2d", "ConvTranspose3d", | ||||||||||
| ]) | ||||||||||
| for module in _patch_functions: | ||||||||||
| try: | ||||||||||
| source = eval(f"{model_location}.torch") | ||||||||||
|
|
@@ -4096,14 +4100,38 @@ def replaced_tqdm(*args, **kwargs): | |||||||||
| continue | ||||||||||
|
|
||||||||||
| source = inspect.getsource(function.forward).rstrip() | ||||||||||
|
|
||||||||||
| if module in _conv_modules: | ||||||||||
| # Conv modules: cast input to weight dtype before the conv op, | ||||||||||
| # then cast output back to original input dtype. This prevents | ||||||||||
| # dtype mismatches under mixed-precision autocast (eg bf16 | ||||||||||
| # weight + fp16 input crashes F.conv1d). | ||||||||||
| lines = source.split("\n") | ||||||||||
| def_line = lines[0] | ||||||||||
| body_lines = lines[1:] | ||||||||||
| first_body = next((l for l in body_lines if l.strip()), "") | ||||||||||
| body_indent = first_body[:len(first_body) - len(first_body.lstrip())] | ||||||||||
| prologue = [ | ||||||||||
| body_indent + "original_dtype = input.dtype", | ||||||||||
| body_indent + "input = input.to(self.weight.dtype)", | ||||||||||
| ] | ||||||||||
| source = "\n".join([def_line] + prologue + body_lines) | ||||||||||
| append_str = ".to(original_dtype)\n" | ||||||||||
| else: | ||||||||||
| # Norm modules: detect the actual parameter name (input or x) | ||||||||||
| import re as _re | ||||||||||
| m = _re.search(r"def forward\(self,\s*(\w+)", source) | ||||||||||
|
Comment on lines
+4122
to
+4123
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The
Suggested change
|
||||||||||
| param_name = m.group(1) if m else "input" | ||||||||||
| append_str = f".to({param_name}.dtype)\n" | ||||||||||
|
|
||||||||||
| forward = create_new_function( | ||||||||||
| module, | ||||||||||
| source, | ||||||||||
| model_location, | ||||||||||
| functions, | ||||||||||
| prepend=_license_header | ||||||||||
| + f"\ntorch_compile_options = {torch_compile_options}\n", | ||||||||||
| append=".to(input.dtype)\n", | ||||||||||
| append=append_str, | ||||||||||
| overwrite=False, | ||||||||||
| add_torch_compile=False, | ||||||||||
| ).forward | ||||||||||
|
|
||||||||||
Oops, something went wrong.
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.
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.
For improved robustness, consider using the dynamic parameter name detection for convolution modules as well. The current implementation hardcodes
input, which is correct for standardtorch.nn.Conv*layers, but applying the same dynamic approach you've used for normalization modules would make this code more resilient to custom convolution layers with different parameter names.