[Reland] Clean Up MobileOptimizerType Rewrite Flags Public API and Documentation #92081

salilsdesai · 2023-01-12T16:58:44Z

Summary:
X-link: facebookresearch/d2go#459

Reland of D41690203 (370df96)

Remove MobileOptimizerType and all rewrite flags from torch.X and torch._C.X to clean up torch.X and torch._C.X namespaces

The affected rewrite flags are

CONV_BN_FUSION
FUSE_ADD_RELU
HOIST_CONV_PACKED_PARAMS
INSERT_FOLD_PREPACK_OPS
REMOVE_DROPOUT
VULKAN_AUTOMATIC_GPU_TRANSFER

Bc-Breaking Change:

Before this change, the rewrite flags were accessible through all of

torch.utils.mobile_optimizer.MobileOptimizerType.X
torch._C.MobileOptimizerType.X
torch.X
torch.MobileOptimizerType.X
torch._C.X

But after this change, only torch.utils.mobile_optimizer.MobileOptimizerType.X (option 1 above) and the newly added torch._C._MobileOptimizerType.X remain

Corresponding updates to PyTorch Tutorial Docs are in pytorch/tutorials#2163

Test Plan:
buck test caffe2/test:test_mobile_optimizer

Summary
  Pass: 6
  Skip: 1
    ↻ caffe2/test:test_mobile_optimizer - test_mobilenet_optimize_for_mobile (test_mobile_optimizer.TestOptimizer)
  ListingSuccess: 1
Finished test run: https://www.internalfb.com/intern/testinfra/testrun/4222124793514412

buck test caffe2/torch/fb/mobile/tests:model_exporter_tests
Tests pass

With temporary testing changes in D41690204:

buck run caffe2:test_rewrite_flags_api
Before:

torch.utils.mobile_optimizer.MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER
        Expected: ✅ | Result: ✅
torch._C._MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER
        Expected: ✅ | Result: ❌ (module 'torch._C' has no attribute '_MobileOptimizerType')
torch._C.MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER
        Expected: ❌ | Result: ✅
torch.VULKAN_AUTOMATIC_GPU_TRANSFER
        Expected: ❌ | Result: ✅
torch.MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER
        Expected: ❌ | Result: ✅
torch._C.VULKAN_AUTOMATIC_GPU_TRANSFER
        Expected: ❌ | Result: ✅

After:

torch.utils.mobile_optimizer.MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER
        Expected: ✅ | Result: ✅
torch._C._MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER
        Expected: ✅ | Result: ✅
torch._C.MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER
        Expected: ❌ | Result: ❌ (module 'torch._C' has no attribute 'MobileOptimizerType')
torch.VULKAN_AUTOMATIC_GPU_TRANSFER
        Expected: ❌ | Result: ❌ (module 'torch' has no attribute 'VULKAN_AUTOMATIC_GPU_TRANSFER')
torch.MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER
        Expected: ❌ | Result: ❌ (module 'torch' has no attribute 'MobileOptimizerType')
torch._C.VULKAN_AUTOMATIC_GPU_TRANSFER
        Expected: ❌ | Result: ❌ (module 'torch._C' has no attribute 'VULKAN_AUTOMATIC_GPU_TRANSFER')

buck test caffe2/test:public_bindings -- test_no_new_bindings

Summary
  Pass: 1
  ListingSuccess: 1
Finished test run: https://www.internalfb.com/intern/testinfra/testrun/7881299473114294

Reviewed By: SS-JIA

Differential Revision: D42442395

pytorch-bot · 2023-01-12T16:58:48Z

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/92081

📄 Preview Python docs built from this PR
📄 Preview C++ docs built from this PR
❓ Need help or want to give feedback on the CI? Visit the bot commands wiki or our office hours

Note: Links to docs will display an error until the docs builds have been completed.

❌ 1 Failures

As of commit ab88cce:

NEW FAILURES - The following jobs have failed:

macos-12-py3-arm64 / test (default, 1, 2, macos-m1-12)

This comment was automatically generated by Dr. CI and updates every 15 minutes.

facebook-github-bot · 2023-01-12T16:59:49Z

