Merge pull request #545 from Xilinx/bump_to_62eb38bc

[AutoBump] Merge with 62eb38b (Jan 14) (152)

Author: mgehre-amd

build_tools/python_deploy/build_linux_packages.sh

@@ -324,9 +324,6 @@ function test_in_tree() {
       ;;
     esac
 
-  echo ":::: Run make_fx + TOSA e2e integration tests"
-  python -m e2e_testing.main --config=make_fx_tosa -v
-
   echo ":::: Run TOSA e2e integration tests"
   python -m e2e_testing.main --config=tosa -v
 }

projects/pt1/e2e_testing/main.py

@@ -42,8 +42,6 @@
 from .xfail_sets import (
     LINALG_XFAIL_SET,
     LINALG_CRASHING_SET,
-    MAKE_FX_TOSA_PASS_SET,
-    MAKE_FX_TOSA_CRASHING_SET,
     STABLEHLO_PASS_SET,
     STABLEHLO_CRASHING_SET,
     TOSA_PASS_SET,
@@ -76,7 +74,6 @@ def _get_argparse():
         "torchscript",
         "linalg",
         "stablehlo",
-        "make_fx_tosa",
         "tosa",
         "lazy_tensor_core",
         "torchdynamo",
@@ -166,10 +163,6 @@ def main():
         config = TosaBackendTestConfig(LinalgOnTensorsTosaBackend())
         xfail_set = all_test_unique_names - TOSA_PASS_SET
         crashing_set = TOSA_CRASHING_SET
-    elif args.config == "make_fx_tosa":
-        config = TosaBackendTestConfig(LinalgOnTensorsTosaBackend(), use_make_fx=True)
-        xfail_set = all_test_unique_names - MAKE_FX_TOSA_PASS_SET
-        crashing_set = MAKE_FX_TOSA_CRASHING_SET
     elif args.config == "native_torch":
         config = NativeTorchTestConfig()
         xfail_set = set()

projects/pt1/e2e_testing/xfail_sets.py

@@ -2587,148 +2587,6 @@
     "IndexTensorStaticNonContiguousWithNoneModule_basic",
 }
 
