[Enhancement] Change the order of condition to make fx wok #2883
Conversation
This file contains 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
zhouzaida
reviewed
Aug 3, 2023
tests/test_cnn/test_wrappers.py
Outdated
Comment on lines
388
to
396
| print(gm_module.code) | ||
| for Net in (Linear, ): | ||
| net = Net(1, 1) | ||
| gm_module = fx.symbolic_trace(net) | ||
| print(gm_module.code) | ||
| for Net in (Conv2d, ConvTranspose2d, Conv3d, ConvTranspose3d): | ||
| net = Net(1, 1, 1) | ||
| gm_module = fx.symbolic_trace(net) | ||
| print(gm_module.code) |
There was a problem hiding this comment.
Is it necessary to print the code?
There was a problem hiding this comment.
oh, that's used to supress the unused variable error.
There was a problem hiding this comment.
Oh, you can replace gm_module = fx.symbolic_trace(net) with fx.symbolic_trace(net).
There was a problem hiding this comment.
Fixed in fc883ec.
zhouzaida
reviewed
Aug 3, 2023
zhouzaida
changed the title
zhouzaida
approved these changes
Aug 3, 2023
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.
Motivation
mmcv.cnn.bricks.wrappershas many forward functions in the form ofif x.numel() == 0 and obsolete_torch_version(TORCH_VERSION, (1, 5)), where the first conditionx.numel() == 0would failtorch.fx. We can take advantage of shortcut evaluation, by changing the order of condition toif obsolete_torch_version(TORCH_VERSION, (1, 5)) and x.numel() == 0. This way, the torch_version compares first, and will not failtorch.fxin modern pytorch versions.Modification
Change the order of condition, and add tests for it.
BC-breaking (Optional)
This PR does not break any compatibility.