Update on "[Inductor] [Quant] Re-structure Quantization testcase patt…

…ern matcher check"


**Summary**
This Diff re-structures Quantization testcase pattern matcher check. Instead of checking all the pattern matched in the Inductor, we will only check the core pattern match count and node numbers such as: dequant promotion, QConv/Linear Unary and QConv Binary.

**TestPlan**
```
python -m pytest test_mkldnn_pattern_matcher.py -k test_q
```

cc voznesenskym penguinwu EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng wenzhe-nrv jiayisunx peterbell10 ipiszy yf225 chenyang78 kadeng muchulee8 aakhundov ColinPeppler

[ghstack-poisoned]

.ci/pytorch/multigpu-test.sh

@@ -36,10 +36,12 @@ time python test/run_test.py --verbose -i distributed/test_functional_api
 
 
 # DTensor tests
-time python test/run_test.py --verbose -i distributed/_tensor/test_device_mesh
 time python test/run_test.py --verbose -i distributed/_tensor/test_random_ops
 time python test/run_test.py --verbose -i distributed/_tensor/test_dtensor_compile
 
+# DeviceMesh test
+time python test/run_test.py --verbose -i distributed/test_device_mesh
+
 # DTensor/TP tests
 time python test/run_test.py --verbose -i distributed/tensor/parallel/test_ddp_2d_parallel
 time python test/run_test.py --verbose -i distributed/tensor/parallel/test_fsdp_2d_parallel

.github/scripts/generate_binary_build_matrix.py

@@ -94,23 +94,29 @@ def arch_type(arch_version: str) -> str:
         return "cpu"
 
 
+# This can be updated to the release version when cutting release branch, i.e. 2.1
+DEFAULT_TAG = "main"
+
 WHEEL_CONTAINER_IMAGES = {
     **{
-        gpu_arch: f"pytorch/manylinux-builder:cuda{gpu_arch}"
+        gpu_arch: f"pytorch/manylinux-builder:cuda{gpu_arch}-{DEFAULT_TAG}"
         for gpu_arch in CUDA_ARCHES
     },
     **{
-        gpu_arch: f"pytorch/manylinux-builder:rocm{gpu_arch}"
+        gpu_arch: f"pytorch/manylinux-builder:rocm{gpu_arch}-{DEFAULT_TAG}"
         for gpu_arch in ROCM_ARCHES
     },
-    "cpu": "pytorch/manylinux-builder:cpu",
-    "cpu-cxx11-abi": "pytorch/manylinuxcxx11-abi-builder:cpu-cxx11-abi",
-    "cpu-aarch64": "pytorch/manylinuxaarch64-builder:cpu-aarch64",
+    "cpu": f"pytorch/manylinux-builder:cpu-{DEFAULT_TAG}",
+    "cpu-cxx11-abi": f"pytorch/manylinuxcxx11-abi-builder:cpu-cxx11-abi-{DEFAULT_TAG}",
+    "cpu-aarch64": f"pytorch/manylinuxaarch64-builder:cpu-aarch64-{DEFAULT_TAG}",
 }
 
 CONDA_CONTAINER_IMAGES = {
-    **{gpu_arch: f"pytorch/conda-builder:cuda{gpu_arch}" for gpu_arch in CUDA_ARCHES},
-    "cpu": "pytorch/conda-builder:cpu",
+    **{
+        gpu_arch: f"pytorch/conda-builder:cuda{gpu_arch}-{DEFAULT_TAG}"
+        for gpu_arch in CUDA_ARCHES
+    },
+    "cpu": f"pytorch/conda-builder:cpu-{DEFAULT_TAG}",
 }
 
 PRE_CXX11_ABI = "pre-cxx11"
@@ -120,23 +126,35 @@ def arch_type(arch_version: str) -> str:
 
 LIBTORCH_CONTAINER_IMAGES: Dict[Tuple[str, str], str] = {
     **{
-        (gpu_arch, PRE_CXX11_ABI): f"pytorch/manylinux-builder:cuda{gpu_arch}"
+        (
+            gpu_arch,
+            PRE_CXX11_ABI,
+        ): f"pytorch/manylinux-builder:cuda{gpu_arch}-{DEFAULT_TAG}"
         for gpu_arch in CUDA_ARCHES
     },
     **{
-        (gpu_arch, CXX11_ABI): f"pytorch/libtorch-cxx11-builder:cuda{gpu_arch}"
+        (
+            gpu_arch,
+            CXX11_ABI,
+        ): f"pytorch/libtorch-cxx11-builder:cuda{gpu_arch}-{DEFAULT_TAG}"
         for gpu_arch in CUDA_ARCHES
     },
     **{
-        (gpu_arch, PRE_CXX11_ABI): f"pytorch/manylinux-builder:rocm{gpu_arch}"
+        (
+            gpu_arch,
+            PRE_CXX11_ABI,
+        ): f"pytorch/manylinux-builder:rocm{gpu_arch}-{DEFAULT_TAG}"
         for gpu_arch in ROCM_ARCHES
     },
     **{
-        (gpu_arch, CXX11_ABI): f"pytorch/libtorch-cxx11-builder:rocm{gpu_arch}"
+        (
+            gpu_arch,
+            CXX11_ABI,
+        ): f"pytorch/libtorch-cxx11-builder:rocm{gpu_arch}-{DEFAULT_TAG}"
         for gpu_arch in ROCM_ARCHES
     },
-    ("cpu", PRE_CXX11_ABI): "pytorch/manylinux-builder:cpu",
-    ("cpu", CXX11_ABI): "pytorch/libtorch-cxx11-builder:cpu",
+    ("cpu", PRE_CXX11_ABI): f"pytorch/manylinux-builder:cpu-{DEFAULT_TAG}",
+    ("cpu", CXX11_ABI): f"pytorch/libtorch-cxx11-builder:cpu-{DEFAULT_TAG}",
 }
 
 FULL_PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11"]

