From 10b6062d41ccd65f3f929afeec27c7cd4abb5b5d Mon Sep 17 00:00:00 2001
From: penguin_wwy <940375606@qq.com>
Date: Tue, 16 Apr 2024 12:20:23 +0800
Subject: [PATCH] [CI] Enable the tests for fx_importer in the CI (#3168)

Replace the torchdynamo e2e with the fx_importer e2e
---
 build_tools/ci/test_posix.sh                      | 7 +++----
 build_tools/python_deploy/build_linux_packages.sh | 6 ++----
 projects/pt1/e2e_testing/main.py                  | 3 +++
 projects/pt1/e2e_testing/xfail_sets.py            | 7 +++++++
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/build_tools/ci/test_posix.sh b/build_tools/ci/test_posix.sh
index 71a22d0f714e..a5387602ae44 100755
--- a/build_tools/ci/test_posix.sh
+++ b/build_tools/ci/test_posix.sh
@@ -37,10 +37,9 @@ case $torch_version in
     # python -m e2e_testing.main --config=lazy_tensor_core -v
     # echo "::endgroup::"
 
-    # TODO: There is one failing test in this group on stable. It could
-    # be xfailed vs excluding entirely.
-    echo "::group::Run TorchDynamo e2e integration tests"
-    python -m e2e_testing.main --config=torchdynamo -v
+    # TODO: Need to verify in the stable version
+    echo "::group::Run FxImporter e2e integration tests"
+    python -m e2e_testing.main --config=fx_importer -v
     echo "::endgroup::"
     ;;
   stable)
diff --git a/build_tools/python_deploy/build_linux_packages.sh b/build_tools/python_deploy/build_linux_packages.sh
index 401930887d2f..6c5daf15ff02 100755
--- a/build_tools/python_deploy/build_linux_packages.sh
+++ b/build_tools/python_deploy/build_linux_packages.sh
@@ -308,10 +308,8 @@ function test_in_tree() {
       echo ":::: Run Onnx e2e integration tests"
       python -m e2e_testing.main --config=onnx -v
 
-      # Dynamo is changing a lot in nightly versions, and thus the implementation
-      # tends to become incompatible to the stable version.
-      echo ":::: Run TorchDynamo e2e integration tests"
-      python -m e2e_testing.main --config=torchdynamo -v
+      echo ":::: Run FxImporter e2e integration tests"
+      python -m e2e_testing.main --config=fx_importer -v
       ;;
     stable)
       echo ":::: Test with stable torch"
diff --git a/projects/pt1/e2e_testing/main.py b/projects/pt1/e2e_testing/main.py
index e62ed9ff15ed..9f2323793579 100644
--- a/projects/pt1/e2e_testing/main.py
+++ b/projects/pt1/e2e_testing/main.py
@@ -164,6 +164,9 @@ def main():
 
     # Report the test results.
     failed = report_results(results, xfail_set, args.verbose, args.config)
+    if args.config == "torchdynamo":
+        print("\033[91mWarning: the TorchScript based dynamo support is deprecated. "
+              "The config for torchdynamo is planned to be removed in the future.\033[0m")
     if args.ignore_failures:
         sys.exit(0)
     sys.exit(1 if failed else 0)
diff --git a/projects/pt1/e2e_testing/xfail_sets.py b/projects/pt1/e2e_testing/xfail_sets.py
index e6cd80e3a275..69537798f124 100644
--- a/projects/pt1/e2e_testing/xfail_sets.py
+++ b/projects/pt1/e2e_testing/xfail_sets.py
@@ -401,6 +401,12 @@
     "AtenIntTensorCharDtypeModule_basic",
     "AtenItemFpOpModule_basic",
     "AtenItemIntOpModule_basic",
+    "AtenMmQint8_basic",
+    "AtenMatmulQint8_basic",
+    "AtenMatmulQint8MV_basic",
+    "AtenMmQMixedSigni8_basic",
+    "AtenMatmulQMixedSigni8_basic",
+    "AtenMatmulQMixedSigni8Transpose_basic",
     "AtenMmQuint8_basic",
     "AtenSubFloatModule_basic",
     "BincountMinlengthModule_basic",
@@ -474,6 +480,7 @@
     "QuantizedMLP_basic",
     "QuantizedNoLayer_basic",
     "QuantizedSingleLayer_basic",
+    "QuantizedBatchedInputSingleLayer_basic",
     "ReduceMaxAlongDimUnsignedInt_basic",
     "ReduceMinAlongDimUnsignedInt_basic",
     "RsubInt0d_NumToTensor_Module_basic",