This pull request was exported from Phabricator. Differential Revision: D42442395

albanD

SGTM

Summary: X-link: pytorch/pytorch#92081 Pull Request resolved: facebookresearch#459 Reland of D41690203 (facebookresearch@18de6ff) Remove MobileOptimizerType and all rewrite flags from torch.X and torch._C.X to clean up torch.X and torch._C.X namespaces The affected rewrite flags are - CONV_BN_FUSION - FUSE_ADD_RELU - HOIST_CONV_PACKED_PARAMS - INSERT_FOLD_PREPACK_OPS - REMOVE_DROPOUT - VULKAN_AUTOMATIC_GPU_TRANSFER Bc-Breaking Change: Before this change, the rewrite flags were accessible through all of 1. torch.utils.mobile_optimizer.MobileOptimizerType.X 2. torch._C.MobileOptimizerType.X 3. torch.X 4. torch.MobileOptimizerType.X 5. torch._C.X But after this change, only torch.utils.mobile_optimizer.MobileOptimizerType.X (option 1 above) and the newly added torch._C._MobileOptimizerType.X remain Corresponding updates to PyTorch Tutorial Docs are in pytorch/tutorials#2163 Reviewed By: SS-JIA Differential Revision: D42442395 fbshipit-source-id: eab0c0b9dcd83b42ccd9b01da31d595b3a453bbf

facebook-github-bot · 2023-01-12T21:14:29Z

This pull request was exported from Phabricator. Differential Revision: D42442395

Summary: X-link: pytorch/pytorch#92081 Pull Request resolved: facebookresearch#459 Reland of D41690203 (facebookresearch@18de6ff) Remove MobileOptimizerType and all rewrite flags from torch.X and torch._C.X to clean up torch.X and torch._C.X namespaces The affected rewrite flags are - CONV_BN_FUSION - FUSE_ADD_RELU - HOIST_CONV_PACKED_PARAMS - INSERT_FOLD_PREPACK_OPS - REMOVE_DROPOUT - VULKAN_AUTOMATIC_GPU_TRANSFER Bc-Breaking Change: Before this change, the rewrite flags were accessible through all of 1. torch.utils.mobile_optimizer.MobileOptimizerType.X 2. torch._C.MobileOptimizerType.X 3. torch.X 4. torch.MobileOptimizerType.X 5. torch._C.X But after this change, only torch.utils.mobile_optimizer.MobileOptimizerType.X (option 1 above) and the newly added torch._C._MobileOptimizerType.X remain Corresponding updates to PyTorch Tutorial Docs are in pytorch/tutorials#2163 Reviewed By: SS-JIA Differential Revision: D42442395 fbshipit-source-id: 403f70209ff1bf536a06f0e8dea1771b40270e88

facebook-github-bot · 2023-01-13T17:18:07Z

This pull request was exported from Phabricator. Differential Revision: D42442395