.github/scripts/generate_ci_workflows.py

@@ -311,6 +311,22 @@ class OperatingSystem:
             isolated_workflow=True,
         ),
     ),
+    BinaryBuildWorkflow(
+        os=OperatingSystem.MACOS_ARM64,
+        package_type="libtorch",
+        abi_version=generate_binary_build_matrix.CXX11_ABI,
+        build_configs=generate_binary_build_matrix.generate_libtorch_matrix(
+            OperatingSystem.MACOS,
+            generate_binary_build_matrix.CXX11_ABI,
+            libtorch_variants=["shared-with-deps"],
+        ),
+        cross_compile_arm64=False,
+        macos_runner="macos-13-xlarge",
+        ciflow_config=CIFlowConfig(
+            labels={LABEL_CIFLOW_BINARIES, LABEL_CIFLOW_BINARIES_LIBTORCH},
+            isolated_workflow=True,
+        ),
+    ),
     BinaryBuildWorkflow(
         os=OperatingSystem.MACOS_ARM64,
         package_type="wheel",

.github/scripts/github_utils.py

@@ -11,6 +11,9 @@
 from urllib.request import Request, urlopen
 
 
+GITHUB_API_URL = "https://api.github.com"
+
+
 @dataclass
 class GitHubComment:
     body_text: str
@@ -33,7 +36,7 @@ def gh_fetch_url_and_headers(
     if headers is None:
         headers = {}
     token = os.environ.get("GITHUB_TOKEN")
-    if token is not None and url.startswith("https://api.github.com/"):
+    if token is not None and url.startswith(f"{GITHUB_API_URL}/"):
         headers["Authorization"] = f"token {token}"
 
     data_ = None
@@ -129,7 +132,7 @@ def gh_post_pr_comment(
     org: str, repo: str, pr_num: int, comment: str, dry_run: bool = False
 ) -> List[Dict[str, Any]]:
     return _gh_post_comment(
-        f"https://api.github.com/repos/{org}/{repo}/issues/{pr_num}/comments",
+        f"{GITHUB_API_URL}/repos/{org}/{repo}/issues/{pr_num}/comments",
         comment,
         dry_run,
     )
@@ -139,14 +142,14 @@ def gh_post_commit_comment(
     org: str, repo: str, sha: str, comment: str, dry_run: bool = False
 ) -> List[Dict[str, Any]]:
     return _gh_post_comment(
-        f"https://api.github.com/repos/{org}/{repo}/commits/{sha}/comments",
+        f"{GITHUB_API_URL}/repos/{org}/{repo}/commits/{sha}/comments",
         comment,
         dry_run,
     )
 
 
 def gh_delete_comment(org: str, repo: str, comment_id: int) -> None:
-    url = f"https://api.github.com/repos/{org}/{repo}/issues/comments/{comment_id}"
+    url = f"{GITHUB_API_URL}/repos/{org}/{repo}/issues/comments/{comment_id}"
     gh_fetch_url(url, method="DELETE")
 
 
@@ -157,7 +160,7 @@ def gh_fetch_merge_base(org: str, repo: str, base: str, head: str) -> str:
     # https://docs.github.com/en/rest/commits/commits?apiVersion=2022-11-28#compare-two-commits
     try:
         json_data = gh_fetch_url(
-            f"https://api.github.com/repos/{org}/{repo}/compare/{base}...{head}",
+            f"{GITHUB_API_URL}/repos/{org}/{repo}/compare/{base}...{head}",
             headers={"Accept": "application/vnd.github.v3+json"},
             reader=json.load,
         )
@@ -171,3 +174,8 @@ def gh_fetch_merge_base(org: str, repo: str, base: str, head: str) -> str:
         warnings.warn(f"Failed to get merge base for {base}...{head}: {error}")
 
     return merge_base
+
+
+def gh_update_pr_state(org: str, repo: str, pr_num: int, state: str = "open") -> None:
+    url = f"{GITHUB_API_URL}/repos/{org}/{repo}/pulls/{pr_num}"
+    gh_fetch_url(url, method="PATCH", data={"state": state})

.github/scripts/trymerge.py

@@ -30,6 +30,7 @@
     gh_fetch_url,
     gh_post_commit_comment,
     gh_post_pr_comment,
+    gh_update_pr_state,
     GitHubComment,
 )
 
@@ -1803,6 +1804,7 @@ def post_comment(msg: str) -> None:
     if not dry_run:
         pr.add_numbered_label("reverted")
         gh_post_commit_comment(pr.org, pr.project, commit_sha, revert_msg)
+        gh_update_pr_state(pr.org, pr.project, pr.pr_num)
 
 
 def prefix_with_github_url(suffix_str: str) -> str: