[quant][qat] Ensure fake_quant and observer can be disabled on scriptmodule #44773

supriyar · 2020-09-16T04:34:09Z

Stack from ghstack:

[quant] Add quant APIs to save/load observer state_dict #44846 [quant] Add quant APIs to save/load observer state_dict
[quant][qat] Ensure fake_quant and observer can be disabled on scriptmodule #44773 [quant][qat] Ensure fake_quant and observer can be disabled on scriptmodule
[quant][fx] Add node name as prefix to observer module name #44765 [quant][fx] Add node name as prefix to observer module name

Summary:
The model is created and prepared using fx APIs and then scripted for training.
In order to test QAT on scriptmodel we need to be able to disable/enable fake_quant
and observer modules on it.

Test Plan:
python test/test_quantization.py TestQuantizeFx.test_qat_and_script

Reviewers:

Subscribers:

Tasks:

Tags:

Differential Revision: D23741354

…module Summary: The model is created and prepared using fx APIs and then scripted for training. In order to test QAT on scriptmodel we need to be able to disable/enable fake_quant and observer modules on it. Test Plan: python test/test_quantization.py TestQuantizeFx.test_qat_and_script Reviewers: Subscribers: Tasks: Tags: [ghstack-poisoned]

…module Summary: The model is created and prepared using fx APIs and then scripted for training. In order to test QAT on scriptmodel we need to be able to disable/enable fake_quant and observer modules on it. Test Plan: python test/test_quantization.py TestQuantizeFx.test_qat_and_script Reviewers: Subscribers: Tasks: Tags: ghstack-source-id: 79267f6 Pull Request resolved: #44773

dr-ci · 2020-09-16T06:00:37Z

💊 CI failures summary and remediations

As of commit 1d1dbe5 (more details on the Dr. CI page):

💚 💚 Looks good so far! There are no failures yet. 💚 💚

This comment was automatically generated by Dr. CI (expand for details).

Follow this link to opt-out of these comments for your Pull Requests.

Please report bugs/suggestions on the GitHub issue tracker or post in the (internal) Dr. CI Users group.

See how this bot performed.

This comment has been revised 16 times.

jerryzh168 · 2020-09-16T16:33:24Z

torch/quantization/fake_quantize.py

-    if type(mod) == FakeQuantize:
+    if type(mod) == FakeQuantize or\
+        isinstance(mod, torch.jit.RecursiveScriptModule)\
+            and mod.original_name == 'FakeQuantize':


is there a way to get the full qualified path?

You mean like torch.quantization.FakeQuantize? I wasn't able to find a way to do that.

yeah, can you try to see if this works? https://github.com/pytorch/pytorch/blob/master/torch/_jit_internal.py#L736

oh this one:https://codebrowser.bddppq.com/pytorch/pytorch/torch/csrc/jit/python/script_init.cpp.html#1046

you can probably get this by m._c.qualified_name

…d on scriptmodule" Summary: The model is created and prepared using fx APIs and then scripted for training. In order to test QAT on scriptmodel we need to be able to disable/enable fake_quant and observer modules on it. Test Plan: python test/test_quantization.py TestQuantizeFx.test_qat_and_script Reviewers: Subscribers: Tasks: Tags: [ghstack-poisoned]

vkuzo · 2020-09-16T21:01:39Z

torch/quantization/fake_quantize.py

+    if type(mod) == FakeQuantize or\
+        isinstance(mod, torch.jit.RecursiveScriptModule)\
+            and mod.original_name == 'FakeQuantize':


to clarify, why doesn't it work without this code?

Since it is scripted, the type will be class 'torch.jit._script.RecursiveScriptModule so the old code will return false.

…d on scriptmodule" Summary: The model is created and prepared using fx APIs and then scripted for training. In order to test QAT on scriptmodel we need to be able to disable/enable fake_quant and observer modules on it. Test Plan: python test/test_quantization.py TestQuantizeFx.test_qat_and_script Reviewers: Subscribers: Tasks: Tags: Differential Revision: [D23741354](https://our.internmc.facebook.com/intern/diff/D23741354) [ghstack-poisoned]

jerryzh168 · 2020-09-16T21:42:44Z

torch/quantization/fake_quantize.py

+    else:
+        return false


nit: this can be return False(without else), also it's False instead false I think.

jerryzh168

Looks good, thanks

jerryzh168 · 2020-09-16T21:45:13Z

torch/quantization/fake_quantize.py