…cumentation (pytorch#92081) Summary: Pull Request resolved: pytorch#92081 X-link: facebookresearch/d2go#459 Reland of D41690203 (pytorch@370df96) Remove MobileOptimizerType and all rewrite flags from torch.X and torch._C.X to clean up torch.X and torch._C.X namespaces The affected rewrite flags are - CONV_BN_FUSION - FUSE_ADD_RELU - HOIST_CONV_PACKED_PARAMS - INSERT_FOLD_PREPACK_OPS - REMOVE_DROPOUT - VULKAN_AUTOMATIC_GPU_TRANSFER Bc-Breaking Change: Before this change, the rewrite flags were accessible through all of 1. torch.utils.mobile_optimizer.MobileOptimizerType.X 2. torch._C.MobileOptimizerType.X 3. torch.X 4. torch.MobileOptimizerType.X 5. torch._C.X But after this change, only torch.utils.mobile_optimizer.MobileOptimizerType.X (option 1 above) and the newly added torch._C._MobileOptimizerType.X remain Corresponding updates to PyTorch Tutorial Docs are in pytorch/tutorials#2163 Test Plan: ```buck test caffe2/test:test_mobile_optimizer``` ``` Summary Pass: 6 Skip: 1 ↻ caffe2/test:test_mobile_optimizer - test_mobilenet_optimize_for_mobile (test_mobile_optimizer.TestOptimizer) ListingSuccess: 1 Finished test run: https://www.internalfb.com/intern/testinfra/testrun/4222124793514412 ``` ___ ```buck test caffe2/torch/fb/mobile/tests:model_exporter_tests``` Tests pass ___ With temporary testing changes in D41690204: ```buck run caffe2:test_rewrite_flags_api``` Before: ``` torch.utils.mobile_optimizer.MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER Expected: ✅ | Result: ✅ torch._C._MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER Expected: ✅ | Result: ❌ (module 'torch._C' has no attribute '_MobileOptimizerType') torch._C.MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER Expected: ❌ | Result: ✅ torch.VULKAN_AUTOMATIC_GPU_TRANSFER Expected: ❌ | Result: ✅ torch.MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER Expected: ❌ | Result: ✅ torch._C.VULKAN_AUTOMATIC_GPU_TRANSFER Expected: ❌ | Result: ✅ ``` After: ``` torch.utils.mobile_optimizer.MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER Expected: ✅ | Result: ✅ torch._C._MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER Expected: ✅ | Result: ✅ torch._C.MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER Expected: ❌ | Result: ❌ (module 'torch._C' has no attribute 'MobileOptimizerType') torch.VULKAN_AUTOMATIC_GPU_TRANSFER Expected: ❌ | Result: ❌ (module 'torch' has no attribute 'VULKAN_AUTOMATIC_GPU_TRANSFER') torch.MobileOptimizerType.VULKAN_AUTOMATIC_GPU_TRANSFER Expected: ❌ | Result: ❌ (module 'torch' has no attribute 'MobileOptimizerType') torch._C.VULKAN_AUTOMATIC_GPU_TRANSFER Expected: ❌ | Result: ❌ (module 'torch._C' has no attribute 'VULKAN_AUTOMATIC_GPU_TRANSFER') ``` ```buck test caffe2/test:public_bindings -- test_no_new_bindings``` ``` Summary Pass: 1 ListingSuccess: 1 Finished test run: https://www.internalfb.com/intern/testinfra/testrun/7881299473114294 ``` Reviewed By: SS-JIA Differential Revision: D42442395 fbshipit-source-id: 65d2f6ce4b014f2cf38e9b7d24935aae43d0fc6a

Summary: X-link: pytorch/pytorch#92081 Pull Request resolved: facebookresearch#459 Reland of D41690203 (facebookresearch@18de6ff) Remove MobileOptimizerType and all rewrite flags from torch.X and torch._C.X to clean up torch.X and torch._C.X namespaces The affected rewrite flags are - CONV_BN_FUSION - FUSE_ADD_RELU - HOIST_CONV_PACKED_PARAMS - INSERT_FOLD_PREPACK_OPS - REMOVE_DROPOUT - VULKAN_AUTOMATIC_GPU_TRANSFER Bc-Breaking Change: Before this change, the rewrite flags were accessible through all of 1. torch.utils.mobile_optimizer.MobileOptimizerType.X 2. torch._C.MobileOptimizerType.X 3. torch.X 4. torch.MobileOptimizerType.X 5. torch._C.X But after this change, only torch.utils.mobile_optimizer.MobileOptimizerType.X (option 1 above) and the newly added torch._C._MobileOptimizerType.X remain Corresponding updates to PyTorch Tutorial Docs are in pytorch/tutorials#2163 Reviewed By: SS-JIA Differential Revision: D42442395 fbshipit-source-id: 09ebc51e8c3e7116854aa347459cd80819441046

facebook-github-bot · 2023-01-13T22:29:32Z

This pull request was exported from Phabricator. Differential Revision: D42442395

Summary: X-link: pytorch/pytorch#92081 Pull Request resolved: #459 Reland of D41690203 (18de6ff) Remove MobileOptimizerType and all rewrite flags from torch.X and torch._C.X to clean up torch.X and torch._C.X namespaces The affected rewrite flags are - CONV_BN_FUSION - FUSE_ADD_RELU - HOIST_CONV_PACKED_PARAMS - INSERT_FOLD_PREPACK_OPS - REMOVE_DROPOUT - VULKAN_AUTOMATIC_GPU_TRANSFER Bc-Breaking Change: Before this change, the rewrite flags were accessible through all of 1. torch.utils.mobile_optimizer.MobileOptimizerType.X 2. torch._C.MobileOptimizerType.X 3. torch.X 4. torch.MobileOptimizerType.X 5. torch._C.X But after this change, only torch.utils.mobile_optimizer.MobileOptimizerType.X (option 1 above) and the newly added torch._C._MobileOptimizerType.X remain Corresponding updates to PyTorch Tutorial Docs are in pytorch/tutorials#2163 Reviewed By: SS-JIA Differential Revision: D42442395 fbshipit-source-id: 14500b3667f541fd1ec85b1624125120176c6fd0

facebook-github-bot · 2023-01-14T17:02:14Z

@pytorchbot merge

(Initiating merge automatically since Phabricator Diff has merged)

pytorchmergebot · 2023-01-14T17:05:54Z

Merge started

Your change will be merged once all checks pass (ETA 0-4 Hours).

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging

Check the merge workflow status
here

salilsdesai requested a review from albanD as a code owner January 12, 2023 16:58

pytorch-bot bot added the release notes: jit release notes category label Jan 12, 2023

facebook-github-bot added the fb-exported label Jan 12, 2023

salilsdesai mentioned this pull request Jan 12, 2023

[Reland] Clean Up MobileOptimizerType Rewrite Flags Public API and Documentation facebookresearch/d2go#459

Closed

salilsdesai changed the title ~~[Reland] Clean Up MobileOptimizerType Rewrite Flags Public API and Documentation (#459)~~ [Reland] Clean Up MobileOptimizerType Rewrite Flags Public API and Documentation Jan 12, 2023

albanD approved these changes Jan 12, 2023

View reviewed changes

salilsdesai force-pushed the export-D42442395 branch from 4b23778 to 29e9f61 Compare January 12, 2023 21:14

salilsdesai force-pushed the export-D42442395 branch from 29e9f61 to 491ab0a Compare January 13, 2023 17:18

salilsdesai force-pushed the export-D42442395 branch from 491ab0a to ab88cce Compare January 13, 2023 22:29

pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Jan 14, 2023

pytorchmergebot added the Merged label Jan 14, 2023

pytorchmergebot closed this in da43584 Jan 14, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Reland] Clean Up MobileOptimizerType Rewrite Flags Public API and Documentation #92081

[Reland] Clean Up MobileOptimizerType Rewrite Flags Public API and Documentation #92081

Uh oh!

salilsdesai commented Jan 12, 2023

Uh oh!

pytorch-bot bot commented Jan 12, 2023 •

edited

Loading

Uh oh!

facebook-github-bot commented Jan 12, 2023

Uh oh!

albanD left a comment

Uh oh!

facebook-github-bot commented Jan 12, 2023

Uh oh!

facebook-github-bot commented Jan 13, 2023

Uh oh!

facebook-github-bot commented Jan 13, 2023

Uh oh!

facebook-github-bot commented Jan 14, 2023

Uh oh!

pytorchmergebot commented Jan 14, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

[Reland] Clean Up MobileOptimizerType Rewrite Flags Public API and Documentation #92081

[Reland] Clean Up MobileOptimizerType Rewrite Flags Public API and Documentation #92081

Uh oh!

Conversation

salilsdesai commented Jan 12, 2023

Uh oh!

pytorch-bot bot commented Jan 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/92081

❌ 1 Failures

Uh oh!

facebook-github-bot commented Jan 12, 2023

Uh oh!

albanD left a comment

Choose a reason for hiding this comment

Uh oh!

facebook-github-bot commented Jan 12, 2023

Uh oh!

facebook-github-bot commented Jan 13, 2023

Uh oh!

facebook-github-bot commented Jan 13, 2023

Uh oh!

facebook-github-bot commented Jan 14, 2023

Uh oh!

pytorchmergebot commented Jan 14, 2023

Merge started

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

pytorch-bot bot commented Jan 12, 2023 •

edited

Loading