up

Author: metascroy

.lintrunner.toml

@@ -380,24 +380,31 @@ command = [
 ]
 
 [[linter]]
-code = 'TORCH_AO_IMPORT'
-include_patterns = ['**/*.py']
+code = "TORCH_AO_IMPORT"
+include_patterns = ["**/*.py"]
 exclude_patterns = [
-    'third-party/**',
+    "third-party/**",
+    # Some existing files have imports from torch.ao.quantization that are not going away, e.g.,
+    # from torch.ao.quantization.fx.utils, from torch.ao.quantization.qconfig, etc.
+    "backends/xnnpack/test/test_xnnpack_utils.py",
+    "exir/backend/test/demos/test_xnnpack_qnnpack.py",
+    "backends/xnnpack/quantizer/xnnpack_quantizer_utils.py",
+    "backends/xnnpack/test/quantizer/test_pt2e_quantization.py",
+    "backends/xnnpack/test/quantizer/test_xnnpack_quantizer.py",
+    "examples/xnnpack/quantization/example.py",
+    "exir/tests/test_quantization.py",
+    "exir/tests/test_memory_planning.py",
 ]
 command = [
-    'python3',
-    '-m',
-    'lintrunner_adapters',
-    'run',
-    'grep_linter',
-    '--pattern=\\bfrom torch.ao.quantization(\\.[a-zA-Z0-9_]+)*\\b',
-    '--linter-name=TorchAOImport',
-    '--error-name=Prohibited torch.ao.quantization import',
-    """--error-description=\
-        Imports from torch.ao.quantization are not allowed. \
-        Please import from torchao.quantization.pt2e instead.\
-    """,
-    '--',
-    '@{{PATHSFILE}}',
+  "python3",
+  "-m",
+  "lintrunner_adapters",
+  "run",
+  "grep_linter",
+  "--pattern=\\bfrom torch\\.ao\\.quantization(?:\\.[A-Za-z0-9_]+)*\\b",
+  "--linter-name=TorchAOImport",
+  "--error-name=Prohibited torch.ao.quantization import",
+  "--error-description=Imports from torch.ao.quantization are not allowed. Please import from torchao.quantization.pt2e instead.",
+  "--",
+  "@{{PATHSFILE}}",
 ]

backends/xnnpack/test/quantizer/test_xnnpack_quantizer.py

@@ -22,7 +22,6 @@
     convert_to_reference_fx,
     prepare_fx,
 )
-from torch.ao.quantization.quantize_pt2e import convert_pt2e, prepare_pt2e
 from torch.export import export_for_training
 from torch.testing._internal.common_quantization import (
     NodeSpec as ns,
@@ -34,6 +33,7 @@
 from torch.testing._internal.common_quantized import override_quantized_engine
 from torchao.quantization.pt2e import observer
 from torchao.quantization.pt2e.fake_quantize import default_dynamic_fake_quant
+from torchao.quantization.pt2e.quantize_pt2e import convert_pt2e, prepare_pt2e
 
 
 @skipIfNoQNNPACK