+    '''
+    if isinstance(mod, torch.jit.RecursiveScriptModule):
+        # qualified name looks like '__torch__.torch.quantization.fake_quantize.___torch_mangle_2.FakeQuantize'
+        suffix = mod._c.qualified_name.split('.', 1)[1]


I think it should be OK to include __torch__

…d on scriptmodule" Summary: The model is created and prepared using fx APIs and then scripted for training. In order to test QAT on scriptmodel we need to be able to disable/enable fake_quant and observer modules on it. Test Plan: python test/test_quantization.py TestQuantizeFx.test_qat_and_script Reviewers: Subscribers: Tasks: Tags: Differential Revision: [D23741354](https://our.internmc.facebook.com/intern/diff/D23741354) [ghstack-poisoned]

codecov · 2020-09-17T02:37:43Z

Codecov Report

Merging #44773 into gh/supriyar/180/base will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@                  Coverage Diff                  @@
##           gh/supriyar/180/base   #44773   +/-   ##
=====================================================
  Coverage                 67.91%   67.92%           
=====================================================
  Files                       384      384           
  Lines                     49843    49850    +7     
=====================================================
+ Hits                      33852    33861    +9     
+ Misses                    15991    15989    -2

Impacted Files	Coverage Δ
torch/quantization/fake_quantize.py	`96.62% <100.00%> (+0.28%)`	⬆️
torch/utils/_benchmark/utils/common.py	`79.33% <0.00%> (+1.65%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 650bd6d...1d1dbe5. Read the comment docs.

facebook-github-bot · 2020-09-17T18:15:28Z

This pull request has been merged in 1fde54d.

…module (#44773) Summary: Pull Request resolved: #44773 The model is created and prepared using fx APIs and then scripted for training. In order to test QAT on scriptmodel we need to be able to disable/enable fake_quant and observer modules on it. Test Plan: python test/test_quantization.py TestQuantizeFx.test_qat_and_script Imported from OSS Reviewed By: jerryzh168 Differential Revision: D23741354 fbshipit-source-id: 3fee7aa9b049d9901313b977710f4dc1c4501532

This was referenced Sep 16, 2020

[quant][qat] Ensure observers and fq modules are scriptable #44749

Closed

[quant][fx] Add node name as prefix to observer module name #44765

Closed

supriyar requested review from jerryzh168, qizzzh, radkris-git and vkuzo September 16, 2020 16:27

jerryzh168 reviewed Sep 16, 2020

View reviewed changes

vkuzo reviewed Sep 16, 2020

View reviewed changes

jerryzh168 reviewed Sep 16, 2020

View reviewed changes

jerryzh168 approved these changes Sep 16, 2020

View reviewed changes

jerryzh168 reviewed Sep 16, 2020

View reviewed changes

supriyar mentioned this pull request Sep 16, 2020

[quant] Add quant APIs to save/load observer state_dict #44846

Closed

facebook-github-bot closed this in 1fde54d Sep 17, 2020

facebook-github-bot added the merged label Sep 17, 2020

facebook-github-bot deleted the gh/supriyar/180/head branch September 21, 2020 14:14

mruberry added the Merged label Oct 28, 2020

[quant][qat] Ensure fake_quant and observer can be disabled on scriptmodule #44773

[quant][qat] Ensure fake_quant and observer can be disabled on scriptmodule #44773

Uh oh!

Conversation

supriyar commented Sep 16, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dr-ci bot commented Sep 16, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💊 CI failures summary and remediations

Uh oh!

jerryzh168 Sep 16, 2020

Choose a reason for hiding this comment

Uh oh!

supriyar Sep 16, 2020

Choose a reason for hiding this comment

Uh oh!

jerryzh168 Sep 16, 2020

Choose a reason for hiding this comment

Uh oh!

jerryzh168 Sep 16, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vkuzo Sep 16, 2020

Choose a reason for hiding this comment

Uh oh!

supriyar Sep 16, 2020

Choose a reason for hiding this comment

Uh oh!

jerryzh168 Sep 16, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jerryzh168 left a comment

Choose a reason for hiding this comment

Uh oh!

jerryzh168 Sep 16, 2020

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Sep 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

facebook-github-bot commented Sep 17, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

supriyar commented Sep 16, 2020 •

edited

Loading

dr-ci bot commented Sep 16, 2020 •

edited

Loading

jerryzh168 Sep 16, 2020 •

edited

Loading

jerryzh168 Sep 16, 2020 •

edited

Loading

codecov bot commented Sep 17, 2020 •

edited

Loading