-MAKE_FX_TOSA_CRASHING_SET = TOSA_CRASHING_SET | {
-    # Runtime op verification: static result dims in reassoc group do not divide src dim evenly
-    "FlattenDynamicModule_basic",
-    "ReshapeDynamicModule_basic",
-    "ViewFlattenAndExpandModule_basic",
-    "ViewSizeDimLedAndFollowedByExpandedOnesModule_basic",
-    "ViewSizeDimLedByExpandedOnesModule_basic",
-}
-
-MAKE_FX_TOSA_PASS_SET = (
-    TOSA_PASS_SET
-    | {
-        ### Tests additionally passing in make_fx_tosa
-        "AdaptiveAvgPool1dStaticEvenMultiple_basic",
-        "IsInfiniteModule_basic",
-        "AdaptiveAvgPool2dFixedKernelStrideSizeStaticModule_basic",
-        "AdaptiveAvgPool2dUnitOutputSizeStaticModule_basic",
-        "ResNet18StaticModule_basic",
-        "AdaptiveAvgPool1dStaticLargerOutput_basic",
-        "ScaledDotProductAttentionBoolMaskModule_basic",
-        "ScaledDotProductAttentionDifferentDynamicCausalModule_basic",
-        "ArgminIntModule_basic",
-        "ArgminIntModule_multiple_mins",
-        "ArgminModule_basic",
-        "ArgminModule_keepDim",
-        "ReduceAllDimBool_basic",
-        "ReduceAllDimFloat_basic",
-        "ReduceAllDimInt_basic",
-        "ReduceAllFloatModule_basic",
-        "ReduceAllIntModule_basic",
-        "ReduceAnyFloatModule_basic",
-        "ReduceAnyIntModule_basic",
-        "ReduceMaxAllDims_basic",
-        "ReduceMaxFloatModule_basic",
-        "ReduceMaxSignedIntModule_basic",
-        "ReduceMaxUnsignedIntModule_basic",
-        "ReduceMinFloatModule_basic",
-        "ReduceMinSignedIntModule_basic",
-        "ReduceMinUnsignedIntModule_basic",
-        "ReduceProdDtypeFloatModule_basic",
-        "ReduceProdDtypeIntModule_basic",
-        "ReduceProdElementTypeBoolModule_basic",
-        "ReduceProdFloatModule_basic",
-        "ReduceProdSignedIntModule_basic",
-        "ReduceProdUnsignedIntModule_basic",
-        "ReduceSumDimIntListDtypeFloatModule_basic",
-        "ReduceSumDimIntListDtypeIntModule_basic",
-        "ReduceSumDimIntListElementTypeBoolModule_basic",
-        "ReduceSumDtypeFloatModule_basic",
-        "ReduceSumDtypeIntModule_basic",
-        "ReduceSumElementTypeBoolModule_basic",
-        "ScaledDotProductAttentionDifferentModule_basic",
-        "ScaledDotProductAttentionMaskModule_basic",
-        "ScaledDotProductAttentionSameModule_basic",
-        "AvgPool2dCountIncludePadFalseStaticModule_basic",
-        "AtenLinear1D_basic",
-        "AtenLinearMatVec_basic",
-        "AtenLinearVecMatBias_basic",
-        "Atleast1dModule0dInput_basic",
-        "Atleast1dModule1dInput_basic",
-        "Atleast2dModule0dInput_basic",
-        "Atleast2dModule1dInput_basic",
-        "Atleast2dModule2dInput_basic",
-        "MaxPool1dEmptyStrideStaticModule_basic",
-        "MaxPool1dStaticCeilModeTrueModule_basic",
-        "MaxPool1dStaticModule_basic",
-        "AdaptiveAvgPool1dUnitOutputSizeStaticModule_basic",
-        "CosineSimilarityModule_basic",
-        "NativeGroupNormBackwardModule_basic",
-        "ReduceFrobeniusNormKeepDimModule_basic",
-        "ReduceFrobeniusNormModule_basic",
-        "SliceWholeTensorModule_basic",
-        "TensorFloatModule_basic",
-        "TensorIntModule_basic",
-        "RepeatInterleaveSelfIntModule_basic",
-        "TorchPrimLoopForLikeTensorArgModule_basic",
-        "ViewSizeDimFollowedByCollapsedOnesModule_basic",
-        "ViewSizeDimFollowedByExpandedOnesModule_basic",
-        "ViewSizeDimLedAndFollowedByCollapsedOnesModule_basic",
-        "ViewSizeDimLedByCollapsedOnesModule_basic",
-        "ViewSizeFromOtherTensor_basic",
-        "RenormModuleFloat32NegativeDim_basic",
-        "RenormModuleFloat32_basic",
-        "RreluWithNoiseBackwardEvalModule_basic",
-        "RreluWithNoiseBackwardEvalStaticModule_basic",
-        "RreluWithNoiseBackwardTrainModule_basic",
-        "RreluWithNoiseBackwardTrainStaticModule_basic",
-    }
-) - {
-    ### Test failing in make_fx_tosa but not in tosa
-    "ElementwiseRreluEvalStaticModule_basic",
-    "ElementwiseRreluTrainStaticModule_basic",
-    "AdaptiveMaxPool1dDimOneStatic_basic",
-    "FloatPowerTensorTensorStaticModule_basic",
-    # Dynamic shape, has extra unsupported broadcast ops
-    "Matmul_3d",
-    # Unimplemented operator 'aten._index_put_impl_.hacked_twin'
-    "IndexPutImpl1DFloatNonAccumulateModule_basic",
-    "IndexPutImpl1DIntNonAccumulateModule_basic",
-    # RuntimeError: The size of tensor a (7) must match the size of tensor b (3) at non-singleton dimension 1
-    "Add_Module_basic",
-    # failed to legalize operation 'torch.aten.to.dtype' that was explicitly marked illegal
-    "AtenEyeModuleInt2D_basic",
-    "AtenEyeMModuleInt2D_basic",
-    "Conv2dBiasNoPaddingModule_basic",
-    "Conv2dNoPaddingModule_basic",
-    "Conv2dWithPaddingDilationStrideModule_basic",
-    "Conv2dWithPaddingModule_basic",
-    "Conv2dWithSamePaddingModule_basic",
-    "Conv2dWithValidPaddingModule_basic",
-    # failed to legalize operation 'torch.operator'
-    "ElementwisePreluModule_basic",
-    "ElementwisePreluStaticModule_basic",
-    "ElementwiseLogSigmoidModule_basic",
-    # failed to legalize operation 'torch.aten.rrelu_with_noise'
-    "ElementwiseRreluEvalModule_basic",
-    # incompatible return type failure for tosa.concat.
-    "HstackBasicComplexModule_basic",
-    "HstackBasicFloatModule_basic",
-    "HstackBasicIntFloatModule_basic",
-    "HstackBasicIntModule_basic",
-    # Shape Related failures
-    "PrimListUnpackNumMismatchModule_basic",
-    "ReshapeExpandModule_basic",
-    "UnsafeViewCollapseModule_basic",
-    "UnsafeViewDynamicExpandModule_basic",
-    "ViewCollapseModule_basic",
-    "ViewDynamicExpandCollapseModule_basic",
-    "ViewDynamicExpandModule_basic",
-    "ViewExpandDynamicDimModule_basic",
-    "ViewNoChange1dModule_basic",
-    "ViewNoChange2dModule_basic",
-    "ViewNoChange3dModule_basic",
-}
-
-if torch_version_for_comparison() < version.parse("2.5.0.dev"):
-    MAKE_FX_TOSA_PASS_SET = MAKE_FX_TOSA_PASS_SET | {
-        "ScaledDotProductAttentionDifferentModule_basic",
-        "ScaledDotProductAttentionMaskModule_basic",
-        "ScaledDotProductAttentionSameModule_basic",
-    }
-
 LTC_CRASHING_SET = {
     # TODO: update test to move all inputs to the lazy device. Otherwise test fails with:
     # Check failed: lazy_tensor Input tensor is not a lazy tensor: CPUBoolType.

projects/pt1/python/torch_mlir/torchscript.py

@@ -14,8 +14,6 @@
 from torch._functorch.compile_utils import strip_overloads
 import torch
 import torch.fx
-from torch_mlir.dynamo import _get_decomposition_table
-from torch.fx.experimental.proxy_tensor import make_fx
 
 from torch_mlir.compiler_utils import (
     run_pipeline_with_repro_report,
@@ -203,7 +201,6 @@ def compile(
     backend_legal_ops: Optional[Sequence[str]] = None,
     extra_library: Iterable[Callable] = [],
     verbose: bool = False,
-    use_make_fx: bool = False,
     enable_ir_printing: bool = False,
 ):
     """Convert a PyTorch model to MLIR.
@@ -266,12 +263,6 @@ def compile(
     else:
         backend_legal_ops = BACKEND_LEGAL_OPS.get(output_type, [])
 
-    if use_make_fx:
-        args = example_args._get_for_tracing(
-            use_tracing=True, ignore_traced_shapes=True
-        )["forward"]
-        model = make_fx(model, decomposition_table=_get_decomposition_table())(*args)
-
     # For FX-based models, automatically strip overloads.
     if isinstance(model, torch.fx.GraphModule):
         strip_overloads(model)

projects/pt1/python/torch_mlir_e2e_test/configs/onnx_backend.py

@@ -132,12 +132,10 @@ class OnnxBackendTestConfig(TestConfig):
     def __init__(
         self,
         backend,
-        use_make_fx: bool = False,
         output_type="linalg-on-tensors",
     ):
         super().__init__()
         self.backend = backend
-        self.use_make_fx = use_make_fx
         self.output_type = output_type
 
     def compile(self, program: torch.nn.Module, verbose: bool = False) -> Any:

projects/pt1/python/torch_mlir_e2e_test/configs/tosa_backend.py

@@ -24,18 +24,16 @@ class TosaBackendTestConfig(TestConfig):
     reaching the TOSA abstraction level.
     """
 
-    def __init__(self, backend: TosaBackend, use_make_fx: bool = False):
+    def __init__(self, backend: TosaBackend):
         super().__init__()
         self.backend = backend
-        self.use_make_fx = use_make_fx
 
     def compile(self, program: torch.nn.Module, verbose: bool = False) -> Any:
         example_args = convert_annotations_to_placeholders(program.forward)
         module = torchscript.compile(
             program,
             example_args,
             output_type="tosa",
-            use_make_fx=self.use_make_fx,
             verbose=verbose,
         )
 

python/torch_mlir/compiler_utils.py

@@ -10,8 +10,8 @@
 from typing import Union, List
 
 import torch
-from torch_mlir.passmanager import PassManager
-from torch_mlir.ir import StringAttr
+from .passmanager import PassManager
+from .ir import StringAttr
 
 
 class TensorPlaceholder:

python/torch_mlir/extras/onnx_importer.py

@@ -742,7 +742,7 @@ def _sanitize_name(self, name):
 
         # Remove characters that are invalid in MLIR identifier names.
         # https://mlir.llvm.org/docs/LangRef/#identifiers-and-keywords
-        return re.sub("[:/-]", "_", name)
+        return re.sub("[^\w\.]", "_", name)
 
     def tensor_proto_to_attr(self, tp: onnx.TensorProto) -> Attribute:
         tensor_type = self.tensor_proto_to_builtin_type(tp)

python/torch_mlir/fx.py

@@ -13,11 +13,11 @@
 import torch.nn as nn
 from torch.export import ExportedProgram
 
-from torch_mlir.extras.fx_importer import FxImporter, FxImporterHooks
-from torch_mlir import ir
-from torch_mlir.dialects import torch as torch_d
-from torch_mlir.extras.fx_decomp_util import get_decomposition_table
-from torch_mlir.compiler_utils import (
+from .extras.fx_importer import FxImporter, FxImporterHooks
+from . import ir
+from .dialects import torch as torch_d
+from .extras.fx_decomp_util import get_decomposition_table
+from .compiler_utils import (
     OutputType,
     run_pipeline_with_repro_report,
     lower_mlir_module,