Disable LTC and update PyTorch (llvm#1472)

* build: disable LTC again so that we can bump PyTorch version When built using PyTorch's master branch, the LTC code has been failing to build for a few days. As a result, the PyTorch version referenced by Torch-MLIR is stalled to the one from October 4th. In an effort to advance to PyTorch version, this patch disables LTC, and a subsequent patch will advance the PyTorch version. * update PyTorch version to 1.14.0.dev20221010 Also disables the `UpSampleNearest2dDynamicFactor_basic` e2e test, since the (PyTorch) oracle differs from the computed value for both the refbackend and the eager_mode backends.
Abhishek-TyRnT · Oct 11, 2022 · aefbf65 · aefbf65
1 parent da90a25
commit aefbf65
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git a/build_tools/python_deploy/build_linux_packages.sh b/build_tools/python_deploy/build_linux_packages.sh
@@ -193,7 +193,7 @@ function build_in_tree() {
       -DLLVM_EXTERNAL_TORCH_MLIR_DIALECTS_SOURCE_DIR="/main_checkout/torch-mlir/externals/llvm-external-projects/torch-mlir-dialects" \
       -DLLVM_TARGETS_TO_BUILD=host \
       -DMLIR_ENABLE_BINDINGS_PYTHON=ON \
-      -DTORCH_MLIR_ENABLE_LTC=ON \
+      -DTORCH_MLIR_ENABLE_LTC=OFF \
       -DTORCH_MLIR_USE_INSTALLED_PYTORCH="$torch_from_bin" \
       -DTORCH_MLIR_SRC_PYTORCH_REPO=${TORCH_MLIR_SRC_PYTORCH_REPO} \
       -DTORCH_MLIR_SRC_PYTORCH_BRANCH=${TORCH_MLIR_SRC_PYTORCH_BRANCH} \
@@ -256,8 +256,9 @@ function test_in_tree() {
   echo ":::: Run TOSA e2e integration tests"
   python -m e2e_testing.main --config=tosa -v
 
-  echo ":::: Run Lazy Tensor Core e2e integration tests"
-  python -m e2e_testing.main --config=lazy_tensor_core -v
+  # XXX: Uncomment once LTC is enabled again.
+  # echo ":::: Run Lazy Tensor Core e2e integration tests"
+  # python -m e2e_testing.main --config=lazy_tensor_core -v
 }
 
 function setup_venv() {
@@ -306,7 +307,7 @@ function build_out_of_tree() {
       -DLLVM_DIR="/main_checkout/torch-mlir/llvm-build/lib/cmake/llvm/" \
       -DMLIR_DIR="/main_checkout/torch-mlir/llvm-build/lib/cmake/mlir/" \
       -DMLIR_ENABLE_BINDINGS_PYTHON=OFF \
-      -DTORCH_MLIR_ENABLE_LTC=ON \
+      -DTORCH_MLIR_ENABLE_LTC=OFF \
       -DTORCH_MLIR_USE_INSTALLED_PYTORCH="$torch_from_bin" \
       -DTORCH_MLIR_SRC_PYTORCH_REPO=${TORCH_MLIR_SRC_PYTORCH_REPO} \
       -DTORCH_MLIR_SRC_PYTORCH_BRANCH=${TORCH_MLIR_SRC_PYTORCH_BRANCH} \

diff --git a/e2e_testing/main.py b/e2e_testing/main.py
@@ -15,7 +15,8 @@
 
 # Available test configs.
 from torch_mlir_e2e_test.configs import (
-    LazyTensorCoreTestConfig,
+    # XXX: Uncomment once LTC is enabled again.
+    # LazyTensorCoreTestConfig,
     LinalgOnTensorsBackendTestConfig,
     MhloBackendTestConfig,
     NativeTorchTestConfig,

diff --git a/e2e_testing/xfail_sets.py b/e2e_testing/xfail_sets.py
@@ -12,14 +12,17 @@
 
 from torch_mlir_e2e_test.test_suite import COMMON_TORCH_MLIR_LOWERING_XFAILS
 
-REFBACKEND_XFAIL_SET = COMMON_TORCH_MLIR_LOWERING_XFAILS
+REFBACKEND_XFAIL_SET = COMMON_TORCH_MLIR_LOWERING_XFAILS | {
+    "UpSampleNearest2dDynamicFactor_basic",
+}
 
 EAGER_MODE_XFAIL_SET = {
     # RefBackend fails
     "TableBatchEmbeddingModule_basic",
     "QuantizedMLP_basic",
     "Matmul_vecmat",
-    "BatchMlpLayerModule_basic"
+    "BatchMlpLayerModule_basic",
+    "UpSampleNearest2dDynamicFactor_basic",
 }
 
 MHLO_PASS_SET = {

diff --git a/python/torch_mlir_e2e_test/configs/__init__.py b/python/torch_mlir_e2e_test/configs/__init__.py
@@ -3,7 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 # Also available under a BSD-style license. See LICENSE.
 
-from .lazy_tensor_core import LazyTensorCoreTestConfig
+# XXX: Uncomment once LTC is enabled again.
+# from .lazy_tensor_core import LazyTensorCoreTestConfig
+
 from .linalg_on_tensors_backend import LinalgOnTensorsBackendTestConfig
 from .native_torch import NativeTorchTestConfig
 from .torchscript import TorchScriptTestConfig

diff --git a/pytorch-requirements.txt b/pytorch-requirements.txt
@@ -1,3 +1,3 @@
 -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
 --pre
-torch==1.13.0.dev20221004
+torch==1.14.0.dev20221010
diff --git a/pytorch-version.txt b/pytorch-version.txt
@@ -1 +1 @@
-9f3d8fec5747fde5191618eb895fbec2d50edf93
+04f63b02a1336db038f4b09006401546f445e68f
diff --git a/setup.py b/setup.py
@@ -46,7 +46,7 @@
 PACKAGE_VERSION = os.environ.get("TORCH_MLIR_PYTHON_PACKAGE_VERSION") or "0.0.1"
 
 # If true, enable LTC build by default
-TORCH_MLIR_ENABLE_LTC_DEFAULT = True
+TORCH_MLIR_ENABLE_LTC_DEFAULT = False
 
 # Build phase discovery is unreliable. Just tell it what phases to run.
 class CustomBuild(_build):
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		9f3d8fec5747fde5191618eb895fbec2d50edf93
		04f63b02a1336db038f4b09006401546f445e68f