Repository: alibaba/BladeDISC (language: python)

Issue:
[refactor]decompose disc-compiler from TensorFlow workspace
In the current codebase, BladeDISC builds disc-compiler in TensorFlow repo via soft-linking to `tf_community` dir, just like [link_disc_files](https://github.com/alibaba/BladeDISC/blob/ca7f28ee018b1b1814d5eb50e5e732dfd0ca15ef/scripts/python/common_setup.py#L593), but  BladeDISC is an end-to-end compiler instead of a module of TensorFlow, so we need to make some code refactor to decompose the disc-compiler from TensorFlow workspace to avoid design confusion in the future.

after code refactoring, we have some dirs like the following:

``` text
BladeDISC
  |-disc
      |-ral                 // RAL module
      |-compiler            // disc compiler core
  |-pytorch_blade          // BladeDISC work with PyTorch
  |-tensorflow_blade       // BladeDISC work with TensorFlow
  	|-disc_bridge.     // a custom operator to execute with TensorFlow
  |-tf_community          // TensorFlow submodule
```
![image](https://user-images.githubusercontent.com/1426912/215379433-a9b5728e-d5b9-4171-aec6-3cdcbd06eff4.png)



Discussion / hints:

Fix patch:
diff --git a/pytorch_blade/.bazelrc b/pytorch_blade/.bazelrc
index ccf16b263ca..b3518bccde1 100644
--- a/pytorch_blade/.bazelrc
+++ b/pytorch_blade/.bazelrc
@@ -1,7 +1,7 @@
 startup --host_jvm_args=-Djdk.http.auth.tunneling.disabledSchemes=
 
-try-import ../tf_community/.bazelrc
-try-import ../tf_community/.bazelrc.user
+try-import ../tao_compiler/.bazelrc
+try-import ../tao_compiler/.bazelrc.user
 
 build --disk_cache=~/.cache
 build --define is_torch_disc=true
diff --git a/pytorch_blade/WORKSPACE b/pytorch_blade/WORKSPACE
index 77bc44a2e9d..6c831853d14 100644
--- a/pytorch_blade/WORKSPACE
+++ b/pytorch_blade/WORKSPACE
@@ -112,6 +112,11 @@ local_repository(
     path = "../tf_community",
 )
 
+local_repository(
+    name = "org_disc_compiler",
+    path = "../tao_compiler",
+)
+
 load("@org_third_party//bazel:blade_disc_dnn_workspace.bzl", "blade_disc_dnn_workspace")
 
 blade_disc_dnn_workspace()
diff --git a/pytorch_blade/bazel/torch/torch.BUILD.tpl b/pytorch_blade/bazel/torch/torch.BUILD.tpl
index 9fd4cad0c6e..f448e6be24f 100644
--- a/pytorch_blade/bazel/torch/torch.BUILD.tpl
+++ b/pytorch_blade/bazel/torch/torch.BUILD.tpl
@@ -15,7 +15,7 @@ cc_library(
             "lib/libtorch_cpu.so",
             "lib/libtorch_global_deps.so",
         ] + glob(
-            ["lib/libtorch_cuda.so","lib/libtensorpipe.so",]),
+            ["lib/libtorch_cuda_cu.so", "lib/libtorch_cuda_cpp.so", "lib/libgomp*.so.1"]),
     hdrs = glob(
         [
             "include/torch/**/*.h",
diff --git a/pytorch_blade/bazel_build.py b/pytorch_blade/bazel_build.py
index eaa6a922102..d6116e29125 100644
--- a/pytorch_blade/bazel_build.py
+++ b/pytorch_blade/bazel_build.py
@@ -64,7 +64,7 @@ def pybind11_cflags(self):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.targets = [
-            "@org_tensorflow//tensorflow/compiler/mlir/xla/ral:libral_base_context.so",
+            "@org_disc_compiler//mlir/xla/ral:libral_base_context.so",
             "//pytorch_blade:libtorch_blade.so",
             "//pytorch_blade:_torch_blade.so",
             "//tests/mhlo/torch-mlir-opt:torch-mlir-opt",
@@ -185,7 +185,7 @@ def __init__(self, *args, **kwargs):
         self.shell_setting = "set -e; set -o pipefail; "
         # Workaround: this venv ensure that $(/usr/bin/env python) is evaluated to python3
         venv.create(".bazel_pyenv", clear=True)
-        self.build_cmd = "source .bazel_pyenv/bin/activate; bazel build"
+        self.build_cmd = "source .bazel_pyenv/bin/activate; bazel build --verbose_failures"
         self.test_cmd = "source .bazel_pyenv/bin/activate; bazel test"
         if running_on_ci():
             self.test_cmd += " --test_output=errors"
@@ -212,7 +212,7 @@ def run(self, extdir=None, srcdir=None, build_temp=None):
                 + [
                     "--compilation_mode=opt",
                     "--define is_torch_disc=false",  # still use mhlo within TF to build compiler main
-                    "@org_tensorflow//tensorflow/compiler/mlir/disc:disc_compiler_main",
+                    "@org_disc_compiler//mlir/disc:disc_compiler_main",
                 ]
             )
             subprocess.check_call(
diff --git a/pytorch_blade/distribution.cfg b/pytorch_blade/distribution.cfg
index ff869bb0039..d0bb200bf6f 100644
--- a/pytorch_blade/distribution.cfg
+++ b/pytorch_blade/distribution.cfg
@@ -1,4 +1,4 @@
 pytorch_blade/_torch_blade.so
 pytorch_blade/libtorch_blade.so
-external/org_tensorflow/tensorflow/compiler/mlir/xla/ral/libral_base_context.so
-external/org_tensorflow/tensorflow/compiler/mlir/disc/disc_compiler_main
+external/org_disc_compiler/mlir/xla/ral/libral_base_context.so
+external/org_disc_compiler/mlir/disc/disc_compiler_main
diff --git a/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion.cpp
index cc8876735df..4e65c2794eb 100644
--- a/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion.cpp
@@ -16,7 +16,7 @@
 #include <mlir/Dialect/Tensor/IR/Tensor.h>
 
 #include "llvm/Support/SourceMgr.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
 
 #include "pytorch_blade/common_utils/logging.h"
 #include "pytorch_blade/common_utils/utils.h"
diff --git a/pytorch_blade/pytorch_blade/compiler/mlir/runtime/BUILD b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/BUILD
index 1e5e5883b53..2f32f432e4b 100644
--- a/pytorch_blade/pytorch_blade/compiler/mlir/runtime/BUILD
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/BUILD
@@ -11,7 +11,7 @@ cc_library(
     deps = [
         "//pytorch_blade/common_utils:torch_blade_common",
         "//pytorch_blade/compiler/jit:torch_blade_jit",
-        "@org_tensorflow//tensorflow/compiler/mlir/xla/ral:ral_base_context_lib",
+        "@org_disc_compiler//mlir/xla/ral:ral_base_context_lib",
         "@local_org_torch//:ATen",
         "@local_org_torch//:libtorch",
     ] + if_cuda_is_configured([
diff --git a/pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.cpp
index 37bd8f856e2..c3102b02b86 100644
--- a/pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.cpp
@@ -28,7 +28,7 @@
 #endif // TORCH_BLADE_USE_ROCM
 #endif // TORCH_BLADE_BUILD_WITH_CUDA
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_api.h"
+#include "mlir/xla/ral/ral_api.h"
 
 #include "pytorch_blade/common_utils/utils.h"
 
diff --git a/pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.h b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.h
index 14908ae22d0..2fffeea126f 100644
--- a/pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.h
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.h
@@ -30,11 +30,11 @@ using CUDAStream = ::c10::hip::HIPStream;
 #else // TORCH_BLADE_USE_ROCM
 #include <c10/cuda/CUDAStream.h>
 #endif // TORCH_BLADE_USE_ROCM
-#include "tensorflow/compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.h"
+#include "mlir/xla/ral/context/base/cuda/cuda_context_impl.h"
 #endif // TORCH_BLADE_BUILD_WITH_CUDA
 // TODO(disc): figure out why the bazel does not trigger re-compile this file
 // after we update ral.
-#include "tensorflow/compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.h"
+#include "mlir/xla/ral/context/base/cpu/cpu_context_impl.h"
 
 #include "pytorch_blade/common_utils/macros.h"
 #include "pytorch_blade/common_utils/tempfs.h"
diff --git a/pytorch_blade/pytorch_blade/torch-mlir/BUILD b/pytorch_blade/pytorch_blade/torch-mlir/BUILD
index ffc66d68157..ebd78979bd0 100644
--- a/pytorch_blade/pytorch_blade/torch-mlir/BUILD
+++ b/pytorch_blade/pytorch_blade/torch-mlir/BUILD
@@ -68,8 +68,8 @@ cc_library(
         ":DiscTorchMLIRUtils",
         ":TorchMLIRConversionMhloPassesIncGen",
         "@mlir-hlo//:mlir_hlo",
-        "@org_tensorflow//tensorflow/compiler/mlir/disc:mhlo_disc",
-        "@org_tensorflow//tensorflow/compiler/mlir/disc:disc_pdl_utils",
+        "@org_disc_compiler//mlir/disc:mhlo_disc",
+        "@org_disc_compiler//mlir/disc:disc_pdl_utils",
         "@llvm-project//mlir:Dialect",
         "@torch-mlir//:TorchMLIRTorchBackendTypeConversion",
         "@torch-mlir//:TorchMLIRTorchConversionDialect",
diff --git a/pytorch_blade/pytorch_blade/torch-mlir/include/torch-mlir/Conversion/MhloPasses.h b/pytorch_blade/pytorch_blade/torch-mlir/include/torch-mlir/Conversion/MhloPasses.h
index 2c2f69e85f5..4a16f71e247 100644
--- a/pytorch_blade/pytorch_blade/torch-mlir/include/torch-mlir/Conversion/MhloPasses.h
+++ b/pytorch_blade/pytorch_blade/torch-mlir/include/torch-mlir/Conversion/MhloPasses.h
@@ -25,7 +25,7 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Pass/PassManager.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
 #include "torch-mlir/Dialect/Torch/Transforms/Passes.h"
 
 namespace mlir {
diff --git a/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/ApplyDiscPdlPatterns.cpp b/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/ApplyDiscPdlPatterns.cpp
index 06137d7574e..5828e28a4f2 100644
--- a/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/ApplyDiscPdlPatterns.cpp
+++ b/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/ApplyDiscPdlPatterns.cpp
@@ -14,7 +14,7 @@
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_pdl_utils.h"
+#include "mlir/disc/transforms/disc_pdl_utils.h"
 #include "torch-mlir/Conversion/MhloPasses.h"
 #include "torch-mlir/Conversion/TorchToMhlo/TorchToMhlo.h"
 #include "torch-mlir/Dialect/Torch/IR/TorchDialect.h"
diff --git a/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/DiscConvertTorchToDiscMhlo.cpp b/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/DiscConvertTorchToDiscMhlo.cpp
index 64d7e66bfd5..f91425dc499 100644
--- a/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/DiscConvertTorchToDiscMhlo.cpp
+++ b/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/DiscConvertTorchToDiscMhlo.cpp
@@ -16,8 +16,8 @@
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/Transforms/DialectConversion.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
 #include "stablehlo/dialect/ChloOps.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
 #include "torch-mlir/Conversion/MhloPasses.h"
 #include "torch-mlir/Conversion/TorchToMhlo/TorchToMhlo.h"
 #include "torch-mlir/Dialect/Torch/IR/TorchDialect.h"
diff --git a/pytorch_blade/scripts/build_pytorch_blade.sh b/pytorch_blade/scripts/build_pytorch_blade.sh
index 86dfe7d8a8e..9229173e256 100644
--- a/pytorch_blade/scripts/build_pytorch_blade.sh
+++ b/pytorch_blade/scripts/build_pytorch_blade.sh
@@ -53,7 +53,7 @@ function ci_build() {
       python3 ../scripts/python/common_setup.py --cpu_only $COMMON_SETUP_ARGS
     fi
     TORCH_LIB=$(python -c 'import torch; import os; print(os.path.dirname(os.path.abspath(torch.__file__)) + "/lib/")') \
-    export LD_LIBRARY_PATH=$TORCH_LIB:$LD_LIBRARY_PATH \
+    export LD_LIBRARY_PATH=$TORCH_LIB:$LD_LIBRARY_PATH
 
     # DEBUG=1 will trigger debug mode compilation
     DEBUG=1 python3 setup.py cpp_test 2>&1 | tee -a cpp_test.out;
diff --git a/scripts/python/common_setup.py b/scripts/python/common_setup.py
index 47977c38848..f377b56b5ba 100644
--- a/scripts/python/common_setup.py
+++ b/scripts/python/common_setup.py
@@ -611,10 +611,10 @@ def symlink_disc_files(args):
                 os.makedirs(dst_folder)
             execute("rm -rf {0} && ln -s {1} {0}".format(link_in_tf, src_file))
 
-    logger.info("linking ./tao to tf_community/tao")
+    logger.info("linking ./tao to tao_compiler/tao")
     execute(
         "rm -rf {0} && ln -s {1} {0}".format(
-            os.path.join(get_source_root_dir(), "tf_community", "tao"),
+            os.path.join(get_source_root_dir(), "tao_compiler", "tao"),
             os.path.join(get_source_root_dir(), "tao")
         )
     )
@@ -753,10 +753,15 @@ def test_tao_compiler_add_flags_platform_alibaba_cached(root, flag):
     restore_args_from_cache(root, args)
     return test_tao_compiler_add_flags_platform_alibaba(root, args, flag)
 
+def cleanup_building_env(root):
+    with cwd(root):
+        execute("rm -rf tf_community/.tf_configure.bazelrc")
+
 if __name__ == "__main__":
     args = parse_args()
 
     root = get_source_root_dir()
+    cleanup_building_env(root)
     symlink_disc_files(args)
 
     if args.enable_mkldnn:
diff --git a/scripts/python/tao_build.py b/scripts/python/tao_build.py
index a37613df7a1..f257a861ccc 100755
--- a/scripts/python/tao_build.py
+++ b/scripts/python/tao_build.py
@@ -279,10 +279,10 @@ def configure(root, args):
 
 @time_stage()
 def build_tao_compiler(root, args):
-    BAZEL_BUILD_CMD = "bazel build --experimental_multi_threaded_digest --define framework_shared_object=false" + ci_build_flag()
-    TARGET_TAO_COMPILER_MAIN = "//tensorflow/compiler/decoupling:tao_compiler_main"
-    TARGET_DISC_OPT = "//tensorflow/compiler/mlir/disc:disc-opt"
-    TARGET_DISC_REPLAY = "//tensorflow/compiler/mlir/disc/tools/disc-replay:disc-replay-main"
+    BAZEL_BUILD_CMD = "bazel build --verbose_failures --experimental_multi_threaded_digest --define framework_shared_object=false" + ci_build_flag()
+    TARGET_TAO_COMPILER_MAIN = "//decoupling:tao_compiler_main"
+    TARGET_DISC_OPT = "//mlir/disc:disc-opt"
+    TARGET_DISC_REPLAY = "//mlir/disc/tools/disc-replay:disc-replay-main"
 
     targets = None
     if args.bazel_target is not None:
@@ -296,9 +296,9 @@ def bazel_build(target, flag=""):
         logger.info("Building bazel target: " + target)
         execute(" ".join([BAZEL_BUILD_CMD, flag, target]))
 
-    with cwd(tf_root_dir(root)), gcc_env(args.compiler_gcc):
+    with cwd(os.path.join(root, "tao_compiler")), gcc_env(args.compiler_gcc):
         execute(
-            "cp -f -p {}/tao*.proto tensorflow/compiler/decoupling/".format(
+            "cp -f -p {}/tao*.proto decoupling/".format(
                 tao_bridge_dir(root)
             )
         )
@@ -341,7 +341,7 @@ def bazel_build(target, flag=""):
         if not args.rocm and not args.dcu:
             bazel_build(TARGET_DISC_REPLAY, flag=flag)
         execute(
-            "cp -f -p {}/tao/third_party/ptxas/10.2/ptxas ./bazel-bin/tensorflow/compiler/decoupling/".format(
+            "cp -f -p {}/tao/third_party/ptxas/10.2/ptxas ./bazel-bin/decoupling/".format(
                 root
             )
         )
@@ -350,7 +350,7 @@ def bazel_build(target, flag=""):
 
 @time_stage()
 def test_tao_compiler(root, args):
-    BAZEL_BUILD_CMD = "bazel build --experimental_multi_threaded_digest --define framework_shared_object=false --test_timeout=600 --javabase=@bazel_tools//tools/jdk:remote_jdk11"
+    BAZEL_BUILD_CMD = "bazel build --verbose_failures --experimental_multi_threaded_digest --define framework_shared_object=false --test_timeout=600 --javabase=@bazel_tools//tools/jdk:remote_jdk11"
     BAZEL_TEST_CMD = "bazel test --experimental_multi_threaded_digest --define framework_shared_object=false --test_timeout=600 --javabase=@bazel_tools//tools/jdk:remote_jdk11"
     BAZEL_TEST_CMD += ci_build_flag()
     BAZEL_BUILD_CMD += ci_build_flag()
@@ -362,24 +362,24 @@ def test_tao_compiler(root, args):
         BAZEL_TEST_CMD += " --java_runtime_version=remotejdk_11"
         BAZEL_BUILD_CMD += " --java_runtime_version=remotejdk_11"
 
-    TARGET_DISC_IR_TEST = "//tensorflow/compiler/mlir/disc/IR/tests/..."
-    TARGET_DISC_TRANSFORMS_TEST = "//tensorflow/compiler/mlir/disc/transforms/tests/..."
-    TARGET_DISC_E2E_TEST = "//tensorflow/compiler/mlir/disc/tests/..."
+    TARGET_DISC_IR_TEST = "//mlir/disc/IR/tests/..."
+    TARGET_DISC_TRANSFORMS_TEST = "//mlir/disc/transforms/tests/..."
+    TARGET_DISC_E2E_TEST = "//mlir/disc/tests/..."
     TARGET_DISC_RAL_TESTS = [
-        "//tensorflow/compiler/mlir/xla/ral:ral_metadata_test"
+        "//mlir/xla/ral:ral_metadata_test"
     ]
     TARGET_DISC_PDLL_TESTS = [
-        "//tensorflow/compiler/mlir/disc/tools/disc-pdll/tests/..."
+        "//mlir/disc/tools/disc-pdll/tests/..."
     ]
     TARGET_DISC_CUDA_SOURCE_TESTS = [
-        "//tensorflow/compiler/mlir/disc/tools/disc-source-emitter/tests/..."
+        "//mlir/disc/tools/disc-source-emitter/tests/..."
     ]
     TARGET_DISC_TRANSFORM_DIALECT_TESTS = [
-        "//tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/tests/...",
-        "//tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/tests/...",
+        "//mlir/disc/tools/disc-transform/transforms/tests/...",
+        "//mlir/disc/tools/disc-transform/LinalgExt/tests/...",
     ]
 
-    TARGET_DISC_REPLAY_TEST = "//tensorflow/compiler/mlir/disc/tools/disc-replay:disc-replay-test"
+    TARGET_DISC_REPLAY_TEST = "//mlir/disc/tools/disc-replay:disc-replay-test"
 
     targets = None
     if args.bazel_target is not None:
@@ -394,9 +394,9 @@ def bazel_test(target, flag=""):
         execute(" ".join([BAZEL_BUILD_CMD, flag, target]))
         execute(" ".join([BAZEL_TEST_CMD, flag + ' --test_env=TF_CPP_VMODULE=disc_compiler=1,disc_transform_legalize_to_loop=1 --test_env=TF_ENABLE_ONEDNN_OPTS=0' , target]))
 
-    with cwd(tf_root_dir(root)), gcc_env(args.compiler_gcc):
+    with cwd(os.path.join(root, "tao_compiler")), gcc_env(args.compiler_gcc):
         execute(
-            "cp -f -p {}/tao*.proto tensorflow/compiler/decoupling/".format(
+            "cp -f -p {}/tao*.proto decoupling/".format(
                 tao_bridge_dir(root)
             )
         )
@@ -414,8 +414,8 @@ def bazel_test(target, flag=""):
                 TARGET_DISC_TRANSFORMS_TEST,
                 TARGET_DISC_E2E_TEST,
             ] + TARGET_DISC_RAL_TESTS \
-              + TARGET_DISC_PDLL_TESTS \
-              + TARGET_DISC_TRANSFORM_DIALECT_TESTS
+              + TARGET_DISC_TRANSFORM_DIALECT_TESTS \
+              + TARGET_DISC_PDLL_TESTS 
             MLIR_TESTS = " ".join(mlir_test_list)
             bazel_test(MLIR_TESTS, flag=flag)
         else:
@@ -640,7 +640,7 @@ def make_package(root, args):
         generate_build_info(build_info_file)
 
         F_TAO_COMPILER_MAIN = (
-            "./tf_community/bazel-bin/tensorflow/compiler/decoupling/tao_compiler_main"
+            "./tao_compiler/bazel-bin/decoupling/tao_compiler_main"
         )
         F_TAO_OPS_SO = "./tao/bazel-bin/libtao_ops.so"
         F_PTXAS = "./tao/third_party/ptxas/10.2/ptxas"
diff --git a/tao/BUILD b/tao/BUILD
index 5ffdcc15f4e..0c9b0edfc68 100644
--- a/tao/BUILD
+++ b/tao/BUILD
@@ -103,7 +103,7 @@ cc_library(
     ),
     deps = [
         ":version_header",
-        "@org_tao_compiler//tensorflow/compiler/mlir/xla/ral:ral_bridge",
+        "@org_tao_compiler//mlir/xla/ral:ral_bridge",
     ] + if_platform_alibaba([
         "@blade_service_common//blade_service_common:blade_service_common_deps",
     ]) + if_internal_serving(
diff --git a/tao/tao_bridge/executable.h b/tao/tao_bridge/executable.h
index 180a8fc6bcf..bf269e03515 100644
--- a/tao/tao_bridge/executable.h
+++ b/tao/tao_bridge/executable.h
@@ -18,9 +18,9 @@
 #include <unordered_map>
 #include <vector>
 
+#include "mlir/xla/ral/context/tensorflow/tf_context_impl.h"
 #include "tao_bridge/common.h"
 #include "tao_bridge/tao_compilation_result.pb.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/tensorflow/tf_context_impl.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/stream_executor/device_memory.h"
 
diff --git a/tao/tao_bridge/mlir/mlir_executable.cc b/tao/tao_bridge/mlir/mlir_executable.cc
index 44f2c2f2306..29757982594 100644
--- a/tao/tao_bridge/mlir/mlir_executable.cc
+++ b/tao/tao_bridge/mlir/mlir_executable.cc
@@ -19,7 +19,7 @@
 #include "tao_bridge/kernels/disc_launch.h"
 #endif  // PLATFORM_ALIBABA
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_api.h"
+#include "mlir/xla/ral/ral_api.h"
 
 namespace tensorflow {
 namespace tao {
diff --git a/tao_compiler/.bazelrc b/tao_compiler/.bazelrc
new file mode 100644
index 00000000000..fdf6cece41c
--- /dev/null
+++ b/tao_compiler/.bazelrc
@@ -0,0 +1,7 @@
+startup --host_jvm_args=-Djdk.http.auth.tunneling.disabledSchemes=
+
+try-import ../tf_community/.bazelrc
+try-import ../tf_community/.tf_configure.bazelrc
+try-import %workspace%/.bazelrc.user
+
+build --experimental_ui_max_stdouterr_bytes=-1
\ No newline at end of file
diff --git a/tao_compiler/WORKSPACE b/tao_compiler/WORKSPACE
index e69de29bb2d..ddb72b8e0bf 100644
--- a/tao_compiler/WORKSPACE
+++ b/tao_compiler/WORKSPACE
@@ -0,0 +1,28 @@
+workspace(name = "disc_compiler")
+
+local_repository(
+    name = "org_tensorflow",
+    path = "../tf_community",
+)
+
+# Initialize the TensorFlow repository and all dependencies.
+#
+# The cascade of load() statements and tf_workspace?() calls works around the
+# restriction that load() statements need to be at the top of .bzl files.
+# E.g. we can not retrieve a new repository with http_archive and then load()
+# a macro from that repository in the same file.
+load("@org_tensorflow//tensorflow:workspace3.bzl", "tf_workspace3")
+
+tf_workspace3()
+
+load("@org_tensorflow//tensorflow:workspace2.bzl", "tf_workspace2")
+
+tf_workspace2()
+
+load("@org_tensorflow//tensorflow:workspace1.bzl", "tf_workspace1")
+
+tf_workspace1()
+
+load("@org_tensorflow//tensorflow:workspace0.bzl", "tf_workspace0")
+
+tf_workspace0()
diff --git a/tao_compiler/decoupling/BUILD b/tao_compiler/decoupling/BUILD
index 3b7dcbb64ec..d16c3b8da97 100644
--- a/tao_compiler/decoupling/BUILD
+++ b/tao_compiler/decoupling/BUILD
@@ -1,7 +1,7 @@
 licenses(["notice"])  # Apache 2.0
 
-load("//tensorflow:tensorflow.bzl", "tf_cc_binary", "tf_cc_test")
-load("//tensorflow/compiler/mlir/util:util.bzl", "if_platform_alibaba")
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "tf_cc_binary", "tf_cc_test")
+load("//mlir/util:util.bzl", "if_platform_alibaba")
 
 package_group(
     name = "internal",
@@ -25,7 +25,7 @@ package(
 
 load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda_is_configured")
 load("@local_config_rocm//rocm:build_defs.bzl", "if_rocm_is_configured")
-load("//tensorflow/compiler/mlir/util:util.bzl", "if_cuda_or_rocm")
+load("//mlir/util:util.bzl", "if_cuda_or_rocm")
 load(
     "@com_google_protobuf//:protobuf.bzl",
     "cc_proto_library",
@@ -36,7 +36,7 @@ cc_proto_library(
     srcs = ["tao_compiler_input.proto"],
     visibility = ["//visibility:public"],
     deps = [
-        "//tensorflow/core:protos_all_cc",
+        "@org_tensorflow//tensorflow/core:protos_all_cc",
     ],
 )
 
@@ -45,7 +45,7 @@ cc_proto_library(
     srcs = ["tao_compilation_result.proto"],
     visibility = ["//visibility:public"],
     deps = [
-        "//tensorflow/core:protos_all_cc",
+        "@org_tensorflow//tensorflow/core:protos_all_cc",
     ],
 )
 
@@ -54,7 +54,7 @@ cc_library(
     srcs = ["tao_compiler_trace.cc"],
     hdrs = ["tao_compiler_trace.h"],
     deps = [
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:lib",
     ],
 )
 
@@ -65,9 +65,9 @@ tf_cc_test(
     linkstatic = 1,
     deps = [
         "tao_compiler_trace",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:test",
-        "//tensorflow/core:test_main",
+        "@org_tensorflow//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:test",
+        "@org_tensorflow//tensorflow/core:test_main",
     ],
 )
 
@@ -75,7 +75,7 @@ cc_library(
     name = "disc_custom_ops",
     srcs = ["fake_quant_op.cc"],
     deps = [
-        "//tensorflow/core:framework"
+        "@org_tensorflow//tensorflow/core:framework"
     ],
     alwayslink = 1,
 )
@@ -88,10 +88,10 @@ cc_library(
     deps = [
         "tao_compiler_input",
         "tao_compilation_result",
-        "//tensorflow/core:framework",
-        "//tensorflow/core:lib",
-        "//tensorflow/compiler/xla:statusor",
-        "//tensorflow/compiler/xla:literal",
+        "@org_tensorflow//tensorflow/core:framework",
+        "@org_tensorflow//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/compiler/xla:statusor",
+        "@org_tensorflow//tensorflow/compiler/xla:literal",
     ]
 )
 
@@ -118,41 +118,41 @@ cc_library(
         ":compiler_base",
         ":disc_custom_ops",
         ":tao_compiler_trace",
-        "//tensorflow/cc:cc_ops",
-        "//tensorflow/cc:ops",
-        "//tensorflow/cc:resource_variable_ops",
-        "//tensorflow/cc:function_ops",
-        "//tensorflow/compiler/jit:jit",
-        "//tensorflow/compiler/tf2xla:tf2xla",
-        "//tensorflow/compiler/xla:error_spec",
-        "//tensorflow/compiler/xla:literal",
-        "//tensorflow/compiler/xla:literal_comparison",
-        "//tensorflow/compiler/xla:shape_util",
-        "//tensorflow/compiler/xla:statusor",
-        "//tensorflow/compiler/xla:status_macros",
-        "//tensorflow/compiler/xla/client:client_library",
-        "//tensorflow/compiler/xla/client:local_client",
-        "//tensorflow/compiler/xla/client:xla_builder",
-        "//tensorflow/compiler/xla/service:hlo",
-        "//tensorflow/compiler/xla/service:hlo_proto_cc",
-        "//tensorflow/compiler/xla/service:hlo_runner",
-        "//tensorflow/core:core_cpu",
-        "//tensorflow/core:core_cpu_internal",
-        "//tensorflow/core:framework",
-        "//tensorflow/core:framework_internal",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:lib_internal",
-        "//tensorflow/core:protos_all_cc",
+        "@org_tensorflow//tensorflow/cc:cc_ops",
+        "@org_tensorflow//tensorflow/cc:ops",
+        "@org_tensorflow//tensorflow/cc:resource_variable_ops",
+        "@org_tensorflow//tensorflow/cc:function_ops",
+        "@org_tensorflow//tensorflow/compiler/jit:jit",
+        "@org_tensorflow//tensorflow/compiler/tf2xla:tf2xla",
+        "@org_tensorflow//tensorflow/compiler/xla:error_spec",
+        "@org_tensorflow//tensorflow/compiler/xla:literal",
+        "@org_tensorflow//tensorflow/compiler/xla:literal_comparison",
+        "@org_tensorflow//tensorflow/compiler/xla:shape_util",
+        "@org_tensorflow//tensorflow/compiler/xla:statusor",
+        "@org_tensorflow//tensorflow/compiler/xla:status_macros",
+        "@org_tensorflow//tensorflow/compiler/xla/client:client_library",
+        "@org_tensorflow//tensorflow/compiler/xla/client:local_client",
+        "@org_tensorflow//tensorflow/compiler/xla/client:xla_builder",
+        "@org_tensorflow//tensorflow/compiler/xla/service:hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/service:hlo_proto_cc",
+        "@org_tensorflow//tensorflow/compiler/xla/service:hlo_runner",
+        "@org_tensorflow//tensorflow/core:core_cpu",
+        "@org_tensorflow//tensorflow/core:core_cpu_internal",
+        "@org_tensorflow//tensorflow/core:framework",
+        "@org_tensorflow//tensorflow/core:framework_internal",
+        "@org_tensorflow//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:lib_internal",
+        "@org_tensorflow//tensorflow/core:protos_all_cc",
         "@com_google_absl//absl/strings",
     ] + if_cuda_or_rocm([
-        "//tensorflow/compiler/xla/service/gpu:gpu_transfer_manager",
+        "@org_tensorflow//tensorflow/compiler/xla/service/gpu:gpu_transfer_manager",
     ]) + if_rocm_is_configured([
-        "//tensorflow/stream_executor/rocm:rocm_driver",
+        "@org_tensorflow//tensorflow/stream_executor/rocm:rocm_driver",
     ]) + [
         "@llvm-project//mlir:IR",
         "@llvm-project//llvm:Support",
-        "//tensorflow/compiler/mlir/disc:disc_util",
-        "//tensorflow/compiler/mlir/disc:disc_compiler",
+        "//mlir/disc:disc_util",
+        "//mlir/disc:disc_compiler",
     ],
     alwayslink = True,
 )
diff --git a/tao_compiler/decoupling/compiler_base.cc b/tao_compiler/decoupling/compiler_base.cc
index 3e3f047b660..36c0e2981e3 100644
--- a/tao_compiler/decoupling/compiler_base.cc
+++ b/tao_compiler/decoupling/compiler_base.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/decoupling/compiler_base.h"
+#include "decoupling/compiler_base.h"
 
 namespace tensorflow {
 namespace tao {
diff --git a/tao_compiler/decoupling/compiler_base.h b/tao_compiler/decoupling/compiler_base.h
index d9cba9790e3..c800f0f0749 100644
--- a/tao_compiler/decoupling/compiler_base.h
+++ b/tao_compiler/decoupling/compiler_base.h
@@ -12,8 +12,8 @@
 #ifndef TENSORFLOW_COMPILER_DECOUPLING_MLIR_COMPILER_BASE_H_
 #define TENSORFLOW_COMPILER_DECOUPLING_MLIR_COMPILER_BASE_H_
 
-#include "tensorflow/compiler/decoupling/tao_compilation_result.pb.h"
-#include "tensorflow/compiler/decoupling/tao_compiler_input.pb.h"
+#include "decoupling/tao_compilation_result.pb.h"
+#include "decoupling/tao_compiler_input.pb.h"
 #include "tensorflow/compiler/xla/statusor.h"
 #include "tensorflow/compiler/xla/util.h"
 #include "tensorflow/core/framework/types.h"
diff --git a/tao_compiler/decoupling/mlir_compiler.cc b/tao_compiler/decoupling/mlir_compiler.cc
index efc700a562d..842b5e985b1 100644
--- a/tao_compiler/decoupling/mlir_compiler.cc
+++ b/tao_compiler/decoupling/mlir_compiler.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/decoupling/mlir_compiler.h"
+#include "decoupling/mlir_compiler.h"
 
 #include <vector>
 
@@ -23,8 +23,8 @@
 #include "mlir/IR/Attributes.h"  // from @llvm-project
 #include "mlir/InitAllDialects.h"
 #include "mlir/InitAllPasses.h"
-#include "tensorflow/compiler/mlir/disc/disc_compiler.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
+#include "mlir/disc/disc_compiler.h"
+#include "mlir/disc/disc_util.h"
 #include "tensorflow/compiler/mlir/tensorflow/transforms/bridge.h"
 #include "tensorflow/compiler/mlir/tensorflow/transforms/passes.h"
 #include "tensorflow/compiler/mlir/tensorflow/translate/import_model.h"
diff --git a/tao_compiler/decoupling/mlir_compiler.h b/tao_compiler/decoupling/mlir_compiler.h
index 4af30e7cfda..3cad27cac22 100644
--- a/tao_compiler/decoupling/mlir_compiler.h
+++ b/tao_compiler/decoupling/mlir_compiler.h
@@ -12,9 +12,9 @@
 #ifndef TENSORFLOW_COMPILER_DECOUPLING_MLIR_COMPILER_H_
 #define TENSORFLOW_COMPILER_DECOUPLING_MLIR_COMPILER_H_
 
+#include "decoupling/compiler_base.h"
 #include "mlir/IR/BuiltinOps.h"
-#include "tensorflow/compiler/decoupling/compiler_base.h"
-#include "tensorflow/compiler/mlir/disc/disc_compiler.h"
+#include "mlir/disc/disc_compiler.h"
 
 namespace llvm {
 class InitLLVM;
diff --git a/tao_compiler/decoupling/mlir_compiler_impl_cpu.cc b/tao_compiler/decoupling/mlir_compiler_impl_cpu.cc
index e4cdfe5d797..2faab50342e 100644
--- a/tao_compiler/decoupling/mlir_compiler_impl_cpu.cc
+++ b/tao_compiler/decoupling/mlir_compiler_impl_cpu.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/decoupling/mlir_compiler_impl_cpu.h"
+#include "decoupling/mlir_compiler_impl_cpu.h"
 
 namespace tensorflow {
 namespace tao {
diff --git a/tao_compiler/decoupling/mlir_compiler_impl_cpu.h b/tao_compiler/decoupling/mlir_compiler_impl_cpu.h
index a74d2888571..153b94f8c19 100644
--- a/tao_compiler/decoupling/mlir_compiler_impl_cpu.h
+++ b/tao_compiler/decoupling/mlir_compiler_impl_cpu.h
@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_COMPILER_DECOUPLING_MLIR_COMPILER_IMPL_CPU_H_
 #define TENSORFLOW_COMPILER_DECOUPLING_MLIR_COMPILER_IMPL_CPU_H_
 
-#include "tensorflow/compiler/decoupling/mlir_compiler.h"
+#include "decoupling/mlir_compiler.h"
 
 namespace tensorflow {
 
diff --git a/tao_compiler/decoupling/mlir_compiler_impl_gpu.cc b/tao_compiler/decoupling/mlir_compiler_impl_gpu.cc
index 471afe1cec0..dbb74f6f3c4 100644
--- a/tao_compiler/decoupling/mlir_compiler_impl_gpu.cc
+++ b/tao_compiler/decoupling/mlir_compiler_impl_gpu.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/decoupling/mlir_compiler_impl_gpu.h"
+#include "decoupling/mlir_compiler_impl_gpu.h"
 
 #include "cuda.h"
 
diff --git a/tao_compiler/decoupling/mlir_compiler_impl_gpu.h b/tao_compiler/decoupling/mlir_compiler_impl_gpu.h
index 46f8aef543c..632ced650fb 100644
--- a/tao_compiler/decoupling/mlir_compiler_impl_gpu.h
+++ b/tao_compiler/decoupling/mlir_compiler_impl_gpu.h
@@ -14,7 +14,7 @@
 
 #include <memory>
 
-#include "tensorflow/compiler/decoupling/mlir_compiler.h"
+#include "decoupling/mlir_compiler.h"
 
 namespace tensorflow {
 
diff --git a/tao_compiler/decoupling/mlir_compiler_impl_rocm.cc b/tao_compiler/decoupling/mlir_compiler_impl_rocm.cc
index b6940f6c719..47d2e0832f4 100644
--- a/tao_compiler/decoupling/mlir_compiler_impl_rocm.cc
+++ b/tao_compiler/decoupling/mlir_compiler_impl_rocm.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/decoupling/mlir_compiler_impl_rocm.h"
+#include "decoupling/mlir_compiler_impl_rocm.h"
 
 #define CUDA_SUCCESS hipSuccess
 #include "tensorflow/stream_executor/rocm/rocm_driver_wrapper.h"
diff --git a/tao_compiler/decoupling/mlir_compiler_impl_rocm.h b/tao_compiler/decoupling/mlir_compiler_impl_rocm.h
index 65eba6d9381..fd52be23675 100644
--- a/tao_compiler/decoupling/mlir_compiler_impl_rocm.h
+++ b/tao_compiler/decoupling/mlir_compiler_impl_rocm.h
@@ -14,7 +14,7 @@
 
 #include <memory>
 
-#include "tensorflow/compiler/decoupling/mlir_compiler.h"
+#include "decoupling/mlir_compiler.h"
 
 namespace tensorflow {
 
diff --git a/tao_compiler/decoupling/tao_compiler_main.cc b/tao_compiler/decoupling/tao_compiler_main.cc
index dc233438d43..34eae7c7124 100644
--- a/tao_compiler/decoupling/tao_compiler_main.cc
+++ b/tao_compiler/decoupling/tao_compiler_main.cc
@@ -29,12 +29,12 @@ limitations under the License.
 #include <unordered_map>
 
 #include "absl/strings/str_split.h"
+#include "decoupling/compiler_base.h"
+#include "decoupling/tao_compiler_input.pb.h"
+#include "decoupling/tao_compiler_trace.h"
 #include "llvm/Support/CommandLine.h"
 #include "mlir/Pass/PassManager.h"  // from @llvm-project
 #include "mlir/Support/Timing.h"    // from @llvm-project
-#include "tensorflow/compiler/decoupling/compiler_base.h"
-#include "tensorflow/compiler/decoupling/tao_compiler_input.pb.h"
-#include "tensorflow/compiler/decoupling/tao_compiler_trace.h"
 #include "tensorflow/compiler/xla/debug_options_flags.h"
 #include "tensorflow/compiler/xla/statusor.h"
 #include "tensorflow/core/lib/strings/strcat.h"
diff --git a/tao_compiler/decoupling/tao_compiler_trace.cc b/tao_compiler/decoupling/tao_compiler_trace.cc
index 30125437b51..e53cde9fafb 100644
--- a/tao_compiler/decoupling/tao_compiler_trace.cc
+++ b/tao_compiler/decoupling/tao_compiler_trace.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/decoupling/tao_compiler_trace.h"
+#include "decoupling/tao_compiler_trace.h"
 
 #include <fstream>
 #include <mutex>
diff --git a/tao_compiler/file_map b/tao_compiler/file_map
index 812ad5d7761..9d7f62694aa 100644
--- a/tao_compiler/file_map
+++ b/tao_compiler/file_map
@@ -1,6 +1,6 @@
 # relative path under tao_compiler, relative path under tf_community
 decoupling,tensorflow/compiler/decoupling
 mlir/disc,tensorflow/compiler/mlir/disc
-mlir/util,tensorflow/compiler/mlir/util
+mlir/util,mlir/util
 mlir/xla/ral,tensorflow/compiler/mlir/xla/ral
 .bazelrc.user,tensorflow/../.bazelrc.user
diff --git a/tao_compiler/mlir/BUILD b/tao_compiler/mlir/BUILD
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tao_compiler/mlir/disc/BUILD b/tao_compiler/mlir/disc/BUILD
index b052be0296a..17ec211284f 100644
--- a/tao_compiler/mlir/disc/BUILD
+++ b/tao_compiler/mlir/disc/BUILD
@@ -18,15 +18,16 @@ load("@org_tensorflow//tensorflow/core/platform:build_config_root.bzl", "if_stat
 load("@llvm-project//mlir:tblgen.bzl", "gentbl_cc_library", "gentbl_filegroup", "td_library")
 load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda_is_configured")
 load("@local_config_rocm//rocm:build_defs.bzl", "if_rocm_is_configured")
-load("//tensorflow/compiler/mlir/util:util.bzl",
+load("//mlir/util:util.bzl",
      "disc_cc_library",
      "if_cuda_or_rocm",
      "if_skip_compute_intensive_fusion",
 )
-load("//tensorflow/compiler/mlir/util:util.bzl", "if_torch_disc")
+load("//mlir/util:util.bzl", "if_torch_disc")
+
 
 package(
-    default_visibility = [":friends"],
+    default_visibility = ["//visibility:public"],
     licenses = ["notice"],  # Apache 2.0
 )
 
@@ -38,10 +39,6 @@ package_group(
         "//learning/brain/experimental/swift_mlir/...",
         "//learning/brain/google/xla/kernels/...",
         "//learning/brain/swift/swift_mlir/...",
-        "//tensorflow/compiler/mlir/...",
-        "//tensorflow/compiler/tf2xla/...",
-        "//tensorflow/compiler/xla/...",
-        "//tensorflow/compiler/...",
         "//third_party/iree/...",
         "//third_party/mlir_edge/...",
         "//third_party/tf_runtime/tools/tf_kernel_gen/...",
@@ -99,7 +96,7 @@ cc_library(
     ],
     deps = if_torch_disc(
         ["@mlir-hlo//:mlir_hlo"],
-        ["//tensorflow/compiler/xla/mlir_hlo:mlir_hlo"]
+        ["@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo"]
     )
 )
 
@@ -138,8 +135,8 @@ tf_cc_test(
     deps = [
         ":cycle_detector",
         # TODO(b/160617323): Decouple MLIR HLO from TensorFlow/XLA
-        "//tensorflow/compiler/xla:test",
-        "//tensorflow/core:test_main",
+        "@org_tensorflow//tensorflow/compiler/xla:test",
+        "@org_tensorflow//tensorflow/core:test_main",
     ],
 )
 
@@ -166,8 +163,8 @@ cc_library(
     deps = [
         ":cycle_detector",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/core:lib",
         "@llvm-project//mlir:MemRefDialect",
         "@llvm-project//mlir:ShapeDialect",
         "@llvm-project//llvm:Support",
@@ -186,13 +183,13 @@ disc_cc_library(
     deps = [
         ":all_passes",
         ":disc_ral",
-        "//tensorflow/compiler/xla/mlir_hlo:all_passes",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo_gpu",
-        "//tensorflow/core/platform:status",
-        "//tensorflow/compiler/mlir/tensorflow:compile_mlir_util",
-        "//tensorflow/compiler/mlir/tensorflow:tf_dialect_passes",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:all_passes",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo_gpu",
+        "@org_tensorflow//tensorflow/core/platform:status",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:compile_mlir_util",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:tf_dialect_passes",
         "@llvm-project//llvm:OrcJIT",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:ExecutionEngineUtils",
@@ -236,7 +233,7 @@ cc_library(
         ":disc_to_llvm_common",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:lib",
         "@llvm-project//llvm:Support",
         "@llvm-project//llvm:TransformUtils",
         "@llvm-project//mlir:AffineDialect",
@@ -274,7 +271,7 @@ cc_library(
     ],
     deps = [
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
@@ -292,9 +289,9 @@ cc_library(
         ":disc_map_hlo_to_lhlo_op",
         ":lmhlo_disc",
         ":mhlo_disc",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/compiler/xla/mlir_hlo:map_hlo_to_lhlo_op",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:map_hlo_to_lhlo_op",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
         "@llvm-project//mlir:Support",
@@ -311,9 +308,9 @@ cc_library(
         ":codegen_utils",
         ":disc_shape_optimization_utils",
         ":disc_util",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/compiler/xla/mlir_hlo:map_lmhlo_to_scalar_op",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:map_lmhlo_to_scalar_op",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:GPUDialect",
         "@llvm-project//mlir:IR",
@@ -336,11 +333,11 @@ cc_library(
         ":input_inline_fusion_pattern",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:lmhlo_pass_inc_gen",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/compiler/xla/mlir_hlo:map_lmhlo_to_scalar_op",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lmhlo_pass_inc_gen",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:map_lmhlo_to_scalar_op",
+        "@org_tensorflow//tensorflow/core:lib",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:GPUDialect",
@@ -360,8 +357,8 @@ cc_library(
     srcs = ["transforms/disc_fuse_splat_const.cc"],
     deps = [
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:lmhlo_pass_inc_gen",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lmhlo_pass_inc_gen",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:MemRefDialect",
@@ -384,7 +381,7 @@ cc_library(
     deps = [
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/mlir/tensorflow:tensorflow",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:tensorflow",
         "@llvm-project//mlir:Dialect",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
@@ -407,12 +404,12 @@ cc_library(
         "@com_google_absl//absl/strings",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
         "@llvm-project//mlir:Transforms",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:lib",
     ],
     alwayslink = 1,
 )
@@ -430,12 +427,12 @@ cc_library(
         "@com_google_absl//absl/strings",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
         "@llvm-project//mlir:Transforms",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:lib",
     ],
     alwayslink = 1,
 )
@@ -451,7 +448,7 @@ cc_library(
     deps = [
         ":disc_util",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
@@ -471,7 +468,7 @@ cc_library(
     deps = [
         ":disc_util",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
@@ -491,7 +488,7 @@ cc_library(
     deps = [
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
@@ -513,7 +510,7 @@ cc_library(
         ":mhlo_disc",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -534,7 +531,7 @@ cc_library(
         ":pass_details",
         ":placement_utils",
         ":mhlo_disc",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -558,7 +555,7 @@ cc_library(
         ":disc_shape",
         ":disc_util",
         ":source_emitter",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:AffineDialect",
         "@llvm-project//mlir:IR",
@@ -582,8 +579,8 @@ cc_library(
         ":fusion_utils",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/core:lib",
         "@llvm-project//llvm:Core",
         "@llvm-project//mlir:Dialect",
         "@llvm-project//mlir:IR",
@@ -606,7 +603,7 @@ cc_library(
     ],
     deps = [
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
@@ -626,8 +623,8 @@ cc_library(
         ":codegen_utils",
         ":fusion_utils",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/core:lib",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -648,8 +645,8 @@ cc_library(
         ":codegen_utils",
         ":fusion_utils",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/core:lib",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:AffineDialect",
         "@llvm-project//mlir:FuncDialect",
@@ -671,8 +668,8 @@ cc_library(
         ":codegen_utils",
         ":fusion_utils",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/core:lib",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:AffineDialect",
         "@llvm-project//mlir:FuncDialect",
@@ -713,8 +710,8 @@ cc_library(
         ":disc_util",
         ":mhlo_disc",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:MemRefDialect",
@@ -744,7 +741,7 @@ cc_library(
         ":lmhlo_disc",
         ":placement_utils",
         ":shape_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//llvm:Core",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
@@ -765,8 +762,8 @@ cc_library(
         ":pass_details",
         ":placement_utils",
         ":cycle_detector",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/core:lib",
         "@llvm-project//llvm:Core",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
@@ -790,9 +787,9 @@ cc_library(
         ":disc_util",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/mlir/xla/ral:ral_metadata",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/core/platform:env",
+        "//mlir/xla/ral:ral_metadata",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/core/platform:env",
         "@llvm-project//llvm:Core",
         "@llvm-project//mlir:Dialect",
         "@llvm-project//mlir:IR",
@@ -831,7 +828,7 @@ cc_library(
         ":qconv_custom_call",
         ":sparse_custom_call",
         ":topk_custom_call",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -865,7 +862,7 @@ cc_library(
         ":topk_custom_call",
         ":qconv_custom_call",
         ":sparse_custom_call",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//llvm:TransformUtils",
         "@llvm-project//mlir:FuncDialect",
@@ -895,8 +892,8 @@ cc_library(
         ":disc_util",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -953,21 +950,21 @@ disc_cc_library(
         "@llvm-project//mlir:Support",
         "@llvm-project//mlir:ToLLVMIRTranslation",
         "@llvm-project//mlir:Transforms",
-        "//tensorflow/compiler/xla/service/gpu/llvm_gpu_backend",
-        "//tensorflow/compiler/xla/service/gpu:stream_executor_util",
-        "//tensorflow/compiler/xla/service/gpu:target_constants",
-        "//tensorflow/compiler/xla/service/gpu:gpu_asm_opts_util",
-        "//tensorflow/compiler/xla/service:hlo_module_config",
-        "//tensorflow/compiler/xla:debug_options_flags",
-        "//tensorflow/compiler/xla:status",
-        "//tensorflow/compiler/xla:statusor",
-        "//tensorflow/compiler/xla/stream_executor/gpu:asm_compiler",
-        "//tensorflow/tsl/platform:cuda_libdevice_path",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/compiler/xla/service/gpu/llvm_gpu_backend",
+        "@org_tensorflow//tensorflow/compiler/xla/service/gpu:stream_executor_util",
+        "@org_tensorflow//tensorflow/compiler/xla/service/gpu:target_constants",
+        "@org_tensorflow//tensorflow/compiler/xla/service/gpu:gpu_asm_opts_util",
+        "@org_tensorflow//tensorflow/compiler/xla/service:hlo_module_config",
+        "@org_tensorflow//tensorflow/compiler/xla:debug_options_flags",
+        "@org_tensorflow//tensorflow/compiler/xla:status",
+        "@org_tensorflow//tensorflow/compiler/xla:statusor",
+        "@org_tensorflow//tensorflow/compiler/xla/stream_executor/gpu:asm_compiler",
+        "@org_tensorflow//tensorflow/tsl/platform:cuda_libdevice_path",
+        "@org_tensorflow//tensorflow/core:lib",
     ] + if_cuda_is_configured([
-        "//tensorflow/compiler/xla/stream_executor/cuda:cuda_asm_compiler",
+        "@org_tensorflow//tensorflow/compiler/xla/stream_executor/cuda:cuda_asm_compiler",
     ]) + if_rocm_is_configured([
-        "//tensorflow/core/platform:rocm_rocdl_path",
+        "@org_tensorflow//tensorflow/core/platform:rocm_rocdl_path",
     ]),
 )
 
@@ -1030,8 +1027,8 @@ cc_library(
         ":codegen_utils",
         ":disc_lhlo_elemental_utils",
         ":fusion_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/compiler/xla/mlir_hlo:map_lmhlo_to_scalar_op",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:map_lmhlo_to_scalar_op",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:MemRefDialect",
@@ -1050,9 +1047,9 @@ cc_library(
         ":fusion_utils",
         ":input_inline_fusion_pattern",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/compiler/xla/mlir_hlo:map_lmhlo_to_scalar_op",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:map_lmhlo_to_scalar_op",
         "@com_google_absl//absl/memory",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:Analysis",
@@ -1075,7 +1072,7 @@ cc_library(
     ],
     deps = [
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -1099,7 +1096,7 @@ cc_library(
     ],
     deps = [
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:ArithDialect",
         "@llvm-project//mlir:FuncDialect",
@@ -1122,7 +1119,7 @@ cc_library(
     ],
     deps = [
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -1178,7 +1175,7 @@ cc_library(
 filegroup(
     name = "disc_lower_tf_ops_td_files",
     srcs = [
-        "//tensorflow/compiler/mlir/tensorflow:tensorflow_ops_td_files",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:tensorflow_ops_td_files",
         "@llvm-project//mlir:OpBaseTdFiles",
         "@llvm-project//mlir:SideEffectInterfacesTdFiles",
         "@llvm-project//mlir:include/mlir/Interfaces/InferTypeOpInterface.td",
@@ -1199,10 +1196,14 @@ gentbl_cc_library(
     td_file = "transforms/lower_tf.td",
     td_srcs = [
         ":disc_lower_tf_ops_td_files",
-        "//tensorflow/compiler/mlir/tensorflow:tensorflow_ops_td_files",
-        "//tensorflow/compiler/mlir/tensorflow:tensorflow_optimize_td_files",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:tensorflow_ops_td_files",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:tensorflow_optimize_td_files",
+    ],
+    includes=["external/org_tensorflow"],
+    deps = [
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:hlo_ops_td_files",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:tensorflow_ops_td_files",
     ],
-    deps = ["//tensorflow/compiler/xla/mlir_hlo:hlo_ops_td_files"],
 )
 
 cc_library(
@@ -1223,10 +1224,10 @@ cc_library(
         ":topk_custom_call",
         ":qconv_custom_call",
         ":sparse_custom_call",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/compiler/mlir/tensorflow:tensorflow",
-        "//tensorflow/compiler/mlir/tensorflow:convert_tensor",
-        "//tensorflow/compiler/mlir/xla:legalize_utils",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:tensorflow",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:convert_tensor",
+        "@org_tensorflow//tensorflow/compiler/mlir/xla:legalize_utils",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -1407,7 +1408,7 @@ cc_library(
     deps = [
         ":fusion_utils",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:GPUDialect",
@@ -1429,7 +1430,7 @@ cc_library(
     ],
     deps = [
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:LLVMCommonConversion",
@@ -1450,7 +1451,7 @@ cc_library(
         ":mhlo_disc",
         ":pass_details",
         ":shape_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -1476,7 +1477,7 @@ cc_library(
         ":mhlo_disc",
         ":pass_details",
         ":shape_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -1501,7 +1502,7 @@ cc_library(
         ":mhlo_disc",
         ":pass_details",
         ":shape_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -1606,7 +1607,7 @@ cc_library(
         ":fusion_utils",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -1650,9 +1651,9 @@ cc_library(
         ":fusion_utils",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:lmhlo_pass_inc_gen",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lmhlo_pass_inc_gen",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -1673,7 +1674,7 @@ cc_library(
         ":mhlo_disc",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -1691,7 +1692,7 @@ cc_library(
     srcs = ["transforms/lhlo_fusion_inliner.cc"],
     deps = [
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//mlir:Pass",
     ],
 )
@@ -1703,7 +1704,7 @@ cc_library(
         ":disc_shape_optimization_utils",
         ":mhlo_disc",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
@@ -1722,7 +1723,7 @@ cc_library(
         ":disc_shape_optimization_utils",
         ":mhlo_disc",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
@@ -1744,7 +1745,7 @@ cc_library(
         ":disc_shape_optimization_utils",
         ":mhlo_disc",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
@@ -1791,7 +1792,7 @@ cc_library(
         ":disc_shape_optimization_utils",
         ":disc_util",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -1836,7 +1837,7 @@ cc_library(
         ":fusion_utils",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//llvm:Core",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
@@ -1856,7 +1857,7 @@ cc_library(
         ":disc_shape_optimization_utils",
         ":mhlo_disc",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
@@ -1875,7 +1876,7 @@ cc_library(
         ":disc_shape_optimization_utils",
         ":mhlo_disc",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
@@ -1893,7 +1894,7 @@ cc_library(
     hdrs = ["transforms/disc_pdl_utils.h"],
     deps = [
         ":mhlo_disc",
-        "//tensorflow/tsl/platform:logging",
+        "@org_tensorflow//tensorflow/tsl/platform:logging",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:PDLLAST",
@@ -1971,7 +1972,7 @@ cc_library(
         ":disc_util",
         ":pass_details",
         ":source_emitter",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
         "@llvm-project//mlir:Support",
@@ -2018,8 +2019,8 @@ disc_cc_library(
         ":lmhlo_disc",
         ":pass_details",
         "@llvm-project//mlir:Pass",
-        "//tensorflow/tsl/platform:cuda_libdevice_path",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/tsl/platform:cuda_libdevice_path",
+        "@org_tensorflow//tensorflow/core:lib",
     ] + if_cuda_is_configured([
         ":compute_intensive_fusion_deps",
     ]),
@@ -2037,12 +2038,12 @@ cc_library(
         ":fusion_utils",
         ":pass_details",
         ":placement_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:lmhlo_pass_inc_gen",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/compiler/mlir/disc/tools/disc-transform:all_passes",
-        "//tensorflow/compiler/mlir/disc/tools/disc-transform:DISCLinalgExtDialect",
-        "//tensorflow/tsl/platform:logging",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lmhlo_pass_inc_gen",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "//mlir/disc/tools/disc-transform:all_passes",
+        "//mlir/disc/tools/disc-transform:DISCLinalgExtDialect",
+        "@org_tensorflow//tensorflow/tsl/platform:logging",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:AffineDialect",
         "@llvm-project//mlir:FuncDialect",
@@ -2073,9 +2074,7 @@ cc_library(
     hdrs = [
         "transforms/register_passes.h",
     ],
-    visibility = [
-        ":friends",
-    ],
+    visibility = ["//visibility:public"],
     deps = [
         ":MhloDiscPassIncGen",
         ":conv_rewriter",
@@ -2146,7 +2145,7 @@ cc_library(
         ":disc_function_dead_argument_elimination",
         ":disc_side_effect_loop_invariant_code_motion",
         ":disc_unhandled_atomic_rmw_converter",
-        "//tensorflow/compiler/mlir/disc/tools/disc-transform:all_passes",
+        "//mlir/disc/tools/disc-transform:all_passes",
         "@llvm-project//mlir:Pass",
     ],
     alwayslink = 1,
@@ -2155,17 +2154,17 @@ cc_library(
 tf_cc_binary(
     name = "disc-opt",
     srcs = [
-        "tools/disc-opt/disc-opt.cc",
+        "//mlir/disc/tools:disc-opt/disc-opt.cc"
     ],
     deps = [
         ":all_passes",
         ":disc_ral",
         ":mhlo_disc",
         ":lmhlo_disc",
-        "//tensorflow/compiler/xla/mlir_hlo:all_passes",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo_gpu",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:all_passes",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo_gpu",
         "@boringssl//:crypto",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:AllPassesAndDialects",
@@ -2179,14 +2178,15 @@ tf_cc_binary(
 tf_cc_binary(
     name = "disc-pdll",
     srcs = [
-        "tools/disc-pdll/disc-pdll.cc",
+        #"tools/disc-pdll/disc-pdll.cc",
+        "//mlir/disc/tools:disc-pdll/disc-pdll.cc",
     ],
     deps = [
         ":disc_pdl_utils",
         ":mhlo_disc",
-        "//tensorflow/compiler/mlir/tensorflow:tensorflow",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:tensorflow",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "@org_tensorflow//tensorflow/core:lib",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:AllPassesAndDialects",
         "@llvm-project//mlir:IR",
@@ -2198,7 +2198,7 @@ tf_cc_binary(
 tf_cc_binary(
     name = "disc-source-emitter",
     srcs = [
-        "tools/disc-source-emitter/disc-cuda-emitter.cc",
+        "//mlir/disc/tools:disc-source-emitter/disc-cuda-emitter.cc"
     ],
     deps = [
         ":source_emitter",
@@ -2244,7 +2244,7 @@ gentbl_cc_library(
     tblgen = "@llvm-project//mlir:mlir-tblgen",
     td_file = "IR/hlo_disc_enums.td",
     deps = [
-        "//tensorflow/compiler/xla/mlir_hlo:hlo_ops_td_files",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:hlo_ops_td_files",
     ],
 )
 
@@ -2268,7 +2268,7 @@ gentbl_cc_library(
         ":mhlo_disc_enums_inc_gen",
     ] + if_torch_disc(
         ["@mlir-hlo//:hlo_ops_td_files"],
-        ["//tensorflow/compiler/xla/mlir_hlo:hlo_ops_td_files"]
+        ["@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:hlo_ops_td_files"]
     )
 )
 
@@ -2425,7 +2425,7 @@ gentbl_cc_library(
     tblgen = "@llvm-project//mlir:mlir-tblgen",
     td_file = "IR/lhlo_disc_ops.td",
     deps = [
-        "//tensorflow/compiler/xla/mlir_hlo:hlo_ops_td_files",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:hlo_ops_td_files",
     ],
 )
 
@@ -2441,9 +2441,9 @@ cc_library(
     ],
     deps = [
         ":lmhlo_disc_ops_inc_gen",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo_ops_structs_inc_gen",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo_structured_interface",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo_ops_structs_inc_gen",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo_structured_interface",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:Analysis",
         "@llvm-project//mlir:FuncDialect",
@@ -2473,12 +2473,12 @@ tf_cc_binary(
     ]),
     deps = [
         ":disc_compiler",
-        "//tensorflow/compiler/mlir:init_mlir",
-        "//tensorflow/compiler/mlir/tensorflow",
-        "//tensorflow/compiler/xla:util",
-        "//tensorflow/compiler/xla/service/gpu/llvm_gpu_backend",
-        "//tensorflow/compiler/xla/stream_executor/lib",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/compiler/mlir:init_mlir",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow",
+        "@org_tensorflow//tensorflow/compiler/xla:util",
+        "@org_tensorflow//tensorflow/compiler/xla/service/gpu/llvm_gpu_backend",
+        "@org_tensorflow//tensorflow/compiler/xla/stream_executor/lib",
+        "@org_tensorflow//tensorflow/core:lib",
         "@com_google_absl//absl/strings",
         "@llvm-project//llvm:Analysis",
         "@llvm-project//llvm:ARMCodeGen",  # fixdeps: keep
@@ -2498,7 +2498,7 @@ tf_cc_binary(
         "@local_config_cuda//cuda:cuda_headers",
         "@local_config_cuda//cuda:cuda_driver",
     ]) + if_rocm_is_configured([
-	"//tensorflow/stream_executor/rocm:rocm_driver",
+	"@org_tensorflow//tensorflow/stream_executor/rocm:rocm_driver",
     ]),
 )
 
@@ -2539,13 +2539,13 @@ transitive_hdrs(
     deps = [
         ":disc_map_chlo_to_hlo_op",
         ":mhlo_disc",
-        "//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
-        "//tensorflow/compiler/mlir/xla/ral:ral_base_cpu_context_impl",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mlir_hlo",
+        "//mlir/xla/ral:ral_base_cpu_context_impl",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:Support",
         "@llvm-project//mlir:IR",
     ] + if_cuda_or_rocm([
-        "//tensorflow/compiler/mlir/xla/ral:ral_base_cuda_context_impl",
+        "@org_tensorflow//tensorflow/compiler/mlir/xla/ral:ral_base_cuda_context_impl",
     ]),
     visibility = ["//visibility:public"],
 )
@@ -2592,7 +2592,7 @@ gentbl_cc_library(
     tblgen = "@llvm-project//mlir:mlir-tblgen",
     td_file = "IR/disc_shape_ops.td",
     deps = [
-        "//tensorflow/compiler/xla/mlir_hlo:hlo_ops_td_files",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:hlo_ops_td_files",
     ],
 )
 
@@ -2645,7 +2645,7 @@ gentbl_cc_library(
     tblgen = "@llvm-project//mlir:mlir-tblgen",
     td_file = "IR/disc_ral_ops.td",
     deps = [
-        "//tensorflow/compiler/xla/mlir_hlo:hlo_ops_td_files",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:hlo_ops_td_files",
     ],
 )
 
@@ -2681,10 +2681,23 @@ cc_library(
     alwayslink = 1,
 )
 
+td_library(
+    name = "disc_tf_additional_ops_files",
+    srcs = [
+        "IR/disc_tf_additional_ops.td",
+    ],
+    compatible_with = get_compatible_with_cloud(),
+    deps = [
+        "@llvm-project//mlir:OpBaseTdFiles",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:tensorflow_ops_td_files",
+    ],
+)
+
 gentbl_cc_library(
     name = "disc_tf_additional_ops_gen",
     compatible_with = get_compatible_with_cloud(),
     strip_include_prefix = "",
+    #includes = ["@org_tensorflow//tensorflow"],
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -2697,12 +2710,8 @@ gentbl_cc_library(
     ],
     tblgen = "@llvm-project//mlir:mlir-tblgen",
     td_file = "IR/disc_tf_additional_ops.td",
-    td_srcs = [
-        "//tensorflow/compiler/mlir/tensorflow:ir/tf_op_base.td",
-        "//tensorflow/compiler/mlir/tensorflow:ir/tf_op_interfaces.td",
-    ],
     deps = [
-        "@llvm-project//mlir:OpBaseTdFiles",
+        ":disc_tf_additional_ops_files",
     ],
 )
 
@@ -2716,7 +2725,7 @@ cc_library(
     ],
     deps = [
         ":disc_tf_additional_ops_gen",
-        "//tensorflow/compiler/mlir/tensorflow",
+        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow",
     ],
     alwayslink = 1,
 )
diff --git a/tao_compiler/mlir/disc/IR/custom_call_base.cc b/tao_compiler/mlir/disc/IR/custom_call_base.cc
index f54fd418024..057d360af01 100644
--- a/tao_compiler/mlir/disc/IR/custom_call_base.cc
+++ b/tao_compiler/mlir/disc/IR/custom_call_base.cc
@@ -12,7 +12,7 @@ limitations under the License.
 
 // This file defines the basic macros for custom call.
 
-#include "tensorflow/compiler/mlir/disc/IR/custom_call_base.h"
+#include "mlir/disc/IR/custom_call_base.h"
 
 #include <unordered_map>
 
diff --git a/tao_compiler/mlir/disc/IR/disc_ral_ops.cc b/tao_compiler/mlir/disc/IR/disc_ral_ops.cc
index 082890716e6..ef578d2718b 100644
--- a/tao_compiler/mlir/disc/IR/disc_ral_ops.cc
+++ b/tao_compiler/mlir/disc/IR/disc_ral_ops.cc
@@ -15,7 +15,7 @@ limitations under the License.
 
 // This file defines the operations used in the DISC RAL dialect.
 
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
 
 namespace mlir {
 namespace disc_ral {
@@ -28,7 +28,7 @@ RalDialect::RalDialect(MLIRContext* context)
     : Dialect(getDialectNamespace(), context, TypeID::get<RalDialect>()) {
   addOperations<
 #define GET_OP_LIST
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.cc.inc"
+#include "mlir/disc/IR/disc_ral_ops.cc.inc"
       >();
   addTypes<RalExecutionContextType>();
   context->loadDialect<memref::MemRefDialect>();
@@ -56,4 +56,4 @@ void RalDialect::printType(Type type, DialectAsmPrinter& os) const {
 }  // namespace mlir
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.cc.inc"
+#include "mlir/disc/IR/disc_ral_ops.cc.inc"
diff --git a/tao_compiler/mlir/disc/IR/disc_ral_ops.h b/tao_compiler/mlir/disc/IR/disc_ral_ops.h
index a8706506ed8..49a4c5f62bc 100644
--- a/tao_compiler/mlir/disc/IR/disc_ral_ops.h
+++ b/tao_compiler/mlir/disc/IR/disc_ral_ops.h
@@ -60,6 +60,6 @@ class RalExecutionContextType
 }  // end namespace mlir
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h.inc"
+#include "mlir/disc/IR/disc_ral_ops.h.inc"
 
 #endif  //  TENSORFLOW_COMPILER_MLIR_HLO_INCLUDE_MLIR_HLO_DIALECT_DISC_RAL_IR_DISC_RAL_OPS_H_
diff --git a/tao_compiler/mlir/disc/IR/disc_shape_ops.cc b/tao_compiler/mlir/disc/IR/disc_shape_ops.cc
index 75813e1387b..6c4f6b71395 100644
--- a/tao_compiler/mlir/disc/IR/disc_shape_ops.cc
+++ b/tao_compiler/mlir/disc/IR/disc_shape_ops.cc
@@ -12,7 +12,7 @@ limitations under the License.
 
 // This file defines DISC shape related operations.
 
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
 
 #include "llvm/Support/Debug.h"
 #include "mlir/Dialect/Arith/IR/Arith.h"
@@ -37,7 +37,7 @@ DISCShapeDialect::DISCShapeDialect(MLIRContext* context)
     : Dialect(getDialectNamespace(), context, TypeID::get<DISCShapeDialect>()) {
   addOperations<
 #define GET_OP_LIST
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.cc.inc"
+#include "mlir/disc/IR/disc_shape_ops.cc.inc"
       >();
   context->loadDialect<tensor::TensorDialect>();
 }
@@ -395,4 +395,4 @@ LogicalResult TieProductEqualOp::verify() { return Verify(*this); }
 }  // namespace mlir
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.cc.inc"
+#include "mlir/disc/IR/disc_shape_ops.cc.inc"
diff --git a/tao_compiler/mlir/disc/IR/disc_shape_ops.h b/tao_compiler/mlir/disc/IR/disc_shape_ops.h
index 9571361e9fe..ebc8c5a39d4 100644
--- a/tao_compiler/mlir/disc/IR/disc_shape_ops.h
+++ b/tao_compiler/mlir/disc/IR/disc_shape_ops.h
@@ -43,6 +43,6 @@ class DISCShapeDialect : public Dialect {
 }  // end namespace mlir
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h.inc"
+#include "mlir/disc/IR/disc_shape_ops.h.inc"
 
 #endif  //  TENSORFLOW_COMPILER_MLIR_DISC_IR_DISC_SHAPE_OPS_H_
diff --git a/tao_compiler/mlir/disc/IR/disc_tf_additional_ops.cc b/tao_compiler/mlir/disc/IR/disc_tf_additional_ops.cc
index 13af7194d84..db8abb1214b 100644
--- a/tao_compiler/mlir/disc/IR/disc_tf_additional_ops.cc
+++ b/tao_compiler/mlir/disc/IR/disc_tf_additional_ops.cc
@@ -10,7 +10,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/IR/disc_tf_additional_ops.h"
+#include "mlir/disc/IR/disc_tf_additional_ops.h"
 
 namespace mlir {
 namespace TF {
@@ -51,7 +51,7 @@ namespace {
 void DiscTFOpsRegisterHook(TensorFlowDialect& dialect) {
   dialect.addOperations<
 #define GET_OP_LIST
-#include "tensorflow/compiler/mlir/disc/IR/disc_tf_additional_ops.cc.inc"
+#include "mlir/disc/IR/disc_tf_additional_ops.cc.inc"
       >();
 }
 
@@ -67,4 +67,4 @@ auto register_once = RegisterOnce();
 }  // namespace mlir
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/IR/disc_tf_additional_ops.cc.inc"
+#include "mlir/disc/IR/disc_tf_additional_ops.cc.inc"
diff --git a/tao_compiler/mlir/disc/IR/disc_tf_additional_ops.h b/tao_compiler/mlir/disc/IR/disc_tf_additional_ops.h
index 158ec4edea0..6bb377220c3 100644
--- a/tao_compiler/mlir/disc/IR/disc_tf_additional_ops.h
+++ b/tao_compiler/mlir/disc/IR/disc_tf_additional_ops.h
@@ -14,4 +14,4 @@ limitations under the License.
 #include "tensorflow/compiler/mlir/tensorflow/ir/tf_ops.h"
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/IR/disc_tf_additional_ops.h.inc"
+#include "mlir/disc/IR/disc_tf_additional_ops.h.inc"
diff --git a/tao_compiler/mlir/disc/IR/disc_tf_additional_ops.td b/tao_compiler/mlir/disc/IR/disc_tf_additional_ops.td
index 4d81d75c8e3..07900f303a5 100644
--- a/tao_compiler/mlir/disc/IR/disc_tf_additional_ops.td
+++ b/tao_compiler/mlir/disc/IR/disc_tf_additional_ops.td
@@ -17,7 +17,9 @@ limitations under the License.
 #ifndef DISC_TF_ADDITIONAL_OPS
 #define DISC_TF_ADDITIONAL_OPS
 
-include "tensorflow/compiler/mlir/tensorflow/ir/tf_op_base.td"
+//include "tf_op_base.td"
+//include "tensorflow/compiler/mlir/tensorflow/ir/tf_op_base.td"
+include "external/org_tensorflow/tensorflow/compiler/mlir/tensorflow/ir/tf_op_base.td"
 
 include "mlir/IR/OpBase.td"
 include "mlir/Interfaces/CallInterfaces.td"
diff --git a/tao_compiler/mlir/disc/IR/hlo_disc_ops.cc b/tao_compiler/mlir/disc/IR/hlo_disc_ops.cc
index ad10af4b16a..82c2c0d2692 100644
--- a/tao_compiler/mlir/disc/IR/hlo_disc_ops.cc
+++ b/tao_compiler/mlir/disc/IR/hlo_disc_ops.cc
@@ -12,7 +12,7 @@ limitations under the License.
 
 // This file defines the operations used in the DISC RAL dialect.
 
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
 
 #include <cfenv>
 #include <cmath>
@@ -23,8 +23,8 @@ limitations under the License.
 #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h"
 #include "mlir/Dialect/Arith/IR/Arith.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
-#include "tensorflow/compiler/mlir/disc/IR/custom_call_base.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_enums.cc.inc"
+#include "mlir/disc/IR/custom_call_base.h"
+#include "mlir/disc/IR/hlo_disc_enums.cc.inc"
 
 namespace mlir {
 namespace mhlo_disc {
@@ -61,7 +61,7 @@ MhloDiscDialect::MhloDiscDialect(MLIRContext* context)
     : Dialect(getDialectNamespace(), context, TypeID::get<MhloDiscDialect>()) {
   addOperations<
 #define GET_OP_LIST
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.cc.inc"
+#include "mlir/disc/IR/hlo_disc_ops.cc.inc"
 
       >();
   context->loadDialect<tensor::TensorDialect>();
@@ -1021,4 +1021,4 @@ LogicalResult WhereOp::verify() {
 }  // namespace mlir
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.cc.inc"
+#include "mlir/disc/IR/hlo_disc_ops.cc.inc"
diff --git a/tao_compiler/mlir/disc/IR/hlo_disc_ops.h b/tao_compiler/mlir/disc/IR/hlo_disc_ops.h
index ec3b549c3cf..f5fa2594ce2 100644
--- a/tao_compiler/mlir/disc/IR/hlo_disc_ops.h
+++ b/tao_compiler/mlir/disc/IR/hlo_disc_ops.h
@@ -30,7 +30,7 @@ limitations under the License.
 #include "mlir/IR/Types.h"
 #include "mlir/Interfaces/InferTypeOpInterface.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_enums.h.inc"
+#include "mlir/disc/IR/hlo_disc_enums.h.inc"
 
 namespace mlir {
 class OpBuilder;
@@ -59,6 +59,6 @@ class MhloDiscDialect : public Dialect {
 }  // end namespace mlir
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h.inc"
+#include "mlir/disc/IR/hlo_disc_ops.h.inc"
 
 #endif  //  TENSORFLOW_COMPILER_MLIR_HLO_INCLUDE_MLIR_HLO_DIALECT_MHLO_IR_HLO_DISC_OPS_H_
diff --git a/tao_compiler/mlir/disc/IR/hlo_disc_ops.td b/tao_compiler/mlir/disc/IR/hlo_disc_ops.td
index 2a8bd1cfad0..1c0dbd9dcb9 100644
--- a/tao_compiler/mlir/disc/IR/hlo_disc_ops.td
+++ b/tao_compiler/mlir/disc/IR/hlo_disc_ops.td
@@ -23,7 +23,7 @@ include "mlir/Interfaces/InferTypeOpInterface.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir-hlo/Dialect/mhlo/IR/hlo_ops_common.td"
 include "mlir-hlo/Dialect/mhlo/IR/hlo_utils.td"
-include "tensorflow/compiler/mlir/disc/IR/hlo_disc_enums.td"
+include "external/org_tensorflow/tensorflow/compiler/mlir/disc/IR/hlo_disc_enums.td"
 
 def HLODISC_Dialect : Dialect {
   let name = "mhlo_disc";
diff --git a/tao_compiler/mlir/disc/IR/lhlo_disc_ops.cc b/tao_compiler/mlir/disc/IR/lhlo_disc_ops.cc
index 43d915a372f..1f73564d788 100644
--- a/tao_compiler/mlir/disc/IR/lhlo_disc_ops.cc
+++ b/tao_compiler/mlir/disc/IR/lhlo_disc_ops.cc
@@ -12,7 +12,7 @@ limitations under the License.
 
 // This file defines the operations used in the LMHLO DISC dialect.
 
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
 
 #include <unordered_set>
 
@@ -27,7 +27,7 @@ LmhloDiscDialect::LmhloDiscDialect(MLIRContext* context)
     : Dialect(getDialectNamespace(), context, TypeID::get<LmhloDiscDialect>()) {
   addOperations<
 #define GET_OP_LIST
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.cc.inc"
+#include "mlir/disc/IR/lhlo_disc_ops.cc.inc"
 
       >();
   context->loadDialect<memref::MemRefDialect>();
@@ -86,4 +86,4 @@ LogicalResult CustomCallOp::verify() {
 }  // namespace mlir
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.cc.inc"
+#include "mlir/disc/IR/lhlo_disc_ops.cc.inc"
diff --git a/tao_compiler/mlir/disc/IR/lhlo_disc_ops.h b/tao_compiler/mlir/disc/IR/lhlo_disc_ops.h
index 35235c4dcfa..38fda5c302e 100644
--- a/tao_compiler/mlir/disc/IR/lhlo_disc_ops.h
+++ b/tao_compiler/mlir/disc/IR/lhlo_disc_ops.h
@@ -46,6 +46,6 @@ class LmhloDiscDialect : public Dialect {
 }  // end namespace mlir
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h.inc"
+#include "mlir/disc/IR/lhlo_disc_ops.h.inc"
 
 #endif  //  MLIR_DISC_IR_LHLO_DISC_OPS_H_
diff --git a/tao_compiler/mlir/disc/IR/qconv_custom_call_op.cc b/tao_compiler/mlir/disc/IR/qconv_custom_call_op.cc
index 1254121cc7a..06d8f3e7ee3 100644
--- a/tao_compiler/mlir/disc/IR/qconv_custom_call_op.cc
+++ b/tao_compiler/mlir/disc/IR/qconv_custom_call_op.cc
@@ -18,14 +18,14 @@ limitations under the License.
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/IR/PatternMatch.h"
-#include "tensorflow/compiler/mlir/disc/IR/custom_call_base.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/custom_call_base.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 namespace mlir {
 namespace mhlo_disc {
diff --git a/tao_compiler/mlir/disc/IR/rng_uniform_custom_call_op.cc b/tao_compiler/mlir/disc/IR/rng_uniform_custom_call_op.cc
index d9a2712e299..a9cad9309d7 100644
--- a/tao_compiler/mlir/disc/IR/rng_uniform_custom_call_op.cc
+++ b/tao_compiler/mlir/disc/IR/rng_uniform_custom_call_op.cc
@@ -12,7 +12,7 @@ limitations under the License.
 
 // This file defines topk custom call.
 
-#include "tensorflow/compiler/mlir/disc/IR/rng_uniform_custom_call_op.h"
+#include "mlir/disc/IR/rng_uniform_custom_call_op.h"
 
 #include <atomic>
 
@@ -21,12 +21,12 @@ limitations under the License.
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/IR/PatternMatch.h"
-#include "tensorflow/compiler/mlir/disc/IR/custom_call_base.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/custom_call_base.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 using ::mlir::mhlo_disc::RngUniformBackendConfig;
 
diff --git a/tao_compiler/mlir/disc/IR/sparse_custom_call_op.cc b/tao_compiler/mlir/disc/IR/sparse_custom_call_op.cc
index 6f48f98d3a6..c8987205f0f 100644
--- a/tao_compiler/mlir/disc/IR/sparse_custom_call_op.cc
+++ b/tao_compiler/mlir/disc/IR/sparse_custom_call_op.cc
@@ -17,11 +17,11 @@ limitations under the License.
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/IR/PatternMatch.h"
-#include "tensorflow/compiler/mlir/disc/IR/custom_call_base.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/custom_call_base.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 namespace mlir {
 namespace mhlo_disc {
diff --git a/tao_compiler/mlir/disc/IR/topk_custom_call_op.cc b/tao_compiler/mlir/disc/IR/topk_custom_call_op.cc
index 1ff405c06da..5d726a531b3 100644
--- a/tao_compiler/mlir/disc/IR/topk_custom_call_op.cc
+++ b/tao_compiler/mlir/disc/IR/topk_custom_call_op.cc
@@ -12,18 +12,18 @@ limitations under the License.
 
 // This file defines topk custom call.
 
-#include "tensorflow/compiler/mlir/disc/IR/topk_custom_call_op.h"
+#include "mlir/disc/IR/topk_custom_call_op.h"
 
 #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/IR/PatternMatch.h"
-#include "tensorflow/compiler/mlir/disc/IR/custom_call_base.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/custom_call_base.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 using ::mlir::mhlo_disc::TopKBackendConfig;
 
diff --git a/tao_compiler/mlir/disc/disc_compiler.cc b/tao_compiler/mlir/disc/disc_compiler.cc
index 56da2688cad..222c428d6e3 100644
--- a/tao_compiler/mlir/disc/disc_compiler.cc
+++ b/tao_compiler/mlir/disc/disc_compiler.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/disc_compiler.h"
+#include "mlir/disc/disc_compiler.h"
 
 #include <fstream>
 
@@ -62,13 +62,13 @@ limitations under the License.
 #include "mlir/Target/LLVMIR/Dialect/ROCDL/ROCDLToLLVMIRTranslation.h"  // from @llvm-project
 #include "mlir/Target/LLVMIR/Export.h"  // from @llvm-project
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/passes.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/passes.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/rewriters.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/tools/disc-transform/transforms/passes.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/passes.h"
+#include "mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/transforms/rewriters.h"
 #include "tensorflow/compiler/mlir/tensorflow/transforms/passes.h"
 #include "tensorflow/compiler/mlir/tensorflow/utils/compile_mlir_util.h"
 #include "tensorflow/compiler/mlir/tensorflow/utils/error_util.h"
diff --git a/tao_compiler/mlir/disc/disc_compiler_main.cc b/tao_compiler/mlir/disc/disc_compiler_main.cc
index c6f737043f7..7e52ab52fa9 100644
--- a/tao_compiler/mlir/disc/disc_compiler_main.cc
+++ b/tao_compiler/mlir/disc/disc_compiler_main.cc
@@ -46,12 +46,12 @@ limitations under the License.
 #include "mlir/Target/LLVMIR/Dialect/NVVM/NVVMToLLVMIRTranslation.h"  // from @llvm-project
 #include "mlir/Target/LLVMIR/Export.h"  // from @llvm-project
 #include "mlir/Tools/mlir-opt/MlirOptMain.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_compiler.h"
+#include "mlir/disc/transforms/register_passes.h"
 #include "stablehlo/dialect/ChloOps.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_compiler.h"
-#include "tensorflow/compiler/mlir/disc/transforms/register_passes.h"
 #include "tensorflow/compiler/mlir/init_mlir.h"
 #include "tensorflow/compiler/mlir/tensorflow/dialect_registration.h"
 #include "tensorflow/compiler/mlir/tensorflow/transforms/passes.h"
diff --git a/tao_compiler/mlir/disc/disc_util.cc b/tao_compiler/mlir/disc/disc_util.cc
index 4b0d23dc44f..dce9a5a0062 100644
--- a/tao_compiler/mlir/disc/disc_util.cc
+++ b/tao_compiler/mlir/disc/disc_util.cc
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
+#include "mlir/disc/disc_util.h"
 
 #include <numeric>
 
@@ -20,8 +20,8 @@ limitations under the License.
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/Shape/IR/Shape.h"
 #include "mlir/Interfaces/ViewLikeInterface.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/transforms/placement_utils.h"
 #include "tensorflow/core/util/env_var.h"
 
 namespace mlir {
diff --git a/tao_compiler/mlir/disc/disc_util.h b/tao_compiler/mlir/disc/disc_util.h
index 4200a32f811..8d2b962251e 100644
--- a/tao_compiler/mlir/disc/disc_util.h
+++ b/tao_compiler/mlir/disc/disc_util.h
@@ -23,7 +23,7 @@ limitations under the License.
 #include "mlir/IR/Builders.h"           // from @llvm-project
 #include "mlir/IR/BuiltinAttributes.h"  // from @llvm-project
 #include "mlir/IR/BuiltinTypes.h"
-#include "tensorflow/compiler/mlir/disc/utils/cycle_detector.h"
+#include "mlir/disc/utils/cycle_detector.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/runlit.site.cfg.py b/tao_compiler/mlir/disc/runlit.site.cfg.py
index e3f8369353e..29145275452 100644
--- a/tao_compiler/mlir/disc/runlit.site.cfg.py
+++ b/tao_compiler/mlir/disc/runlit.site.cfg.py
@@ -43,7 +43,7 @@
 mlir_tf_tools_dirs = [
     'tensorflow/compiler/mlir',
     'tensorflow/compiler/xla/mlir_hlo',
-    'tensorflow/compiler/mlir/disc',
+    'mlir/disc',
     'tensorflow/compiler/mlir/lite',
     'tensorflow/compiler/mlir/tensorflow',
     'tensorflow/compiler/mlir/tfjs',
@@ -73,5 +73,5 @@
     config,
     os.path.join(
         os.path.join(real_test_srcdir, os.environ['TEST_WORKSPACE'],
-                     'tensorflow/compiler/mlir/disc/runlit.cfg.py')))
+                     'mlir/disc/runlit.cfg.py')))
 # pylint: enable=undefined-variable
diff --git a/tao_compiler/mlir/disc/tools/BUILD b/tao_compiler/mlir/disc/tools/BUILD
new file mode 100644
index 00000000000..611c0bf9603
--- /dev/null
+++ b/tao_compiler/mlir/disc/tools/BUILD
@@ -0,0 +1,5 @@
+exports_files([
+    "disc-opt/disc-opt.cc",
+    "disc-source-emitter/disc-cuda-emitter.cc",
+    "disc-pdll/disc-pdll.cc"
+])
\ No newline at end of file
diff --git a/tao_compiler/mlir/disc/tools/disc-opt/disc-opt.cc b/tao_compiler/mlir/disc/tools/disc-opt/disc-opt.cc
index b2e6279ebbb..9faa39155b9 100644
--- a/tao_compiler/mlir/disc/tools/disc-opt/disc-opt.cc
+++ b/tao_compiler/mlir/disc/tools/disc-opt/disc-opt.cc
@@ -28,15 +28,15 @@ limitations under the License.
 #include "mlir/InitAllDialects.h"
 #include "mlir/InitAllPasses.h"
 #include "mlir/Tools/mlir-opt/MlirOptMain.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
+#include "mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h"
+#include "mlir/disc/tools/disc-transform/transforms/register_passes.h"
+#include "mlir/disc/transforms/register_passes.h"
 #include "stablehlo/dialect/ChloOps.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/register_passes.h"
-#include "tensorflow/compiler/mlir/disc/transforms/register_passes.h"
 #include "tensorflow/compiler/mlir/tensorflow/ir/tf_ops.h"
 
 int main(int argc, char** argv) {
diff --git a/tao_compiler/mlir/disc/tools/disc-pdll/disc-pdll.cc b/tao_compiler/mlir/disc/tools/disc-pdll/disc-pdll.cc
index 74c64d1fed5..7a6be6d3e73 100644
--- a/tao_compiler/mlir/disc/tools/disc-pdll/disc-pdll.cc
+++ b/tao_compiler/mlir/disc/tools/disc-pdll/disc-pdll.cc
@@ -27,7 +27,7 @@
 #include "mlir/Parser/Parser.h"
 #include "mlir/Support/FileUtilities.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_pdl_utils.h"
+#include "mlir/disc/transforms/disc_pdl_utils.h"
 #include "tensorflow/compiler/mlir/tensorflow/ir/tf_ops.h"
 
 using namespace mlir;
diff --git a/tao_compiler/mlir/disc/tools/disc-replay/BUILD b/tao_compiler/mlir/disc/tools/disc-replay/BUILD
index 4dde01ec499..425c31cbda2 100644
--- a/tao_compiler/mlir/disc/tools/disc-replay/BUILD
+++ b/tao_compiler/mlir/disc/tools/disc-replay/BUILD
@@ -1,10 +1,10 @@
 load(
-  "//tensorflow:tensorflow.bzl",
+  "@org_tensorflow//tensorflow:tensorflow.bzl",
   "tf_cc_binary",
   "tf_cc_test",
 )
 
-load("//tensorflow/compiler/mlir/util:util.bzl",
+load("//mlir/util:util.bzl",
      "disc_cc_library",
      "if_cuda_or_rocm",
 )
@@ -21,15 +21,15 @@ disc_cc_library(
         "disc_interpreter.h"
     ],
     deps = [
-        "//tensorflow/compiler/mlir/disc:all_passes",
-        "//tensorflow/compiler/decoupling:tao_compiler_input",
-        "//tensorflow/compiler/decoupling:tao_compiler",
-        "//tensorflow/compiler/xla/mlir_hlo:all_passes",
-        "//tensorflow/compiler/mlir/xla/ral:ral_base_context_lib",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:framework",
-        "//tensorflow/core:tensorflow",
-        "//tensorflow/core/platform:subprocess",
+        "//mlir/disc:all_passes",
+        "//decoupling:tao_compiler_input",
+        "//decoupling:tao_compiler",
+        "//mlir/xla/ral:ral_base_context_lib",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:all_passes",
+        "@org_tensorflow//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:framework",
+        "@org_tensorflow//tensorflow/core:tensorflow",
+        "@org_tensorflow//tensorflow/core/platform:subprocess",
     ] + if_cuda_or_rocm([
         "@local_config_cuda//cuda:cuda_headers",
         "@local_config_cuda//cuda:cuda_driver",
@@ -54,12 +54,12 @@ tf_cc_test(
     ],
     deps = [
         ":disc-replay",
-        "//tensorflow/core:test",
-        "//tensorflow/core:test_main",
+        "@org_tensorflow//tensorflow/core:test",
+        "@org_tensorflow//tensorflow/core:test_main",
         "@com_google_googletest//:gtest",
     ],
     data = [
-        "//tensorflow/compiler/mlir/disc/tools/disc-replay/test_data:data.tar",
-        "//tensorflow/compiler/mlir/disc/tools/disc-replay/test_data:program.pb"
+        "//mlir/disc/tools/disc-replay/test_data:data.tar",
+        "//mlir/disc/tools/disc-replay/test_data:program.pb"
     ]
 )
diff --git a/tao_compiler/mlir/disc/tools/disc-replay/disc_interpreter.cc b/tao_compiler/mlir/disc/tools/disc-replay/disc_interpreter.cc
index fc98cd0d87d..90e7100d40f 100644
--- a/tao_compiler/mlir/disc/tools/disc-replay/disc_interpreter.cc
+++ b/tao_compiler/mlir/disc/tools/disc-replay/disc_interpreter.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tools/disc-replay/disc_interpreter.h"
+#include "mlir/disc/tools/disc-replay/disc_interpreter.h"
 
 #include <dlfcn.h>
 
diff --git a/tao_compiler/mlir/disc/tools/disc-replay/disc_interpreter.h b/tao_compiler/mlir/disc/tools/disc-replay/disc_interpreter.h
index 0fd7d913206..3b6abb9ada2 100644
--- a/tao_compiler/mlir/disc/tools/disc-replay/disc_interpreter.h
+++ b/tao_compiler/mlir/disc/tools/disc-replay/disc_interpreter.h
@@ -12,15 +12,15 @@
 #ifndef DISC_REPLAY_DISC_INTERPRETER_H_
 #define DISC_REPLAY_DISC_INTERPRETER_H_
 
-#include "tensorflow/compiler/decoupling/mlir_compiler.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-replay/record.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_api.h"
+#include "decoupling/mlir_compiler.h"
+#include "mlir/disc/tools/disc-replay/record.h"
+#include "mlir/xla/ral/ral_api.h"
 
 #if defined(GOOGLE_CUDA) || defined(TENSORFLOW_USE_ROCM)
-#include "tensorflow/compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.h"
+#include "mlir/xla/ral/context/base/cuda/cuda_context_impl.h"
 #include "tensorflow/compiler/xla/stream_executor/gpu/gpu_types.h"
 #else
-#include "tensorflow/compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.h"
+#include "mlir/xla/ral/context/base/cpu/cpu_context_impl.h"
 #endif
 
 namespace tensorflow {
diff --git a/tao_compiler/mlir/disc/tools/disc-replay/disc_replay_main.cc b/tao_compiler/mlir/disc/tools/disc-replay/disc_replay_main.cc
index 261c192784c..500114446c0 100644
--- a/tao_compiler/mlir/disc/tools/disc-replay/disc_replay_main.cc
+++ b/tao_compiler/mlir/disc/tools/disc-replay/disc_replay_main.cc
@@ -14,7 +14,7 @@
 #endif
 
 #include "llvm/Support/CommandLine.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-replay/disc_interpreter.h"
+#include "mlir/disc/tools/disc-replay/disc_interpreter.h"
 #include "tensorflow/core/platform/errors.h"
 
 tensorflow::Status RealMain(int argc, char** argv) {
diff --git a/tao_compiler/mlir/disc/tools/disc-replay/record.cc b/tao_compiler/mlir/disc/tools/disc-replay/record.cc
index 4a00cf02c76..343488c7004 100644
--- a/tao_compiler/mlir/disc/tools/disc-replay/record.cc
+++ b/tao_compiler/mlir/disc/tools/disc-replay/record.cc
@@ -9,9 +9,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tools/disc-replay/record.h"
+#include "mlir/disc/tools/disc-replay/record.h"
 
-#include "tensorflow/compiler/mlir/disc/tools/disc-replay/tar_helper.h"
+#include "mlir/disc/tools/disc-replay/tar_helper.h"
 #include "tensorflow/core/framework/tensor.h"
 namespace replay {
 
diff --git a/tao_compiler/mlir/disc/tools/disc-replay/record.h b/tao_compiler/mlir/disc/tools/disc-replay/record.h
index 0cbc353a8cc..8f779381a70 100644
--- a/tao_compiler/mlir/disc/tools/disc-replay/record.h
+++ b/tao_compiler/mlir/disc/tools/disc-replay/record.h
@@ -12,7 +12,7 @@
 #ifndef DISC_REPLAY_RECORD_H_
 #define DISC_REPLAY_RECORD_H_
 
-#include "tensorflow/compiler/decoupling/tao_compiler_input.pb.h"
+#include "decoupling/tao_compiler_input.pb.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor.pb.h"
 #include "tensorflow/core/framework/tensor_shape.h"
diff --git a/tao_compiler/mlir/disc/tools/disc-source-emitter/disc-cuda-emitter.cc b/tao_compiler/mlir/disc/tools/disc-source-emitter/disc-cuda-emitter.cc
index 1204ec82500..75c765a129c 100644
--- a/tao_compiler/mlir/disc/tools/disc-source-emitter/disc-cuda-emitter.cc
+++ b/tao_compiler/mlir/disc/tools/disc-source-emitter/disc-cuda-emitter.cc
@@ -18,7 +18,7 @@
 #include "mlir/InitAllDialects.h"
 #include "mlir/Parser/Parser.h"
 #include "mlir/Support/FileUtilities.h"
-#include "tensorflow/compiler/mlir/disc/utils/source_emitter.h"
+#include "mlir/disc/utils/source_emitter.h"
 
 using namespace mlir;
 
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/BUILD b/tao_compiler/mlir/disc/tools/disc-transform/BUILD
index 686e8b284ee..ea35e5f78ca 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/BUILD
+++ b/tao_compiler/mlir/disc/tools/disc-transform/BUILD
@@ -6,7 +6,7 @@ load(
 load("@llvm-project//mlir:tblgen.bzl", "gentbl_cc_library", "gentbl_filegroup", "td_library")
 
 package(
-    default_visibility = [":friends"],
+    default_visibility = ["//visibility:public"],
     licenses = ["notice"],  # Apache 2.0
 )
 
@@ -25,6 +25,7 @@ td_library(
     srcs = glob([
         "LinalgExt/*.td",
     ]),
+    includes=["external/org_tensorflow"],
     deps = [
         "@llvm-project//mlir:BuiltinDialectTdFiles",
         "@llvm-project//mlir:InferTypeOpInterfaceTdFiles",
@@ -285,8 +286,8 @@ cc_library(
         ":DISCLinalgExtDialect",
         ":disc_transform_utils",
         ":pass_details",
-        "//tensorflow/compiler/xla/mlir_hlo:legalize_to_linalg_utils",
-        "//tensorflow/compiler/xla/mlir_hlo:lhlo",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:legalize_to_linalg_utils",
+        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:lhlo",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -336,7 +337,7 @@ cc_library(
     srcs = ["transforms/rewrite_payload_ir_for_ral.cc"],
     deps = [
         ":pass_details",
-        "//tensorflow/compiler/mlir/disc:placement_utils",
+        "//mlir/disc:placement_utils",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
@@ -394,9 +395,7 @@ cc_library(
         "transforms/passes.h",
         "transforms/register_passes.h",
     ],
-    visibility = [
-        ":friends",
-    ],
+    visibility = ["//visibility:public"],
     deps = [
         ":convert-foreach-thread-op-to-parallel-op",
         ":legalize_lmhlo_fusion_to_linalg",
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.cc b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.cc
index 1b985195eca..033eabfbb7b 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.cc
+++ b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/TypeSwitch.h"
@@ -19,8 +19,8 @@
 #include "mlir/IR/DialectImplementation.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/OpImplementation.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.cc.inc"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.cc.inc"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h"
 
 namespace mlir {
 namespace disc_ral {
@@ -29,7 +29,7 @@ namespace disc_linalg_ext {
 void DISCLinalgExtDialect::initialize() {
 #define GET_OP_LIST
   addOperations<
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.cc.inc"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.cc.inc"
       >();
 }
 
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h
index 6a8902feaf9..03456f9cb00 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h
+++ b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h
@@ -14,6 +14,6 @@
 
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h.inc"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h.inc"
 
 #endif  // DISC_TOOLS_DISC_TRANSFORM_LINALGEXT_DIALECT_EXT_
\ No newline at end of file
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.cc b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.cc
index 64d0d95a5df..f8db2fd9479 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.cc
+++ b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.h"
 
 #include "mlir/Dialect/Arith/IR/Arith.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
@@ -42,7 +42,7 @@ LogicalResult verifyLinalgExtOpInterface(Operation* op) {
 
 }  // namespace detail
 
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOpInterfaces.cc.inc"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOpInterfaces.cc.inc"
 
 template <typename Ty, typename DimOpTy>
 static void getDimValues(OpBuilder& b, Location loc, Value v, Ty t,
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.h b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.h
index ad0dc09ac19..fc8649702af 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.h
+++ b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.h
@@ -30,7 +30,7 @@ LogicalResult verifyLinalgExtOpInterface(Operation* op);
 }
 
 /// Include the generated interface declarations.
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOpInterfaces.h.inc"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOpInterfaces.h.inc"
 
 }  // namespace disc_linalg_ext
 }  // namespace disc_ral
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.td b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.td
index fb19e9e8570..62ef593c090 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.td
+++ b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.td
@@ -12,7 +12,7 @@
 #ifndef DISC_DIALECT_LINALGEXT_INTERFACES
 #define DISC_DIALECT_LINALGEXT_INTERFACES
 
-include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtBase.td"
+include "external/org_tensorflow/tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtBase.td"
 
 // The interface is a subset of LinalgStructuredInterface.
 def LinalgExtInterface : OpInterface<"LinalgExtOp"> {
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.cc b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.cc
index 42615ec86af..e7aaea900b7 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.cc
+++ b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h"
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallSet.h"
@@ -42,7 +42,7 @@
 #include "mlir/Support/LLVM.h"
 #include "mlir/Support/LogicalResult.h"
 #include "mlir/Support/MathExtras.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
 
 namespace mlir {
 namespace disc_ral {
@@ -411,4 +411,4 @@ void DISCLinalgExtDialect::getCanonicalizationPatterns(
 }  // namespace mlir
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.cc.inc"
\ No newline at end of file
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.cc.inc"
\ No newline at end of file
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h
index f2c41c4cc0b..1e68635d35e 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h
+++ b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h
@@ -20,10 +20,10 @@
 #include "mlir/Interfaces/InferTypeOpInterface.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Interfaces/TilingInterface.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.h"
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h.inc"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h.inc"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.td b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.td
index a26532a28db..87fac36ab9c 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.td
+++ b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.td
@@ -12,8 +12,8 @@
 #ifndef DISC_LINALGEXT_OPS
 #define DISC_LINALGEXT_OPS
 
-include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtBase.td"
-include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.td"
+include "external/org_tensorflow/tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtBase.td"
+include "external/org_tensorflow/tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtInterfaces.td"
 
 include "mlir/IR/AttrTypeBase.td"
 include "mlir/IR/EnumAttr.td"
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.cc b/tao_compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.cc
index 6e874ab5147..3547aecb7d8 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.cc
+++ b/tao_compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h"
+#include "mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h"
 
 #include "iree-dialects/Dialect/LinalgExt/IR/LinalgExtOps.h"
 #include "iree-dialects/Dialect/LinalgTransform/SimplePatternRewriter.h"
@@ -37,9 +37,9 @@
 #include "mlir/Interfaces/DestinationStyleOpInterface.h"
 #include "mlir/Pass/PassManager.h"
 #include "mlir/Support/MathExtras.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h"
+#include "mlir/disc/tools/disc-transform/utils.h"
 #include "mlir/include/mlir/Dialect/Utils/IndexingUtils.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/utils.h"
 
 namespace mlir {
 namespace disc_ral {
@@ -48,7 +48,7 @@ namespace transform_dialect {
 CommonExtensions::CommonExtensions() {
   registerTransformOps<
 #define GET_OP_LIST
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.cc.inc"
+#include "mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.cc.inc"
       >();
 }
 
@@ -1522,4 +1522,4 @@ void registerTransformDialectCommonExtension(DialectRegistry& registry) {
 }  // namespace mlir
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.cc.inc"
+#include "mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.cc.inc"
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h b/tao_compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h
index 3615558eb38..598808977fb 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h
+++ b/tao_compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h
@@ -40,6 +40,6 @@ class CommonExtensions
 }  // namespace mlir
 
 #define GET_OP_CLASSES
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h.inc"
+#include "mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h.inc"
 
 #endif  // DISC_TOOLS_DISC_TRANSFORM_TRANSFORM_OPS_TRANSFORM_OPS_EXT_
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/transforms/PassDetail.h b/tao_compiler/mlir/disc/tools/disc-transform/transforms/PassDetail.h
index 792c975fbf2..4634d4168d1 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/transforms/PassDetail.h
+++ b/tao_compiler/mlir/disc/tools/disc-transform/transforms/PassDetail.h
@@ -65,7 +65,7 @@ class DISCLinalgExtDialect;
 }
 
 #define GEN_PASS_CLASSES
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/transform_passes.h.inc"
+#include "mlir/disc/tools/disc-transform/transforms/transform_passes.h.inc"
 
 }  // namespace disc_ral
 }  // namespace mlir
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/transforms/convert_foreach_thread_op_to_parallel_op.cc b/tao_compiler/mlir/disc/tools/disc-transform/transforms/convert_foreach_thread_op_to_parallel_op.cc
index 25c38173e5d..46b20716071 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/transforms/convert_foreach_thread_op_to_parallel_op.cc
+++ b/tao_compiler/mlir/disc/tools/disc-transform/transforms/convert_foreach_thread_op_to_parallel_op.cc
@@ -18,7 +18,7 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/PassDetail.h"
+#include "mlir/disc/tools/disc-transform/transforms/PassDetail.h"
 
 #define DEBUG_TYPE "disc-convert-foreach-thread-op-to-parallel-op"
 
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/transforms/legalize_lmhlo_fusion_to_linalg.cc b/tao_compiler/mlir/disc/tools/disc-transform/transforms/legalize_lmhlo_fusion_to_linalg.cc
index ff287212a39..75b988d14f6 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/transforms/legalize_lmhlo_fusion_to_linalg.cc
+++ b/tao_compiler/mlir/disc/tools/disc-transform/transforms/legalize_lmhlo_fusion_to_linalg.cc
@@ -21,10 +21,10 @@
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/utils.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h"
+#include "mlir/disc/tools/disc-transform/transforms/PassDetail.h"
+#include "mlir/disc/tools/disc-transform/utils.h"
 
 #define DEBUG_TYPE "disc-legalize-lmhlo-fusion-to-linalg"
 
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/transforms/memref_copy_to_linalg.cc b/tao_compiler/mlir/disc/tools/disc-transform/transforms/memref_copy_to_linalg.cc
index bb731e6aa8e..f643a0b58c5 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/transforms/memref_copy_to_linalg.cc
+++ b/tao_compiler/mlir/disc/tools/disc-transform/transforms/memref_copy_to_linalg.cc
@@ -17,8 +17,8 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/utils.h"
+#include "mlir/disc/tools/disc-transform/transforms/PassDetail.h"
+#include "mlir/disc/tools/disc-transform/utils.h"
 
 #define DEBUG_TYPE "disc-memref-copy-to-linalg"
 
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/transforms/register_passes.h b/tao_compiler/mlir/disc/tools/disc-transform/transforms/register_passes.h
index 95ad7054dac..f58b1f2b8fd 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/transforms/register_passes.h
+++ b/tao_compiler/mlir/disc/tools/disc-transform/transforms/register_passes.h
@@ -17,13 +17,13 @@ limitations under the License.
 #define DISC_TOOLS_DISC_TRANSFORM_TRANSFORMS_REGISTER_PASSES_H_
 
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/passes.h"
+#include "mlir/disc/tools/disc-transform/transforms/passes.h"
 
 namespace mlir {
 namespace disc_ral {
 
 #define GEN_PASS_REGISTRATION
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/transform_passes.h.inc"
+#include "mlir/disc/tools/disc-transform/transforms/transform_passes.h.inc"
 
 inline void registerAllDiscTransformPasses() { registerDISCTransformPasses(); }
 
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/transforms/rewrite_payload_ir_for_ral.cc b/tao_compiler/mlir/disc/tools/disc-transform/transforms/rewrite_payload_ir_for_ral.cc
index 3c783ca8ac4..3214f698bee 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/transforms/rewrite_payload_ir_for_ral.cc
+++ b/tao_compiler/mlir/disc/tools/disc-transform/transforms/rewrite_payload_ir_for_ral.cc
@@ -19,8 +19,8 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/tools/disc-transform/transforms/PassDetail.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 #define DEBUG_TYPE "disc-rewrite-payload-ir-for-ral"
 
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/transforms/transform_dialect_interpreter.cc b/tao_compiler/mlir/disc/tools/disc-transform/transforms/transform_dialect_interpreter.cc
index 69b25f407d7..3ba1ac2acc2 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/transforms/transform_dialect_interpreter.cc
+++ b/tao_compiler/mlir/disc/tools/disc-transform/transforms/transform_dialect_interpreter.cc
@@ -38,10 +38,10 @@
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/utils.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
+#include "mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h"
+#include "mlir/disc/tools/disc-transform/transforms/PassDetail.h"
+#include "mlir/disc/tools/disc-transform/utils.h"
 
 #define DEBUG_TYPE "disc-transform-dialect-interpreter"
 
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/utils.cc b/tao_compiler/mlir/disc/tools/disc-transform/utils.cc
index 2cc76edb787..33226c45c46 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/utils.cc
+++ b/tao_compiler/mlir/disc/tools/disc-transform/utils.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/utils.h"
+#include "mlir/disc/tools/disc-transform/utils.h"
 
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/Debug.h"
diff --git a/tao_compiler/mlir/disc/transforms/PassDetail.h b/tao_compiler/mlir/disc/transforms/PassDetail.h
index fc4fefc4fdb..b3e62071d8f 100644
--- a/tao_compiler/mlir/disc/transforms/PassDetail.h
+++ b/tao_compiler/mlir/disc/transforms/PassDetail.h
@@ -19,7 +19,7 @@ limitations under the License.
 #include "mlir/Dialect/GPU/Transforms/Passes.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
 
 namespace mlir {
 class AffineDialect;
@@ -69,7 +69,7 @@ class TensorDialect;
 namespace disc_ral {
 
 #define GEN_PASS_CLASSES
-#include "tensorflow/compiler/mlir/disc/transforms/disc_passes.h.inc"
+#include "mlir/disc/transforms/disc_passes.h.inc"
 
 }  // namespace disc_ral
 }  // namespace mlir
@@ -78,7 +78,7 @@ namespace mlir {
 namespace mhlo_disc {
 
 #define GEN_PASS_CLASSES
-#include "tensorflow/compiler/mlir/disc/transforms/mhlo_disc_passes.h.inc"
+#include "mlir/disc/transforms/mhlo_disc_passes.h.inc"
 
 }  // namespace mhlo_disc
 }  // namespace mlir
diff --git a/tao_compiler/mlir/disc/transforms/codegen_utils.cc b/tao_compiler/mlir/disc/transforms/codegen_utils.cc
index 47681cde5bd..c1a7de69a47 100644
--- a/tao_compiler/mlir/disc/transforms/codegen_utils.cc
+++ b/tao_compiler/mlir/disc/transforms/codegen_utils.cc
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/codegen_utils.h"
 
 #include "mlir-hlo/Dialect/lhlo/IR/lhlo_ops.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
@@ -22,8 +22,8 @@ limitations under the License.
 #include "mlir/Dialect/SCF/Utils/Utils.h"
 #include "mlir/IR/BlockAndValueMapping.h"
 #include "mlir/IR/Dominance.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/disc_util.h"
 
 using mlir::memref::DimOp;
 
diff --git a/tao_compiler/mlir/disc/transforms/conv_rewriter.cc b/tao_compiler/mlir/disc/transforms/conv_rewriter.cc
index 7bec61ecdf1..7b0899ee498 100644
--- a/tao_compiler/mlir/disc/transforms/conv_rewriter.cc
+++ b/tao_compiler/mlir/disc/transforms/conv_rewriter.cc
@@ -24,9 +24,9 @@ limitations under the License.
 #include "mlir/IR/Operation.h"                           // TF:llvm-project
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"  // from @llvm-project
 #include "mlir/Transforms/Passes.h"                      // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/placement_utils.h"
 #include "tensorflow/core/util/env_var.h"
 
 #define DEBUG_TYPE "conv-rewriter"
diff --git a/tao_compiler/mlir/disc/transforms/disc_algebraic_simplifier.cc b/tao_compiler/mlir/disc/transforms/disc_algebraic_simplifier.cc
index 2ac558447be..e3ee95119c2 100644
--- a/tao_compiler/mlir/disc/transforms/disc_algebraic_simplifier.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_algebraic_simplifier.cc
@@ -20,9 +20,9 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_shape_optimization_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/disc_shape_optimization_utils.h"
 
 #define DEBUG_TYPE "disc-algebraic-simplifier"
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_assign_kernel_name.cc b/tao_compiler/mlir/disc/transforms/disc_assign_kernel_name.cc
index e0ec6740839..9b1eee0a903 100644
--- a/tao_compiler/mlir/disc/transforms/disc_assign_kernel_name.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_assign_kernel_name.cc
@@ -20,8 +20,8 @@ limitations under the License.
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/fusion_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_assign_memory_space.cc b/tao_compiler/mlir/disc/transforms/disc_assign_memory_space.cc
index dc7c77c3fbd..cfd99a594ef 100644
--- a/tao_compiler/mlir/disc/transforms/disc_assign_memory_space.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_assign_memory_space.cc
@@ -26,12 +26,12 @@ limitations under the License.
 #include "mlir/IR/SymbolTable.h"  // from @llvm-project
 #include "mlir/IR/TypeUtilities.h"
 #include "mlir/Pass/Pass.h"  // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_map_hlo_to_lhlo_op.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/disc_map_hlo_to_lhlo_op.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 // This file implements logic to assign memory space for each memref type.
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_buffer_deallocation.cc b/tao_compiler/mlir/disc/transforms/disc_buffer_deallocation.cc
index e9b4b34193c..7b2eaab3ac8 100644
--- a/tao_compiler/mlir/disc/transforms/disc_buffer_deallocation.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_buffer_deallocation.cc
@@ -20,9 +20,9 @@ limitations under the License.
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 // This file implements logic to insert dealloc op for some disc specific ops
 // (e.g. lmhlo_disc.custom_call_v2 op). These buffers can not be handled by
diff --git a/tao_compiler/mlir/disc/transforms/disc_canonicalizer.cc b/tao_compiler/mlir/disc/transforms/disc_canonicalizer.cc
index 16163703ef1..1edd3ae99b9 100644
--- a/tao_compiler/mlir/disc/transforms/disc_canonicalizer.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_canonicalizer.cc
@@ -16,7 +16,7 @@ limitations under the License.
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_comp_intens_fusion_to_cuda_source.cc b/tao_compiler/mlir/disc/transforms/disc_comp_intens_fusion_to_cuda_source.cc
index 1f3804b0316..f965c0e15bb 100644
--- a/tao_compiler/mlir/disc/transforms/disc_comp_intens_fusion_to_cuda_source.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_comp_intens_fusion_to_cuda_source.cc
@@ -16,10 +16,10 @@
 #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/utils/source_emitter.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/utils/source_emitter.h"
 
 namespace mlir {
 namespace disc_ral {
@@ -430,11 +430,11 @@ bool DiscCompIntensFusionToCUDASourcePass::
   std::string cuda_code;
   if (cc_major_ < 8) {
     cuda_code =
-#include "tensorflow/compiler/mlir/disc/utils/gemm_fusion_linear_base_template_sm75.hpp"
+#include "mlir/disc/utils/gemm_fusion_linear_base_template_sm75.hpp"
         ;
   } else {
     cuda_code =
-#include "tensorflow/compiler/mlir/disc/utils/gemm_fusion_linear_base_template_sm80.hpp"
+#include "mlir/disc/utils/gemm_fusion_linear_base_template_sm80.hpp"
         ;
   }
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_comp_intens_fusion_to_func.cc b/tao_compiler/mlir/disc/transforms/disc_comp_intens_fusion_to_func.cc
index df4e4be67a4..0df9a8b44b6 100644
--- a/tao_compiler/mlir/disc/transforms/disc_comp_intens_fusion_to_func.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_comp_intens_fusion_to_func.cc
@@ -13,9 +13,9 @@
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/BlockAndValueMapping.h"
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/fusion_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_convert_const_to_ral.cc b/tao_compiler/mlir/disc/transforms/disc_convert_const_to_ral.cc
index 18014169e85..58dc36c6b32 100644
--- a/tao_compiler/mlir/disc/transforms/disc_convert_const_to_ral.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_convert_const_to_ral.cc
@@ -24,11 +24,11 @@ limitations under the License.
 #include "mlir/IR/SymbolTable.h"  // from @llvm-project
 #include "mlir/IR/TypeUtilities.h"
 #include "mlir/Pass/Pass.h"  // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_metadata.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/placement_utils.h"
+#include "mlir/xla/ral/ral_metadata.h"
 #include "tensorflow/core/platform/env.h"
 
 namespace mlir {
diff --git a/tao_compiler/mlir/disc/transforms/disc_convert_fake_quant_op.cc b/tao_compiler/mlir/disc/transforms/disc_convert_fake_quant_op.cc
index f52d4f64f3e..c864d065f08 100644
--- a/tao_compiler/mlir/disc/transforms/disc_convert_fake_quant_op.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_convert_fake_quant_op.cc
@@ -21,8 +21,8 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 #define DEBUG_TYPE "disc-convert-fake-quant-op"
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_cpu_map_parallel_loop.cc b/tao_compiler/mlir/disc/transforms/disc_cpu_map_parallel_loop.cc
index 8d93921a80f..bbd1268c509 100644
--- a/tao_compiler/mlir/disc/transforms/disc_cpu_map_parallel_loop.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_cpu_map_parallel_loop.cc
@@ -28,11 +28,11 @@ limitations under the License.
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/Passes.h"
 #include "mlir/Transforms/RegionUtils.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_custom_call_rewriter.cc b/tao_compiler/mlir/disc/transforms/disc_custom_call_rewriter.cc
index 6c1a5d68a86..033964bb877 100644
--- a/tao_compiler/mlir/disc/transforms/disc_custom_call_rewriter.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_custom_call_rewriter.cc
@@ -17,9 +17,9 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 #define DEBUG_TYPE "disc-custom-call-rewriter"
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_dense_to_sparse.cc b/tao_compiler/mlir/disc/transforms/disc_dense_to_sparse.cc
index 7dc88e0eb97..2cb7be82f6c 100644
--- a/tao_compiler/mlir/disc/transforms/disc_dense_to_sparse.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_dense_to_sparse.cc
@@ -22,11 +22,11 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_shape_optimization_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/disc_shape_optimization_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 #define DEBUG_TYPE "disc-dense-to-sparse"
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_dot_merge.cc b/tao_compiler/mlir/disc/transforms/disc_dot_merge.cc
index 8f39e25b85d..51d364d4450 100644
--- a/tao_compiler/mlir/disc/transforms/disc_dot_merge.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_dot_merge.cc
@@ -21,10 +21,10 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/shape_utils.h"
-#include "tensorflow/compiler/mlir/disc/utils/cycle_detector.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/shape_utils.h"
+#include "mlir/disc/utils/cycle_detector.h"
 
 #define DEBUG_TYPE "disc-dot-merge"
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_duplicate_computation_for_fusion.cc b/tao_compiler/mlir/disc/transforms/disc_duplicate_computation_for_fusion.cc
index 83887f96421..2b1f849e6c8 100644
--- a/tao_compiler/mlir/disc/transforms/disc_duplicate_computation_for_fusion.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_duplicate_computation_for_fusion.cc
@@ -16,10 +16,10 @@ limitations under the License.
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/utils/source_emitter.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/utils/source_emitter.h"
 
 // This file implements the logic to duplicate some lmhlo operations in order
 // to enable more opportunities for fusion and reduce memory footprint.
diff --git a/tao_compiler/mlir/disc/transforms/disc_dynamic_slice_converter.cc b/tao_compiler/mlir/disc/transforms/disc_dynamic_slice_converter.cc
index 6ce31249223..c7166900c95 100644
--- a/tao_compiler/mlir/disc/transforms/disc_dynamic_slice_converter.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_dynamic_slice_converter.cc
@@ -21,8 +21,8 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_shape_optimization_utils.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/disc_shape_optimization_utils.h"
 #include "tensorflow/core/platform/logging.h"
 
 #define DEBUG_TYPE "disc-dynamic-slice-converter"
diff --git a/tao_compiler/mlir/disc/transforms/disc_flatten_memref_access.cc b/tao_compiler/mlir/disc/transforms/disc_flatten_memref_access.cc
index 578fab740c3..618b242b0ca 100644
--- a/tao_compiler/mlir/disc/transforms/disc_flatten_memref_access.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_flatten_memref_access.cc
@@ -22,10 +22,10 @@ limitations under the License.
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/lhlo_elemental_utils.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/lhlo_elemental_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_for_loop_unroll_interleave.cc b/tao_compiler/mlir/disc/transforms/disc_for_loop_unroll_interleave.cc
index a4c84ee52d3..dc675518954 100644
--- a/tao_compiler/mlir/disc/transforms/disc_for_loop_unroll_interleave.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_for_loop_unroll_interleave.cc
@@ -15,10 +15,10 @@
 #include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/Dialect/SCF/Transforms/Passes.h"
 #include "mlir/Dialect/SCF/Utils/Utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 #include "tensorflow/core/util/env_var.h"
 
 // This pass unrolls and interleaves the inner-most SCF for-loop ops in kStitch
diff --git a/tao_compiler/mlir/disc/transforms/disc_function_dead_argument_elimination.cc b/tao_compiler/mlir/disc/transforms/disc_function_dead_argument_elimination.cc
index 6769b14205c..9501e9f7bcd 100644
--- a/tao_compiler/mlir/disc/transforms/disc_function_dead_argument_elimination.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_function_dead_argument_elimination.cc
@@ -19,8 +19,8 @@
 #include "mlir/Pass/Pass.h"                              // from @llvm-project
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"  // from @llvm-project
 #include "mlir/Transforms/Passes.h"                      // from @llvm-project
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_fuse_splat_const.cc b/tao_compiler/mlir/disc/transforms/disc_fuse_splat_const.cc
index 5b97e4ce94e..d8c03daa2ff 100644
--- a/tao_compiler/mlir/disc/transforms/disc_fuse_splat_const.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_fuse_splat_const.cc
@@ -26,7 +26,7 @@ limitations under the License.
 #include "mlir/IR/Location.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_gpu_kernel_to_blob.cc b/tao_compiler/mlir/disc/transforms/disc_gpu_kernel_to_blob.cc
index cb9ab8b2023..e628c5f8bb8 100644
--- a/tao_compiler/mlir/disc/transforms/disc_gpu_kernel_to_blob.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_gpu_kernel_to_blob.cc
@@ -24,8 +24,8 @@ limitations under the License.
 #include "mlir/Target/LLVMIR/Dialect/NVVM/NVVMToLLVMIRTranslation.h"
 #include "mlir/Target/LLVMIR/Export.h"
 #include "mlir/Transforms/DialectConversion.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/codegen_utils.h"
 #include "tensorflow/compiler/xla/debug_options_flags.h"
 #include "tensorflow/compiler/xla/service/gpu/gpu_asm_opts_util.h"
 #include "tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.h"
diff --git a/tao_compiler/mlir/disc/transforms/disc_gpu_source_to_lib.cc b/tao_compiler/mlir/disc/transforms/disc_gpu_source_to_lib.cc
index 15f4a399e71..960bfa3ae7a 100644
--- a/tao_compiler/mlir/disc/transforms/disc_gpu_source_to_lib.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_gpu_source_to_lib.cc
@@ -17,9 +17,9 @@
 #include "absl/strings/str_replace.h"
 #include "llvm/Support/Program.h"
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
 #include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/platform/path.h"
 #include "tensorflow/core/platform/random.h"
@@ -187,26 +187,26 @@ LogicalResult DiscGPUSourceToLibPass::compilePreprocessedCUDASourceToLib(
   char* headers_cpp1;
   if (cc_major_ == 7 && cc_minor_ == 0) {
     headers_cpp1 =
-#include "tensorflow/compiler/mlir/disc/utils/cutlass_header_preprocess.700.cpp1.ii.h"
+#include "mlir/disc/utils/cutlass_header_preprocess.700.cpp1.ii.h"
         ;
   } else if (cc_major_ == 7 && cc_minor_ == 5) {
     headers_cpp1 =
-#include "tensorflow/compiler/mlir/disc/utils/cutlass_header_preprocess.750.cpp1.ii.h"
+#include "mlir/disc/utils/cutlass_header_preprocess.750.cpp1.ii.h"
         ;
   } else if (cc_major_ == 8 && cc_minor_ == 0) {
     headers_cpp1 =
-#include "tensorflow/compiler/mlir/disc/utils/cutlass_header_preprocess.800.cpp1.ii.h"
+#include "mlir/disc/utils/cutlass_header_preprocess.800.cpp1.ii.h"
         ;
   } else if (cc_major_ == 8 && cc_minor_ == 6) {
     headers_cpp1 =
-#include "tensorflow/compiler/mlir/disc/utils/cutlass_header_preprocess.860.cpp1.ii.h"
+#include "mlir/disc/utils/cutlass_header_preprocess.860.cpp1.ii.h"
         ;
   } else {
     return failure();
   }
 
   const char* headers_cpp4 =
-#include "tensorflow/compiler/mlir/disc/utils/cutlass_header_preprocess.cpp4.ii.h"
+#include "mlir/disc/utils/cutlass_header_preprocess.cpp4.ii.h"
       ;
 
   auto synthesizeCodeAndWriteFile = [&](std::string path, std::string header,
diff --git a/tao_compiler/mlir/disc/transforms/disc_hlo_legalize_to_lhlo.cc b/tao_compiler/mlir/disc/transforms/disc_hlo_legalize_to_lhlo.cc
index 9d2193ad8b5..9ee9e969e6c 100644
--- a/tao_compiler/mlir/disc/transforms/disc_hlo_legalize_to_lhlo.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_hlo_legalize_to_lhlo.cc
@@ -41,13 +41,13 @@ limitations under the License.
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_map_hlo_to_lhlo_op.h"
-#include "tensorflow/compiler/mlir/disc/transforms/rewriters.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/disc_map_hlo_to_lhlo_op.h"
+#include "mlir/disc/transforms/rewriters.h"
 
 namespace mlir {
 namespace mhlo_disc {
diff --git a/tao_compiler/mlir/disc/transforms/disc_hlo_to_std.cc b/tao_compiler/mlir/disc/transforms/disc_hlo_to_std.cc
index a07a4fe9c59..597c1a5cb9a 100644
--- a/tao_compiler/mlir/disc/transforms/disc_hlo_to_std.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_hlo_to_std.cc
@@ -26,8 +26,8 @@ limitations under the License.
 #include "mlir/IR/Operation.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/rewriters.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/rewriters.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_llvm_insert_value_simplifier.cc b/tao_compiler/mlir/disc/transforms/disc_llvm_insert_value_simplifier.cc
index b208fcf37a1..c4308d05965 100644
--- a/tao_compiler/mlir/disc/transforms/disc_llvm_insert_value_simplifier.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_llvm_insert_value_simplifier.cc
@@ -20,7 +20,7 @@
 #include "mlir/Pass/Pass.h"                              // from @llvm-project
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"  // from @llvm-project
 #include "mlir/Transforms/Passes.h"                      // from @llvm-project
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_common.cc b/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_common.cc
index 12325c6c4b9..f4b06d4b079 100644
--- a/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_common.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_common.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/transforms/disc_lower_gpu_ops_common.h"
+#include "mlir/disc/transforms/disc_lower_gpu_ops_common.h"
 
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/IR/BlockAndValueMapping.h"
diff --git a/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_common.h b/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_common.h
index 80d4a8be1ff..75b9c040cb5 100644
--- a/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_common.h
+++ b/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_common.h
@@ -21,7 +21,7 @@ limitations under the License.
 #include "mlir/Conversion/LLVMCommon/Pattern.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/IR/BuiltinOps.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_to_llvm_common.h"
+#include "mlir/disc/transforms/disc_to_llvm_common.h"
 
 namespace mlir {
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_to_nvvm_ops.cc b/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_to_nvvm_ops.cc
index 3a470597612..c889814430d 100644
--- a/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_to_nvvm_ops.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_to_nvvm_ops.cc
@@ -43,11 +43,11 @@
 #include "mlir/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/disc_lower_gpu_ops_common.h"
 #include "mlir/lib/Conversion/GPUCommon/GPUOpsLowering.h"
 #include "mlir/lib/Conversion/GPUCommon/IndexIntrinsicsOpLowering.h"
 #include "mlir/lib/Conversion/GPUCommon/OpToFuncCallLowering.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_lower_gpu_ops_common.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_to_rocdl_ops.cc b/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_to_rocdl_ops.cc
index 40cd2e7c0dd..c537c767b14 100644
--- a/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_to_rocdl_ops.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_lower_gpu_ops_to_rocdl_ops.cc
@@ -44,11 +44,11 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/disc_lower_gpu_ops_common.h"
 #include "mlir/lib/Conversion/GPUCommon/GPUOpsLowering.h"
 #include "mlir/lib/Conversion/GPUCommon/IndexIntrinsicsOpLowering.h"
 #include "mlir/lib/Conversion/GPUCommon/OpToFuncCallLowering.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_lower_gpu_ops_common.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_lower_quantize_and_dequantize.cc b/tao_compiler/mlir/disc/transforms/disc_lower_quantize_and_dequantize.cc
index 35e15a1af82..1bd9a7206e3 100644
--- a/tao_compiler/mlir/disc/transforms/disc_lower_quantize_and_dequantize.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_lower_quantize_and_dequantize.cc
@@ -21,8 +21,8 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 #define DEBUG_TYPE "disc-lower-quantize-and-dequantize"
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_lower_to_library_call.cc b/tao_compiler/mlir/disc/transforms/disc_lower_to_library_call.cc
index 98c03c039f3..b1e1c43ce70 100644
--- a/tao_compiler/mlir/disc/transforms/disc_lower_to_library_call.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_lower_to_library_call.cc
@@ -42,15 +42,15 @@ limitations under the License.
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "tensorflow/compiler/mlir/disc/IR/custom_call_base.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/rewriters.h"
+#include "mlir/disc/IR/custom_call_base.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/transforms/rewriters.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_map_hlo_to_lhlo_op.h b/tao_compiler/mlir/disc/transforms/disc_map_hlo_to_lhlo_op.h
index 3f32b52d964..dac2e7818ee 100644
--- a/tao_compiler/mlir/disc/transforms/disc_map_hlo_to_lhlo_op.h
+++ b/tao_compiler/mlir/disc/transforms/disc_map_hlo_to_lhlo_op.h
@@ -18,8 +18,8 @@ limitations under the License.
 
 #include <type_traits>
 
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
 
 namespace mlir {
 namespace mhlo_disc {
diff --git a/tao_compiler/mlir/disc/transforms/disc_math_approximation.cc b/tao_compiler/mlir/disc/transforms/disc_math_approximation.cc
index 9e82a200bd0..861738fbc40 100644
--- a/tao_compiler/mlir/disc/transforms/disc_math_approximation.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_math_approximation.cc
@@ -21,7 +21,7 @@ limitations under the License.
 #include "mlir/Dialect/Math/Transforms/Passes.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_memref_canonicalizer.cc b/tao_compiler/mlir/disc/transforms/disc_memref_canonicalizer.cc
index 4988da54347..bc73dd97ad1 100644
--- a/tao_compiler/mlir/disc/transforms/disc_memref_canonicalizer.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_memref_canonicalizer.cc
@@ -24,7 +24,7 @@ limitations under the License.
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_memref_cse.cc b/tao_compiler/mlir/disc/transforms/disc_memref_cse.cc
index 2274bba82ba..7ace1f113b0 100644
--- a/tao_compiler/mlir/disc/transforms/disc_memref_cse.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_memref_cse.cc
@@ -25,7 +25,7 @@ limitations under the License.
 #include "mlir/Pass/PassManager.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 using mlir::memref::LoadOp;
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_memref_load_store_simplifier.cc b/tao_compiler/mlir/disc/transforms/disc_memref_load_store_simplifier.cc
index 8ae3eb7863d..a9aec16a80f 100644
--- a/tao_compiler/mlir/disc/transforms/disc_memref_load_store_simplifier.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_memref_load_store_simplifier.cc
@@ -23,9 +23,9 @@
 #include "mlir/Pass/PassManager.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
 #include "placement_utils.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_outline_cpu_kernel.cc b/tao_compiler/mlir/disc/transforms/disc_outline_cpu_kernel.cc
index 47d9222fb58..b7caf3127f0 100644
--- a/tao_compiler/mlir/disc/transforms/disc_outline_cpu_kernel.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_outline_cpu_kernel.cc
@@ -31,11 +31,11 @@ limitations under the License.
 #include "mlir/Transforms/LoopInvariantCodeMotionUtils.h"
 #include "mlir/Transforms/Passes.h"
 #include "mlir/Transforms/RegionUtils.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_pdl_utils.cc b/tao_compiler/mlir/disc/transforms/disc_pdl_utils.cc
index 8bd16cd4601..439da4ef1e2 100644
--- a/tao_compiler/mlir/disc/transforms/disc_pdl_utils.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_pdl_utils.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/transforms/disc_pdl_utils.h"
+#include "mlir/disc/transforms/disc_pdl_utils.h"
 
 #include <cstring>
 #include <unordered_map>
@@ -32,7 +32,7 @@ limitations under the License.
 #include "mlir/Tools/PDLL/CodeGen/MLIRGen.h"
 #include "mlir/Tools/PDLL/ODS/Context.h"
 #include "mlir/Tools/PDLL/Parser/Parser.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
 #include "tensorflow/tsl/platform/default/logging.h"
 
 #define DEBUG_TYPE "disc-pdl-utils"
diff --git a/tao_compiler/mlir/disc/transforms/disc_quantized_dot_merge.cc b/tao_compiler/mlir/disc/transforms/disc_quantized_dot_merge.cc
index 6bf7f8a7a35..50a1d775679 100644
--- a/tao_compiler/mlir/disc/transforms/disc_quantized_dot_merge.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_quantized_dot_merge.cc
@@ -21,11 +21,11 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/shape_utils.h"
-#include "tensorflow/compiler/mlir/disc/utils/cycle_detector.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/shape_utils.h"
+#include "mlir/disc/utils/cycle_detector.h"
 
 #define DEBUG_TYPE "disc-quantized-dot-merge"
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_remove_dead_buffer.cc b/tao_compiler/mlir/disc/transforms/disc_remove_dead_buffer.cc
index 0239b443cc4..1db6eaabce1 100644
--- a/tao_compiler/mlir/disc/transforms/disc_remove_dead_buffer.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_remove_dead_buffer.cc
@@ -28,8 +28,8 @@ limitations under the License.
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Interfaces/ViewLikeInterface.h"
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_shape_optimization.cc b/tao_compiler/mlir/disc/transforms/disc_shape_optimization.cc
index 7e7a90d34c5..ff27a55f604 100644
--- a/tao_compiler/mlir/disc/transforms/disc_shape_optimization.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_shape_optimization.cc
@@ -36,11 +36,11 @@ limitations under the License.
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
 #include "mlir/Transforms/Passes.h"  // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_shape_optimization_utils.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/disc_shape_optimization_utils.h"
 
 #define DEBUG_TYPE "disc-shape-optimization"
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_shape_optimization_utils.cc b/tao_compiler/mlir/disc/transforms/disc_shape_optimization_utils.cc
index 3493886e19a..3f5649e50ee 100644
--- a/tao_compiler/mlir/disc/transforms/disc_shape_optimization_utils.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_shape_optimization_utils.cc
@@ -16,7 +16,7 @@ limitations under the License.
 // This file implements the logic to do some shape optimizations on tensor
 // level.
 
-#include "tensorflow/compiler/mlir/disc/transforms/disc_shape_optimization_utils.h"
+#include "mlir/disc/transforms/disc_shape_optimization_utils.h"
 
 #include <algorithm>
 
@@ -30,9 +30,9 @@ limitations under the License.
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 #define DEBUG_TYPE "disc-shape-optimization-utils"
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_shape_optimization_utils.h b/tao_compiler/mlir/disc/transforms/disc_shape_optimization_utils.h
index 8cbb9bf276f..f385b2a152d 100644
--- a/tao_compiler/mlir/disc/transforms/disc_shape_optimization_utils.h
+++ b/tao_compiler/mlir/disc/transforms/disc_shape_optimization_utils.h
@@ -16,7 +16,7 @@
 #include "llvm/ADT/SmallVector.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/AffineExpr.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
 
 #ifndef TENSORFLOW_COMPILER_MLIR_DISC_TRANSFORMS_DISC_SHAPE_OPTIMIZATION_UTILS_H_
 #define TENSORFLOW_COMPILER_MLIR_DISC_TRANSFORMS_DISC_SHAPE_OPTIMIZATION_UTILS_H_
diff --git a/tao_compiler/mlir/disc/transforms/disc_shape_simplifier.cc b/tao_compiler/mlir/disc/transforms/disc_shape_simplifier.cc
index 3870c272c72..4237f34a441 100644
--- a/tao_compiler/mlir/disc/transforms/disc_shape_simplifier.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_shape_simplifier.cc
@@ -67,10 +67,10 @@ limitations under the License.
 #include "mlir/Pass/Pass.h"  // TF:local_config_mlir
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"  // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/shape_utils.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/shape_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_shape_to_std.cc b/tao_compiler/mlir/disc/transforms/disc_shape_to_std.cc
index 765b992e79d..2ed61356bc4 100644
--- a/tao_compiler/mlir/disc/transforms/disc_shape_to_std.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_shape_to_std.cc
@@ -29,9 +29,9 @@ limitations under the License.
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/rewriters.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/rewriters.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_side_effect_loop_invariant_code_motion.cc b/tao_compiler/mlir/disc/transforms/disc_side_effect_loop_invariant_code_motion.cc
index a6340b20930..a48b13ad7ff 100644
--- a/tao_compiler/mlir/disc/transforms/disc_side_effect_loop_invariant_code_motion.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_side_effect_loop_invariant_code_motion.cc
@@ -22,8 +22,8 @@
 #include "mlir/Pass/Pass.h"                              // from @llvm-project
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"  // from @llvm-project
 #include "mlir/Transforms/Passes.h"                      // from @llvm-project
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_specialize_fusion_with_speculation.cc b/tao_compiler/mlir/disc/transforms/disc_specialize_fusion_with_speculation.cc
index c0ae973dd7a..c69fd931540 100644
--- a/tao_compiler/mlir/disc/transforms/disc_specialize_fusion_with_speculation.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_specialize_fusion_with_speculation.cc
@@ -20,11 +20,11 @@
 #include "mlir/IR/BlockAndValueMapping.h"
 #include "mlir/IR/MLIRContext.h"  // TF:llvm-project
 #include "mlir/Pass/Pass.h"       // TF:local_config_mlir
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 #include "tensorflow/core/util/env_var.h"
 
 namespace mlir {
diff --git a/tao_compiler/mlir/disc/transforms/disc_std_bufferize.cc b/tao_compiler/mlir/disc/transforms/disc_std_bufferize.cc
index 6c0d626978f..2f69f052a16 100644
--- a/tao_compiler/mlir/disc/transforms/disc_std_bufferize.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_std_bufferize.cc
@@ -28,8 +28,8 @@ limitations under the License.
 #include "mlir/IR/Operation.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/rewriters.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/rewriters.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_stitch_fusion.cc b/tao_compiler/mlir/disc/transforms/disc_stitch_fusion.cc
index afad7bef0dd..328dcef5e37 100644
--- a/tao_compiler/mlir/disc/transforms/disc_stitch_fusion.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_stitch_fusion.cc
@@ -27,12 +27,12 @@ limitations under the License.
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Support/LogicalResult.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/lhlo_elemental_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/lhlo_elemental_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_strip_shape_constraint_ops.cc b/tao_compiler/mlir/disc/transforms/disc_strip_shape_constraint_ops.cc
index a2064958905..47dab12f3ff 100644
--- a/tao_compiler/mlir/disc/transforms/disc_strip_shape_constraint_ops.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_strip_shape_constraint_ops.cc
@@ -20,9 +20,9 @@ limitations under the License.
 #include "mlir/IR/Location.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Support/LogicalResult.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_shape_optimization_utils.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/disc_shape_optimization_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_tensor_to_std.cc b/tao_compiler/mlir/disc/transforms/disc_tensor_to_std.cc
index 0561ca53413..a79e5105fdf 100644
--- a/tao_compiler/mlir/disc/transforms/disc_tensor_to_std.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_tensor_to_std.cc
@@ -29,8 +29,8 @@ limitations under the License.
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/rewriters.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/rewriters.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_to_llvm.cc b/tao_compiler/mlir/disc/transforms/disc_to_llvm.cc
index ae3048c4741..8bbede6bb81 100644
--- a/tao_compiler/mlir/disc/transforms/disc_to_llvm.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_to_llvm.cc
@@ -40,14 +40,14 @@
 #include "mlir/IR/Operation.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_to_llvm_common.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/rewriters.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/disc_to_llvm_common.h"
+#include "mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/transforms/rewriters.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_to_llvm_common.cc b/tao_compiler/mlir/disc/transforms/disc_to_llvm_common.cc
index e5a26a323be..337ddeda108 100644
--- a/tao_compiler/mlir/disc/transforms/disc_to_llvm_common.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_to_llvm_common.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/transforms/disc_to_llvm_common.h"
+#include "mlir/disc/transforms/disc_to_llvm_common.h"
 
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/IR/BlockAndValueMapping.h"
diff --git a/tao_compiler/mlir/disc/transforms/disc_transform_legalize_to_loop.cc b/tao_compiler/mlir/disc/transforms/disc_transform_legalize_to_loop.cc
index c36ce672832..c700a4966ba 100644
--- a/tao_compiler/mlir/disc/transforms/disc_transform_legalize_to_loop.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_transform_legalize_to_loop.cc
@@ -34,17 +34,17 @@ limitations under the License.
 #include "mlir/Pass/Pass.h"
 #include "mlir/Pass/PassManager.h"
 #include "mlir/Support/LogicalResult.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/passes.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_transform_schedule.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/lhlo_elemental_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h"
+#include "mlir/disc/tools/disc-transform/transforms/passes.h"
+#include "mlir/disc/tools/disc-transform/utils.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/disc_transform_schedule.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/lhlo_elemental_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 #include "tensorflow/tsl/platform/default/logging.h"
 
 // This file implements logic to legalize transform fusion pattern to loop.
diff --git a/tao_compiler/mlir/disc/transforms/disc_transform_schedule.cc b/tao_compiler/mlir/disc/transforms/disc_transform_schedule.cc
index 6ea8b7bab21..d7e0d5671f1 100644
--- a/tao_compiler/mlir/disc/transforms/disc_transform_schedule.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_transform_schedule.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/transforms/disc_transform_schedule.h"
+#include "mlir/disc/transforms/disc_transform_schedule.h"
 
 #include "iree-dialects/Dialect/LinalgExt/IR/LinalgExtDialect.h"
 #include "iree-dialects/Dialect/LinalgExt/TransformOps/LinalgExtTransformOps.h"
@@ -43,16 +43,16 @@ limitations under the License.
 #include "mlir/Pass/Pass.h"
 #include "mlir/Pass/PassManager.h"
 #include "mlir/Support/LogicalResult.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/transforms/passes.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-transform/utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/lhlo_elemental_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtDialect.h"
+#include "mlir/disc/tools/disc-transform/LinalgExt/LinalgExtOps.h"
+#include "mlir/disc/tools/disc-transform/TransformOps/TransformOpsExt.h"
+#include "mlir/disc/tools/disc-transform/transforms/passes.h"
+#include "mlir/disc/tools/disc-transform/utils.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/lhlo_elemental_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 #include "tensorflow/tsl/platform/default/logging.h"
 
 // This file implements logic to assign transform schedule for the given pattern
diff --git a/tao_compiler/mlir/disc/transforms/disc_transform_schedule.h b/tao_compiler/mlir/disc/transforms/disc_transform_schedule.h
index f3ddc1e5eb6..5ae9541557f 100644
--- a/tao_compiler/mlir/disc/transforms/disc_transform_schedule.h
+++ b/tao_compiler/mlir/disc/transforms/disc_transform_schedule.h
@@ -22,7 +22,7 @@ limitations under the License.
 #include <string>
 #include <unordered_map>
 
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/disc_transpose_simplifier.cc b/tao_compiler/mlir/disc/transforms/disc_transpose_simplifier.cc
index a623d4e69c1..91a73f2fcea 100644
--- a/tao_compiler/mlir/disc/transforms/disc_transpose_simplifier.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_transpose_simplifier.cc
@@ -36,10 +36,10 @@ limitations under the License.
 #include "mlir/Pass/PassManager.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"  // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 #define DEBUG_TYPE "disc-transpose-simplifier"
 
diff --git a/tao_compiler/mlir/disc/transforms/disc_unhandled_atomic_rmw_converter.cc b/tao_compiler/mlir/disc/transforms/disc_unhandled_atomic_rmw_converter.cc
index b9c5b09873d..3c79b903dd6 100644
--- a/tao_compiler/mlir/disc/transforms/disc_unhandled_atomic_rmw_converter.cc
+++ b/tao_compiler/mlir/disc/transforms/disc_unhandled_atomic_rmw_converter.cc
@@ -19,7 +19,7 @@
 #include "mlir/Transforms/DialectConversion.h"           // TF:llvm-project
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"  // TF:llvm-project
 #include "mlir/Transforms/Passes.h"                      // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/dot_rewriter.cc b/tao_compiler/mlir/disc/transforms/dot_rewriter.cc
index e9204bf1a59..781d7e50938 100644
--- a/tao_compiler/mlir/disc/transforms/dot_rewriter.cc
+++ b/tao_compiler/mlir/disc/transforms/dot_rewriter.cc
@@ -29,8 +29,8 @@
 #include "mlir/Pass/Pass.h"                              // from @llvm-project
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"  // from @llvm-project
 #include "mlir/Transforms/Passes.h"                      // from @llvm-project
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 using llvm::StringRef;
 using std::string;
diff --git a/tao_compiler/mlir/disc/transforms/element_type_converter.cc b/tao_compiler/mlir/disc/transforms/element_type_converter.cc
index fd4e729ffe1..a4f640d5fc8 100644
--- a/tao_compiler/mlir/disc/transforms/element_type_converter.cc
+++ b/tao_compiler/mlir/disc/transforms/element_type_converter.cc
@@ -28,7 +28,7 @@ limitations under the License.
 #include "mlir/Pass/Pass.h"                              // from @llvm-project
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"  // from @llvm-project
 #include "mlir/Transforms/Passes.h"                      // from @llvm-project
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/fusion_utils.cc b/tao_compiler/mlir/disc/transforms/fusion_utils.cc
index 7136dce1800..e54d3fe973d 100644
--- a/tao_compiler/mlir/disc/transforms/fusion_utils.cc
+++ b/tao_compiler/mlir/disc/transforms/fusion_utils.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
 
 #include <algorithm>
 #include <mutex>
@@ -27,12 +27,12 @@ limitations under the License.
 #include "mlir/IR/MLIRContext.h"  // TF:llvm-project
 #include "mlir/IR/Matchers.h"
 #include "mlir/Interfaces/ViewLikeInterface.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_shape_optimization_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/lhlo_elemental_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/disc_shape_optimization_utils.h"
+#include "mlir/disc/transforms/lhlo_elemental_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 // This file implements some helper functions and classes used to do fusion
 // & code generation.
diff --git a/tao_compiler/mlir/disc/transforms/fusion_utils.h b/tao_compiler/mlir/disc/transforms/fusion_utils.h
index d89cf7cf5bb..1016aa4bcad 100644
--- a/tao_compiler/mlir/disc/transforms/fusion_utils.h
+++ b/tao_compiler/mlir/disc/transforms/fusion_utils.h
@@ -25,8 +25,8 @@ limitations under the License.
 #include "llvm/Support/Debug.h"
 #include "mlir-hlo/Dialect/lhlo/IR/lhlo_ops.h"
 #include "mlir/Dialect/SCF/IR/SCF.h"
-#include "tensorflow/compiler/mlir/disc/transforms/lhlo_elemental_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/shape_utils.h"
+#include "mlir/disc/transforms/lhlo_elemental_utils.h"
+#include "mlir/disc/transforms/shape_utils.h"
 
 #define DEBUG_TYPE "disc-fusion-utils"
 
diff --git a/tao_compiler/mlir/disc/transforms/fusion_utils_dot_gpu.cc b/tao_compiler/mlir/disc/transforms/fusion_utils_dot_gpu.cc
index 9b9d5684f48..812f3c69243 100644
--- a/tao_compiler/mlir/disc/transforms/fusion_utils_dot_gpu.cc
+++ b/tao_compiler/mlir/disc/transforms/fusion_utils_dot_gpu.cc
@@ -9,9 +9,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/utils/source_emitter.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/utils/source_emitter.h"
 
 namespace llvm {
 template <>
diff --git a/tao_compiler/mlir/disc/transforms/fusion_utils_stitch_gpu.cc b/tao_compiler/mlir/disc/transforms/fusion_utils_stitch_gpu.cc
index 319ae204433..7c45577ea47 100644
--- a/tao_compiler/mlir/disc/transforms/fusion_utils_stitch_gpu.cc
+++ b/tao_compiler/mlir/disc/transforms/fusion_utils_stitch_gpu.cc
@@ -9,8 +9,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/fusion_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/fusion_utils_transform_based.cc b/tao_compiler/mlir/disc/transforms/fusion_utils_transform_based.cc
index 01a0f83387f..22861c468de 100644
--- a/tao_compiler/mlir/disc/transforms/fusion_utils_transform_based.cc
+++ b/tao_compiler/mlir/disc/transforms/fusion_utils_transform_based.cc
@@ -9,8 +9,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/fusion_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/gpu_conv_padding.cc b/tao_compiler/mlir/disc/transforms/gpu_conv_padding.cc
index 079aa8f810f..51851aa9245 100644
--- a/tao_compiler/mlir/disc/transforms/gpu_conv_padding.cc
+++ b/tao_compiler/mlir/disc/transforms/gpu_conv_padding.cc
@@ -29,9 +29,9 @@ limitations under the License.
 #include "mlir/IR/Matchers.h"               // TF:llvm-project
 #include "mlir/IR/Operation.h"              // TF:llvm-project
 #include "mlir/Pass/Pass.h"                 // TF:local_config_mlir
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/input_inline_fusion_pass.cc b/tao_compiler/mlir/disc/transforms/input_inline_fusion_pass.cc
index dd6c6ed5e04..43de2dc448d 100644
--- a/tao_compiler/mlir/disc/transforms/input_inline_fusion_pass.cc
+++ b/tao_compiler/mlir/disc/transforms/input_inline_fusion_pass.cc
@@ -29,11 +29,11 @@ limitations under the License.
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/input_inline_fusion_pattern.h"
-#include "tensorflow/compiler/mlir/disc/transforms/lhlo_elemental_utils.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/input_inline_fusion_pattern.h"
+#include "mlir/disc/transforms/lhlo_elemental_utils.h"
 
 using mlir::memref::LoadOp;
 
diff --git a/tao_compiler/mlir/disc/transforms/input_inline_fusion_pattern.cc b/tao_compiler/mlir/disc/transforms/input_inline_fusion_pattern.cc
index 7fe2a4de4f9..1c78aae6d7a 100644
--- a/tao_compiler/mlir/disc/transforms/input_inline_fusion_pattern.cc
+++ b/tao_compiler/mlir/disc/transforms/input_inline_fusion_pattern.cc
@@ -9,15 +9,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/transforms/input_inline_fusion_pattern.h"
+#include "mlir/disc/transforms/input_inline_fusion_pattern.h"
 
 #include "mlir-hlo/Dialect/lhlo/transforms/map_lmhlo_to_scalar_op.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/IR/PatternMatch.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/codegen_utils.h"
 
 namespace mlir {
 namespace disc_ral {
@@ -243,7 +243,7 @@ LogicalResult InputInlineFusionPattern::inlineFuseLhloOp(
     LowerConfig* lower_config) const {
   if (elemwiseFuseHelperOr<
 #define GET_SUPPORTED_OP_LIST
-#include "tensorflow/compiler/mlir/disc/transforms/disc_supported_list.h.inc"
+#include "mlir/disc/transforms/disc_supported_list.h.inc"
           >(b, user, producer, load_op, load_ops, lower_config) ||
       // TODO(disc): Upstream is on the way for more Ops
       miscFuseHelper<BroadcastInDimOp>(b, user, producer, load_op, load_ops,
diff --git a/tao_compiler/mlir/disc/transforms/input_inline_fusion_pattern.h b/tao_compiler/mlir/disc/transforms/input_inline_fusion_pattern.h
index aa845026270..c4fdef41e2c 100644
--- a/tao_compiler/mlir/disc/transforms/input_inline_fusion_pattern.h
+++ b/tao_compiler/mlir/disc/transforms/input_inline_fusion_pattern.h
@@ -16,8 +16,8 @@
 #include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/Dialect/SCF/Utils/Utils.h"
 #include "mlir/IR/Dominance.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/lhlo_elemental_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/lhlo_elemental_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/lhlo_elemental_utils.cc b/tao_compiler/mlir/disc/transforms/lhlo_elemental_utils.cc
index 2cd65e66051..7eba6b24bca 100644
--- a/tao_compiler/mlir/disc/transforms/lhlo_elemental_utils.cc
+++ b/tao_compiler/mlir/disc/transforms/lhlo_elemental_utils.cc
@@ -16,7 +16,7 @@ limitations under the License.
 // This file provides basic utilities for the elemental lowering of
 // each node
 
-#include "tensorflow/compiler/mlir/disc/transforms/lhlo_elemental_utils.h"
+#include "mlir/disc/transforms/lhlo_elemental_utils.h"
 
 #include "llvm/Support/Debug.h"
 #include "mlir-hlo/Dialect/lhlo/IR/lhlo_ops.h"
@@ -32,10 +32,10 @@ limitations under the License.
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_shape_optimization_utils.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/disc_shape_optimization_utils.h"
 
 using mlir::memref::DimOp;
 using mlir::memref::LoadOp;
diff --git a/tao_compiler/mlir/disc/transforms/lhlo_elemental_utils.h b/tao_compiler/mlir/disc/transforms/lhlo_elemental_utils.h
index 7999b69d38c..ad6ac07e9f6 100644
--- a/tao_compiler/mlir/disc/transforms/lhlo_elemental_utils.h
+++ b/tao_compiler/mlir/disc/transforms/lhlo_elemental_utils.h
@@ -23,7 +23,7 @@ limitations under the License.
 #include "mlir/Dialect/Arith/IR/Arith.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/IR/Builders.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/codegen_utils.h"
 
 namespace mlir {
 
diff --git a/tao_compiler/mlir/disc/transforms/lhlo_fusion.cc b/tao_compiler/mlir/disc/transforms/lhlo_fusion.cc
index d0eb6cdee3c..317d323871e 100644
--- a/tao_compiler/mlir/disc/transforms/lhlo_fusion.cc
+++ b/tao_compiler/mlir/disc/transforms/lhlo_fusion.cc
@@ -18,14 +18,14 @@ limitations under the License.
 #include "mlir/IR/Matchers.h"
 #include "mlir/Pass/Pass.h"               // TF:local_config_mlir
 #include "mlir/Transforms/RegionUtils.h"  // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_shape_optimization_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/shape_utils.h"
-#include "tensorflow/compiler/mlir/disc/utils/cycle_detector.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/disc_shape_optimization_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/transforms/shape_utils.h"
+#include "mlir/disc/utils/cycle_detector.h"
 #include "tensorflow/core/util/env_var.h"
 
 // This pass has similar functionality of the fusion pass in XLA stack.
diff --git a/tao_compiler/mlir/disc/transforms/lhlo_fusion_inliner.cc b/tao_compiler/mlir/disc/transforms/lhlo_fusion_inliner.cc
index 43133d1b9dc..f493f41a3c5 100644
--- a/tao_compiler/mlir/disc/transforms/lhlo_fusion_inliner.cc
+++ b/tao_compiler/mlir/disc/transforms/lhlo_fusion_inliner.cc
@@ -18,7 +18,7 @@ limitations under the License.
 //
 #include "mlir-hlo/Dialect/lhlo/IR/lhlo_ops.h"
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/lhlo_legalize_roots_to_loops.cc b/tao_compiler/mlir/disc/transforms/lhlo_legalize_roots_to_loops.cc
index 51f0cc7c674..09147ba48d1 100644
--- a/tao_compiler/mlir/disc/transforms/lhlo_legalize_roots_to_loops.cc
+++ b/tao_compiler/mlir/disc/transforms/lhlo_legalize_roots_to_loops.cc
@@ -35,15 +35,15 @@ limitations under the License.
 #include "mlir/Support/LogicalResult.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/input_inline_fusion_pattern.h"
-#include "tensorflow/compiler/mlir/disc/transforms/lhlo_elemental_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/transforms/input_inline_fusion_pattern.h"
+#include "mlir/disc/transforms/lhlo_elemental_utils.h"
+#include "mlir/disc/transforms/placement_utils.h"
 #include "tensorflow/core/util/env_var.h"
 
 namespace mlir {
@@ -228,7 +228,7 @@ LogicalResult lowerHelper(OpBuilder& b, Location loc, Operation* op,
                           LowerConfig* lower_config = nullptr) {
   if (succeeded(elemwiseLowerHelperOr<
 #define GET_SUPPORTED_OP_LIST
-#include "tensorflow/compiler/mlir/disc/transforms/disc_supported_list.h.inc"
+#include "mlir/disc/transforms/disc_supported_list.h.inc"
                 >(b, loc, op, output_linear_index, shape_analysis, vector_size,
                   lower_config)) ||
       // clang-format off
@@ -4370,6 +4370,7 @@ LogicalResult lowerWithScheduleSparseFillEmptyRowsOpCPU(
     ArrayRef<Operation*> root_ops, Operation* dominant_op,
     Block* parent = nullptr, bool non_fusion = false,
     const ShapeAnalysis* shape_analysis = nullptr) {
+  llvm::dbgs() << "come in lowerWithScheduleSparseFillEmptyRowsOpCPU\n";
   if (!(root_ops.size() == 1 &&
         isa<lmhlo_disc::SparseFillEmptyRowsOp>(root_ops[0]))) {
     return dominant_op->emitError()
@@ -4998,9 +4999,11 @@ LogicalResult lowerWithScheduleLoopCPU(
     Block* parent = nullptr, bool non_fusion = false, bool parallel_loop = true,
     bool multi_dim_loop = false,
     const ShapeAnalysis* shape_analysis = nullptr) {
+  llvm::dbgs() << "parallel_loop: " << parallel_loop << "\n";
   Value result = cast<lmhlo::LmhloOp>(dominant_op).getResultBuffer();
   int64_t rank = result.getType().cast<MemRefType>().getRank();
   if (!multi_dim_loop || !rank || !parallel_loop) {
+    llvm::dbgs() << "lower with lowerWithScheduleLoop\n";
     return lowerWithScheduleLoop(root_ops, dominant_op, parent, non_fusion,
                                  parallel_loop, shape_analysis);
   }
@@ -5330,6 +5333,8 @@ struct DiscLhloLegalizeRootsToParallelLoops
       // should be sufficient for performance.
       // TODO(disc): Revisit this when the backend is cpu and the calculation is
       // for data.
+      llvm::dbgs() << "cpu-no-fusion-op: \n";
+      op->dump();
       if (failed(lowerWithScheduleLoopCPU({op}, op, nullptr,
                                           /*non_fusion=*/true,
 #ifdef TAO_CPU_ONLY
diff --git a/tao_compiler/mlir/disc/transforms/lower_tf.cc b/tao_compiler/mlir/disc/transforms/lower_tf.cc
index 43bac33544f..6087854fb60 100644
--- a/tao_compiler/mlir/disc/transforms/lower_tf.cc
+++ b/tao_compiler/mlir/disc/transforms/lower_tf.cc
@@ -32,14 +32,14 @@ limitations under the License.
 #include "mlir/Support/LogicalResult.h"                  // from @llvm-project
 #include "mlir/Transforms/DialectConversion.h"           // from @llvm-project
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"  // from @llvm-project
+#include "mlir/disc/IR/disc_tf_additional_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/rng_uniform_custom_call_op.h"
+#include "mlir/disc/IR/topk_custom_call_op.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/disc_pdl_utils.h"
 #include "stablehlo/dialect/ChloOps.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_tf_additional_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/rng_uniform_custom_call_op.h"
-#include "tensorflow/compiler/mlir/disc/IR/topk_custom_call_op.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_pdl_utils.h"
 #include "tensorflow/compiler/mlir/tensorflow/ir/tf_ops.h"
 #include "tensorflow/compiler/mlir/tensorflow/ir/tf_types.h"
 #include "tensorflow/compiler/mlir/tensorflow/utils/convert_tensor.h"
@@ -1457,7 +1457,7 @@ class ConvertWhereOp : public OpRewritePattern<TF::WhereOp> {
   }
 };
 
-#include "tensorflow/compiler/mlir/disc/transforms/lower_tf.inc"
+#include "mlir/disc/transforms/lower_tf.inc"
 
 // add pre-defined pdll patterns here.
 std::string getPredefinedPDLPatterns() {
diff --git a/tao_compiler/mlir/disc/transforms/lower_tf.td b/tao_compiler/mlir/disc/transforms/lower_tf.td
index 9bf47aa84ce..f9ebbf50b3b 100644
--- a/tao_compiler/mlir/disc/transforms/lower_tf.td
+++ b/tao_compiler/mlir/disc/transforms/lower_tf.td
@@ -15,8 +15,8 @@ limitations under the License.
 
 include "mlir/IR/OpBase.td"
 include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.td"
-include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.td"
-include "tensorflow/compiler/mlir/tensorflow/ir/tf_ops.td"
+include "mlir/disc/IR/hlo_disc_ops.td"
+include "external/org_tensorflow/tensorflow/compiler/mlir/tensorflow/ir/tf_ops.td"
 
 // Treated as passthrough IdentityOp
 def : Pat<(TF_CheckNumericsOp $arg, $msg), (TF_IdentityOp $arg)>;
diff --git a/tao_compiler/mlir/disc/transforms/mhlo_decomp_rewriters.cc b/tao_compiler/mlir/disc/transforms/mhlo_decomp_rewriters.cc
index dad60d83f0b..6794fa660ea 100644
--- a/tao_compiler/mlir/disc/transforms/mhlo_decomp_rewriters.cc
+++ b/tao_compiler/mlir/disc/transforms/mhlo_decomp_rewriters.cc
@@ -26,8 +26,8 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/mhlo_mark_shape_calc.cc b/tao_compiler/mlir/disc/transforms/mhlo_mark_shape_calc.cc
index 0a9a0fc036d..42cb5ffc7d0 100644
--- a/tao_compiler/mlir/disc/transforms/mhlo_mark_shape_calc.cc
+++ b/tao_compiler/mlir/disc/transforms/mhlo_mark_shape_calc.cc
@@ -17,8 +17,8 @@
 #include "mlir/IR/MLIRContext.h"     // TF:llvm-project
 #include "mlir/Pass/Pass.h"          // TF:local_config_mlir
 #include "mlir/Transforms/Passes.h"  // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 namespace mlir {
 
diff --git a/tao_compiler/mlir/disc/transforms/mhlo_placer.cc b/tao_compiler/mlir/disc/transforms/mhlo_placer.cc
index 7e9bfefe77b..a3875f47eda 100644
--- a/tao_compiler/mlir/disc/transforms/mhlo_placer.cc
+++ b/tao_compiler/mlir/disc/transforms/mhlo_placer.cc
@@ -17,9 +17,9 @@
 #include "mlir/IR/MLIRContext.h"            // TF:llvm-project
 #include "mlir/Pass/Pass.h"                 // TF:local_config_mlir
 #include "mlir/Transforms/Passes.h"         // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 namespace mlir {
 
diff --git a/tao_compiler/mlir/disc/transforms/parallel_loop_collapsing.cc b/tao_compiler/mlir/disc/transforms/parallel_loop_collapsing.cc
index e76fb4c196d..c7adedb7079 100644
--- a/tao_compiler/mlir/disc/transforms/parallel_loop_collapsing.cc
+++ b/tao_compiler/mlir/disc/transforms/parallel_loop_collapsing.cc
@@ -27,8 +27,8 @@
 #include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/Dialect/SCF/Transforms/Passes.h"
 #include "mlir/Dialect/SCF/Utils/Utils.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/fusion_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/parallel_loop_tiling.cc b/tao_compiler/mlir/disc/transforms/parallel_loop_tiling.cc
index 196bc707254..6619cbb4acb 100644
--- a/tao_compiler/mlir/disc/transforms/parallel_loop_tiling.cc
+++ b/tao_compiler/mlir/disc/transforms/parallel_loop_tiling.cc
@@ -28,9 +28,9 @@
 #include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/Dialect/SCF/Transforms/Passes.h"
 #include "mlir/Dialect/SCF/Utils/Utils.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/codegen_utils.h"
-#include "tensorflow/compiler/mlir/disc/transforms/fusion_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/codegen_utils.h"
+#include "mlir/disc/transforms/fusion_utils.h"
 #include "tensorflow/core/util/env_var.h"
 
 namespace mlir {
diff --git a/tao_compiler/mlir/disc/transforms/placement_utils.cc b/tao_compiler/mlir/disc/transforms/placement_utils.cc
index 198a6dcd361..94f12688ce7 100644
--- a/tao_compiler/mlir/disc/transforms/placement_utils.cc
+++ b/tao_compiler/mlir/disc/transforms/placement_utils.cc
@@ -14,9 +14,9 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Support/Debug.h"
 #include "mlir-hlo/Dialect/lhlo/transforms/map_hlo_to_lhlo_op.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_map_hlo_to_lhlo_op.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/transforms/disc_map_hlo_to_lhlo_op.h"
 
 namespace mlir {
 namespace placement_utils {
diff --git a/tao_compiler/mlir/disc/transforms/placement_utils.h b/tao_compiler/mlir/disc/transforms/placement_utils.h
index 1dd7aa7319a..483a0a2a261 100644
--- a/tao_compiler/mlir/disc/transforms/placement_utils.h
+++ b/tao_compiler/mlir/disc/transforms/placement_utils.h
@@ -18,7 +18,7 @@
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"  // TF:llvm-project
 #include "mlir/IR/MLIRContext.h"            // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
 
 #ifndef TENSORFLOW_COMPILER_MLIR_XLA_PLACEMENT_UTILS_H_
 #define TENSORFLOW_COMPILER_MLIR_XLA_PLACEMENT_UTILS_H_
diff --git a/tao_compiler/mlir/disc/transforms/quantized_dot_rewriter.cc b/tao_compiler/mlir/disc/transforms/quantized_dot_rewriter.cc
index 6533b83eade..908718b2a88 100644
--- a/tao_compiler/mlir/disc/transforms/quantized_dot_rewriter.cc
+++ b/tao_compiler/mlir/disc/transforms/quantized_dot_rewriter.cc
@@ -16,9 +16,9 @@
 #include "mlir/IR/Operation.h"                           // TF:llvm-project
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"  // from @llvm-project
 #include "mlir/Transforms/Passes.h"                      // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/ral_inject_execution_context.cc b/tao_compiler/mlir/disc/transforms/ral_inject_execution_context.cc
index 3b3a265e22e..0fedad5764c 100644
--- a/tao_compiler/mlir/disc/transforms/ral_inject_execution_context.cc
+++ b/tao_compiler/mlir/disc/transforms/ral_inject_execution_context.cc
@@ -57,8 +57,8 @@ limitations under the License.
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_ral_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/IR/disc_ral_ops.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/register_passes.h b/tao_compiler/mlir/disc/transforms/register_passes.h
index d1804cfb6fa..c9a2288795c 100644
--- a/tao_compiler/mlir/disc/transforms/register_passes.h
+++ b/tao_compiler/mlir/disc/transforms/register_passes.h
@@ -17,13 +17,13 @@ limitations under the License.
 #define DISC_TRANSFORMS_REGISTER_PASSES_H_
 
 #include "mlir/Pass/Pass.h"
-#include "tensorflow/compiler/mlir/disc/transforms/passes.h"
+#include "mlir/disc/transforms/passes.h"
 
 namespace mlir {
 namespace disc_ral {
 
 #define GEN_PASS_REGISTRATION
-#include "tensorflow/compiler/mlir/disc/transforms/disc_passes.h.inc"
+#include "mlir/disc/transforms/disc_passes.h.inc"
 
 inline void registerAllDiscPasses() { registerDISCPasses(); }
 
@@ -34,7 +34,7 @@ namespace mlir {
 namespace mhlo_disc {
 
 #define GEN_PASS_REGISTRATION
-#include "tensorflow/compiler/mlir/disc/transforms/mhlo_disc_passes.h.inc"
+#include "mlir/disc/transforms/mhlo_disc_passes.h.inc"
 
 inline void registerAllMhloDiscPasses() { registerMhloDiscPasses(); }
 
diff --git a/tao_compiler/mlir/disc/transforms/remove_shape_constraints.cc b/tao_compiler/mlir/disc/transforms/remove_shape_constraints.cc
index 83469e602b8..50e7b272228 100644
--- a/tao_compiler/mlir/disc/transforms/remove_shape_constraints.cc
+++ b/tao_compiler/mlir/disc/transforms/remove_shape_constraints.cc
@@ -29,8 +29,8 @@ limitations under the License.
 #include "mlir/IR/Operation.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/rewriters.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/rewriters.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/revise_args_for_static_rank.cc b/tao_compiler/mlir/disc/transforms/revise_args_for_static_rank.cc
index 0e82bd0f7d0..dbec50f1aef 100644
--- a/tao_compiler/mlir/disc/transforms/revise_args_for_static_rank.cc
+++ b/tao_compiler/mlir/disc/transforms/revise_args_for_static_rank.cc
@@ -16,9 +16,9 @@
 #include "llvm/Support/FormatVariadic.h"
 #include "mlir/Pass/Pass.h"              // TF:llvm-project
 #include "mlir/Support/LogicalResult.h"  // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/placement_utils.h"
 #include "tensorflow/compiler/mlir/tensorflow/ir/tf_ops.h"
 
 namespace mlir {
diff --git a/tao_compiler/mlir/disc/transforms/revise_kernel_outlining.cc b/tao_compiler/mlir/disc/transforms/revise_kernel_outlining.cc
index 7af1b348992..44f091eea9b 100644
--- a/tao_compiler/mlir/disc/transforms/revise_kernel_outlining.cc
+++ b/tao_compiler/mlir/disc/transforms/revise_kernel_outlining.cc
@@ -33,9 +33,9 @@
 #include "mlir/Interfaces/ViewLikeInterface.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/RegionUtils.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
-#include "tensorflow/compiler/mlir/disc/transforms/placement_utils.h"
+#include "mlir/disc/disc_util.h"
+#include "mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/placement_utils.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/shape_utils.cc b/tao_compiler/mlir/disc/transforms/shape_utils.cc
index bb917bbb134..8daf8c54a98 100644
--- a/tao_compiler/mlir/disc/transforms/shape_utils.cc
+++ b/tao_compiler/mlir/disc/transforms/shape_utils.cc
@@ -11,7 +11,7 @@
 
 #define DEBUG_TYPE "disc-shape-utils"
 
-#include "tensorflow/compiler/mlir/disc/transforms/shape_utils.h"
+#include "mlir/disc/transforms/shape_utils.h"
 
 #include <unordered_set>
 #include <utility>
@@ -27,9 +27,9 @@
 #include "mlir/IR/Dominance.h"
 #include "mlir/IR/MLIRContext.h"  // TF:llvm-project
 #include "mlir/IR/OpDefinition.h"
-#include "tensorflow/compiler/mlir/disc/IR/disc_shape_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
+#include "mlir/disc/IR/disc_shape_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/transforms/shape_utils.h b/tao_compiler/mlir/disc/transforms/shape_utils.h
index 468a75de20e..152583871d2 100644
--- a/tao_compiler/mlir/disc/transforms/shape_utils.h
+++ b/tao_compiler/mlir/disc/transforms/shape_utils.h
@@ -16,7 +16,7 @@
 #include "llvm/ADT/EquivalenceClasses.h"
 #include "llvm/ADT/SmallVector.h"
 #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h"
-#include "tensorflow/compiler/mlir/disc/transforms/disc_shape_optimization_utils.h"
+#include "mlir/disc/transforms/disc_shape_optimization_utils.h"
 
 #ifndef TENSORFLOW_COMPILER_MLIR_XLA_SHAPE_UTILS_H_
 #define TENSORFLOW_COMPILER_MLIR_XLA_SHAPE_UTILS_H_
diff --git a/tao_compiler/mlir/disc/transforms/split_large_ops.cc b/tao_compiler/mlir/disc/transforms/split_large_ops.cc
index fb091b1dee2..38b7136bb2e 100644
--- a/tao_compiler/mlir/disc/transforms/split_large_ops.cc
+++ b/tao_compiler/mlir/disc/transforms/split_large_ops.cc
@@ -28,7 +28,7 @@ limitations under the License.
 #include "mlir/Pass/Pass.h"                              // TF:llvm-project
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"  // TF:llvm-project
 #include "mlir/Transforms/Passes.h"                      // TF:llvm-project
-#include "tensorflow/compiler/mlir/disc/transforms/PassDetail.h"
+#include "mlir/disc/transforms/PassDetail.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/disc/utils/cycle_detector.cc b/tao_compiler/mlir/disc/utils/cycle_detector.cc
index 9c617d9e6a7..7886c98f4b3 100644
--- a/tao_compiler/mlir/disc/utils/cycle_detector.cc
+++ b/tao_compiler/mlir/disc/utils/cycle_detector.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/utils/cycle_detector.h"
+#include "mlir/disc/utils/cycle_detector.h"
 
 #include <algorithm>
 
diff --git a/tao_compiler/mlir/disc/utils/source_emitter.cc b/tao_compiler/mlir/disc/utils/source_emitter.cc
index aeeb0ac4fdc..3dbcba17911 100644
--- a/tao_compiler/mlir/disc/utils/source_emitter.cc
+++ b/tao_compiler/mlir/disc/utils/source_emitter.cc
@@ -9,14 +9,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/utils/source_emitter.h"
+#include "mlir/disc/utils/source_emitter.h"
 
 #include <sstream>
 
 #include "mlir-hlo/Dialect/lhlo/IR/lhlo_ops.h"
 #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h"
-#include "tensorflow/compiler/mlir/disc/IR/lhlo_disc_ops.h"
-#include "tensorflow/compiler/mlir/disc/disc_util.h"
+#include "mlir/disc/IR/lhlo_disc_ops.h"
+#include "mlir/disc/disc_util.h"
 
 namespace mlir {
 namespace disc_ral {
diff --git a/tao_compiler/mlir/util/util.bzl b/tao_compiler/mlir/util/util.bzl
index 050dbbf09f3..ef4f26032bd 100644
--- a/tao_compiler/mlir/util/util.bzl
+++ b/tao_compiler/mlir/util/util.bzl
@@ -22,7 +22,7 @@ def disc_cc_library(copts = tf_copts(), **kwargs):
 
 def if_platform_alibaba(if_true, if_false=[]):
     return select({
-        "//tensorflow/compiler/mlir/util:is_platform_alibaba": if_true,
+        "//mlir/util:is_platform_alibaba": if_true,
         "//conditions:default": if_false
     })
 
@@ -35,43 +35,43 @@ def if_cuda_or_rocm(if_true, if_false=[]):
 
 def if_patine(if_true, if_false=[]):
     return select({
-        "//tensorflow/compiler/mlir/util:is_patine": if_true,
+        "//mlir/util:is_patine": if_true,
         "//conditions:default": if_false
     })
 
 def if_blade_gemm(if_true, if_false=[]):
     return select({
-        "//tensorflow/compiler/mlir/util:is_blade_gemm": if_true,
+        "//mlir/util:is_blade_gemm": if_true,
         "//conditions:default": if_false
     })
 
 def if_mkldnn(if_true, if_false=[]):
     return select({
-        "//tensorflow/compiler/mlir/util:is_mkldnn": if_true,
+        "//mlir/util:is_mkldnn": if_true,
         "//conditions:default": if_false
     })
 
 def if_disc_aarch64(if_true, if_false=[]):
     return select({
-        "//tensorflow/compiler/mlir/util:disc_aarch64": if_true,
+        "//mlir/util:disc_aarch64": if_true,
         "//conditions:default": if_false
     })
 
 def if_disc_x86(if_true, if_false=[]):
     return select({
-        "//tensorflow/compiler/mlir/util:disc_x86": if_true,
+        "//mlir/util:disc_x86": if_true,
         "//conditions:default": if_false
     })
 
 def if_torch_disc(if_true, if_false=[]):
     return select({
-        "//tensorflow/compiler/mlir/util:is_torch_disc": if_true,
+        "//mlir/util:is_torch_disc": if_true,
         "//conditions:default": if_false
     })
 
 def if_skip_compute_intensive_fusion(if_true, if_false=[]):
     return select({
-        "//tensorflow/compiler/mlir/util:skip_compute_intensive_fusion": if_true,
+        "//mlir/util:skip_compute_intensive_fusion": if_true,
         "//conditions:default": if_false
     })
 
diff --git a/tao_compiler/mlir/xla/ral/BUILD b/tao_compiler/mlir/xla/ral/BUILD
index 538a293cee7..c729613e047 100644
--- a/tao_compiler/mlir/xla/ral/BUILD
+++ b/tao_compiler/mlir/xla/ral/BUILD
@@ -21,7 +21,7 @@ load(
     "@com_google_protobuf//:protobuf.bzl",
     "cc_proto_library",
 )
-load("//tensorflow/compiler/mlir/util:util.bzl",
+load("//mlir/util:util.bzl",
      "disc_cc_library",
      "if_cuda_or_rocm",
      "if_platform_alibaba",
@@ -176,9 +176,9 @@ tf_cc_test(
     ],
     deps = [
         ":ral_metadata",
-        "//tensorflow/core:test_main",
-        "//tensorflow/core:test",
-        "//tensorflow/core:testlib",
+        "@org_tensorflow//tensorflow/core:test_main",
+        "@org_tensorflow//tensorflow/core:test",
+        "@org_tensorflow//tensorflow/core:testlib",
     ],
 )
 
@@ -348,18 +348,19 @@ cc_library(
         ":context_util",
         "@com_google_absl//absl/strings"
     ] + if_cuda_is_configured([
-        "//tensorflow/stream_executor:cuda_platform",
+        #"@org_tensorflow//tensorflow/stream_executor:cuda_platform",
+        "@org_tensorflow//tensorflow/compiler/xla/stream_executor/cuda:all_runtime",
         "@local_config_cuda//cuda:cuda_driver",
         "@local_config_cuda//cuda:cuda_headers",
     ]) + if_rocm_is_configured([
-        "//tensorflow/stream_executor:rocm_platform",
-        "//tensorflow/stream_executor/rocm:rocm_driver",
+        "@org_tensorflow//tensorflow/stream_executor:rocm_platform",
+        "@org_tensorflow//tensorflow/stream_executor/rocm:rocm_driver",
         "@local_config_rocm//rocm:rocm_headers",
     ]) + if_cuda_or_rocm([
         ":ral_gpu_driver",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:stream_executor_headers_lib",
-        "//tensorflow/core:framework",
+        "@org_tensorflow//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:stream_executor_headers_lib",
+        "@org_tensorflow//tensorflow/core:framework",
     ]) + if_patine([
         ":disc_patine_client_deps",
     ]) + if_blade_gemm([
@@ -442,16 +443,17 @@ cc_library(
         ":ral_logging",
         ":context_util",
         ":random_gpu_lib",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:stream_executor_headers_lib",
+        "@org_tensorflow//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:stream_executor_headers_lib",
         "@com_google_absl//absl/strings",
     ] + if_cuda_is_configured([
-        "//tensorflow/stream_executor:cuda_platform",
+        #"@org_tensorflow//tensorflow/stream_executor:cuda_platform",
+        "@org_tensorflow//tensorflow/compiler/xla/stream_executor/cuda:all_runtime",
         "@local_config_cuda//cuda:cuda_driver",
         "@local_config_cuda//cuda:cuda_headers",
     ]) + if_rocm_is_configured([
-        "//tensorflow/stream_executor:rocm_platform",
-        "//tensorflow/stream_executor/rocm:rocm_driver",
+        "@org_tensorflow//tensorflow/stream_executor:rocm_platform",
+        "@org_tensorflow//tensorflow/stream_executor/rocm:rocm_driver",
         "@local_config_rocm//rocm:rocm_headers",
     ]),
     alwayslink = 1,
@@ -497,16 +499,17 @@ cc_library(
         ":ral_logging",
         ":context_util",
         ":transpose_gpu_lib",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:stream_executor_headers_lib",
+        "@org_tensorflow//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:stream_executor_headers_lib",
         "@com_google_absl//absl/strings",
     ] + if_cuda_is_configured([
-        "//tensorflow/stream_executor:cuda_platform",
+        #"@org_tensorflow//tensorflow/stream_executor:cuda_platform",
+        "@org_tensorflow//tensorflow/compiler/xla/stream_executor/cuda:all_runtime",
         "@local_config_cuda//cuda:cuda_driver",
         "@local_config_cuda//cuda:cuda_headers",
     ]) + if_rocm_is_configured([
-        "//tensorflow/stream_executor:rocm_platform",
-        "//tensorflow/stream_executor/rocm:rocm_driver",
+        "@org_tensorflow//tensorflow/stream_executor:rocm_platform",
+        "@org_tensorflow//tensorflow/stream_executor/rocm:rocm_driver",
         "@local_config_rocm//rocm:rocm_headers",
     ]),
     copts = if_cuda_is_configured([
@@ -531,14 +534,15 @@ cc_library(
     deps = [
         ":common_context",
         ":ral_logging",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:lib",
         "@com_google_absl//absl/strings",
     ] + if_cuda_is_configured([
-        "//tensorflow/stream_executor:cuda_platform",
+        #"@org_tensorflow//tensorflow/stream_executor:cuda_platform",
+        "@org_tensorflow//tensorflow/compiler/xla/stream_executor/cuda:all_runtime",
         "@local_config_cuda//cuda:cuda_driver",
         "@local_config_cuda//cuda:cuda_headers",
     ]) + if_rocm_is_configured([
-        "//tensorflow/stream_executor:rocm_platform",
+        "@org_tensorflow//tensorflow/stream_executor:rocm_platform",
     ]),
     alwayslink = 1,
 )
@@ -567,9 +571,9 @@ cc_library(
         ":ral_logging",
         "@com_google_absl//absl/strings",
         "@curl",
-        "//third_party/eigen3",
+        "@org_tensorflow//third_party/eigen3",
     ] + if_cuda_or_rocm([
-        "//tensorflow/core:stream_executor_headers_lib",
+        "@org_tensorflow//tensorflow/core:stream_executor_headers_lib",
     ]) + if_blade_gemm([
         ":disc_blade_gemm_deps"
     ]),
@@ -599,14 +603,14 @@ disc_cc_library(
         ":ral_logging",
         ":random",
         ":transpose",
-        "//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:lib",
         "@com_google_absl//absl/strings",
         "@curl",
     ] + if_rocm_is_configured([
-        "//tensorflow/stream_executor/rocm:rocm_platform",
-        "//tensorflow/stream_executor/rocm:rocm_driver",
+        "@org_tensorflow//tensorflow/stream_executor/rocm:rocm_platform",
+        "@org_tensorflow//tensorflow/stream_executor/rocm:rocm_driver",
     ]) + if_cuda_is_configured([
-        "//tensorflow/stream_executor/cuda:cuda_platform",
+        "@org_tensorflow//tensorflow/stream_executor/cuda:cuda_platform",
         "@local_config_cuda//cuda:cuda_driver",
     ]),
     alwayslink = 1,
@@ -619,12 +623,12 @@ tf_cc_shared_object(
         "//conditions:default": [
             "-z defs",
             "-Wl,--version-script",  #  This line must be directly followed by the version_script.lds file
-            "$(location //tensorflow/compiler/mlir/xla/ral:context_version_scripts.lds)",
+            "$(location //mlir/xla/ral:context_version_scripts.lds)",
         ],
     }),
     deps = [
         ":ral_base_cpu_context_impl",
-        "//tensorflow/compiler/mlir/xla/ral:context_version_scripts.lds",
+        "//mlir/xla/ral:context_version_scripts.lds",
     ] + if_cuda_or_rocm([
         ":ral_base_cuda_context_impl",
     ]))
diff --git a/tao_compiler/mlir/xla/ral/context/base/base_context.cc b/tao_compiler/mlir/xla/ral/context/base/base_context.cc
index db4b19f4555..582f8b49e97 100644
--- a/tao_compiler/mlir/xla/ral/context/base/base_context.cc
+++ b/tao_compiler/mlir/xla/ral/context/base/base_context.cc
@@ -15,12 +15,12 @@
 // limitations under the License.
 // =============================================================================
 
-#include "tensorflow/compiler/mlir/xla/ral/context/base/base_context.h"
+#include "mlir/xla/ral/context/base/base_context.h"
 
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_logging.h"
+#include "mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_logging.h"
 #include "third_party/eigen3/Eigen/Core"
 
 namespace tao {
diff --git a/tao_compiler/mlir/xla/ral/context/base/base_context.h b/tao_compiler/mlir/xla/ral/context/base/base_context.h
index 9ada969253b..59aee894ced 100644
--- a/tao_compiler/mlir/xla/ral/context/base/base_context.h
+++ b/tao_compiler/mlir/xla/ral/context/base/base_context.h
@@ -22,8 +22,8 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_base.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_context.h"
+#include "mlir/xla/ral/ral_base.h"
+#include "mlir/xla/ral/ral_context.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.cc b/tao_compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.cc
index 0734f3d7abd..57b92c21e89 100644
--- a/tao_compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.cc
+++ b/tao_compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.cc
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // ============================================================================
-#include "tensorflow/compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.h"
+#include "mlir/xla/ral/context/base/cpu/cpu_context_impl.h"
 
 #include <cassert>
 #include <cstdlib>
@@ -26,11 +26,11 @@
 #include <unordered_set>
 #include <vector>
 
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_logging.h"
+#include "mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/ral_driver.h"
+#include "mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_logging.h"
 
 namespace tao {
 namespace ral {
@@ -414,7 +414,7 @@ RAL_REGISTER_BITCAST_FUNC(bool, 8);
 }  // namespace tao
 
 #ifdef TAO_RAL_USE_STREAM_EXECUTOR
-#include "tensorflow/compiler/mlir/xla/ral/context/stream_executor_based_impl.h"
+#include "mlir/xla/ral/context/stream_executor_based_impl.h"
 namespace tao {
 namespace ral {
 namespace cpu {
diff --git a/tao_compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.h b/tao_compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.h
index 91024f38ecf..b5cc5cba0c8 100644
--- a/tao_compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.h
+++ b/tao_compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.h
@@ -18,9 +18,9 @@
 #ifndef RAL_CONTEXT_BASE_CPU_CPU_CONTEXT_IMPL_H_
 #define RAL_CONTEXT_BASE_CPU_CPU_CONTEXT_IMPL_H_
 
-#include "tensorflow/compiler/mlir/xla/ral/context/base/base_context.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/cpu/cpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_context.h"
+#include "mlir/xla/ral/context/base/base_context.h"
+#include "mlir/xla/ral/device/cpu/cpu_driver.h"
+#include "mlir/xla/ral/ral_context.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.cc b/tao_compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.cc
index 9a0374059ac..903eb278066 100644
--- a/tao_compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.cc
+++ b/tao_compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.cc
@@ -15,7 +15,7 @@
 // limitations under the License.
 // ============================================================================
 
-#include "tensorflow/compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.h"
+#include "mlir/xla/ral/context/base/cuda/cuda_context_impl.h"
 
 #include <cstdlib>
 #include <fstream>
@@ -26,13 +26,13 @@
 #include <unordered_set>
 #include <vector>
 
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/init_stream_executor.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/stream_executor_based_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_logging.h"
+#include "mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/context/init_stream_executor.h"
+#include "mlir/xla/ral/context/stream_executor_based_impl.h"
+#include "mlir/xla/ral/ral_driver.h"
+#include "mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_logging.h"
 #include "tensorflow/compiler/xla/stream_executor/gpu/gpu_types.h"
 
 #if TENSORFLOW_USE_ROCM
diff --git a/tao_compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.h b/tao_compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.h
index dfbdf049d2a..4a07df3823f 100644
--- a/tao_compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.h
+++ b/tao_compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.h
@@ -27,10 +27,10 @@
 #include "rocm/include/hip/hip_runtime.h"
 #endif
 
-#include "tensorflow/compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/cpu/cpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/gpu/gpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_context.h"
+#include "mlir/xla/ral/context/base/cpu/cpu_context_impl.h"
+#include "mlir/xla/ral/device/cpu/cpu_driver.h"
+#include "mlir/xla/ral/device/gpu/gpu_driver.h"
+#include "mlir/xla/ral/ral_context.h"
 
 // Raw cuda ral implementation.
 
diff --git a/tao_compiler/mlir/xla/ral/context/base/cuda/cuda_stream.cc b/tao_compiler/mlir/xla/ral/context/base/cuda/cuda_stream.cc
index 3706202e95d..6137312f434 100644
--- a/tao_compiler/mlir/xla/ral/context/base/cuda/cuda_stream.cc
+++ b/tao_compiler/mlir/xla/ral/context/base/cuda/cuda_stream.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/xla/ral/context/base/cuda/cuda_stream.h"
+#include "mlir/xla/ral/context/base/cuda/cuda_stream.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/common_context_impl.cc b/tao_compiler/mlir/xla/ral/context/common_context_impl.cc
index a9fae5c755e..679fd03f426 100644
--- a/tao_compiler/mlir/xla/ral/context/common_context_impl.cc
+++ b/tao_compiler/mlir/xla/ral/context/common_context_impl.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/context/common_context_impl.h"
 
 #include <fcntl.h>
 #include <omp.h>
@@ -20,10 +20,10 @@
 #include <numeric>
 
 #include "absl/strings/str_split.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/cpu/cpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_base.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/device/cpu/cpu_driver.h"
+#include "mlir/xla/ral/ral_base.h"
+#include "mlir/xla/ral/ral_helper.h"
 
 // If we're on gcc 4.8 or older, there's a known bug that prevents the use of
 // intrinsics when the architecture is not defined in the flags. See
@@ -986,7 +986,7 @@ TAO_RAL_API(cpu::kRalCpuLaunch, "cpu", ompLaunchKernel);
 }  // namespace tao
 
 #ifdef TAO_RAL_USE_STREAM_EXECUTOR
-#include "tensorflow/compiler/mlir/xla/ral/context/stream_executor_based_impl.h"
+#include "mlir/xla/ral/context/stream_executor_based_impl.h"
 namespace tao {
 namespace ral {
 RAL_REGISTER_CONST_HOST_FUNC_0D(Eigen::half);
diff --git a/tao_compiler/mlir/xla/ral/context/common_context_impl.h b/tao_compiler/mlir/xla/ral/context/common_context_impl.h
index 1d41fc1416f..a7fe88a2cb8 100644
--- a/tao_compiler/mlir/xla/ral/context/common_context_impl.h
+++ b/tao_compiler/mlir/xla/ral/context/common_context_impl.h
@@ -20,10 +20,10 @@
 #include <chrono>
 #include <map>
 
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_context.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_metadata.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/ral_context.h"
+#include "mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_metadata.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/common_context_impl_acl.cc b/tao_compiler/mlir/xla/ral/context/common_context_impl_acl.cc
index 8e9058f35ab..0c9750963ed 100644
--- a/tao_compiler/mlir/xla/ral/context/common_context_impl_acl.cc
+++ b/tao_compiler/mlir/xla/ral/context/common_context_impl_acl.cc
@@ -11,7 +11,7 @@
 
 #if defined(TAO_CPU_ONLY) && defined(TAO_AARCH64)
 
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl_acl.h"
+#include "mlir/xla/ral/context/common_context_impl_acl.h"
 
 #include <unordered_map>
 
@@ -22,11 +22,11 @@
 #include "arm_compute/core/utils/quantization/AsymmHelpers.h"
 #include "arm_compute/runtime/NEON/NEScheduler.h"
 #include "arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h"
+#include "mlir/xla/ral/ral_md5.h"
 #include "src/common/utils/Log.h"
 #include "src/cpu/operators/CpuConv2d.h"
 #include "src/cpu/operators/CpuDepthwiseConv2d.h"
 #include "src/cpu/operators/CpuGemmLowpMatrixMultiplyCore.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_md5.h"
 
 namespace arm_compute {
 using namespace arm_compute::experimental;
diff --git a/tao_compiler/mlir/xla/ral/context/common_context_impl_acl.h b/tao_compiler/mlir/xla/ral/context/common_context_impl_acl.h
index 5b77ed58feb..c0255775807 100644
--- a/tao_compiler/mlir/xla/ral/context/common_context_impl_acl.h
+++ b/tao_compiler/mlir/xla/ral/context/common_context_impl_acl.h
@@ -30,12 +30,12 @@
 #include "arm_compute/runtime/NEON/NEFunctions.h"
 #include "arm_compute/runtime/NEON/functions/NEActivationLayer.h"
 #include "arm_compute/runtime/NEON/functions/NEPermute.h"
+#include "mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/device/cpu/cpu_driver.h"
+#include "mlir/xla/ral/ral_base.h"
+#include "mlir/xla/ral/ral_helper.h"
 #include "src/core/helpers/MemoryHelpers.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/cpu/cpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_base.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
 
 namespace arm_compute {
 
diff --git a/tao_compiler/mlir/xla/ral/context/common_context_impl_cuda.cc b/tao_compiler/mlir/xla/ral/context/common_context_impl_cuda.cc
index 0b7b42e4bc3..d778890ddb0 100644
--- a/tao_compiler/mlir/xla/ral/context/common_context_impl_cuda.cc
+++ b/tao_compiler/mlir/xla/ral/context/common_context_impl_cuda.cc
@@ -17,13 +17,13 @@
 #include "absl/strings/str_split.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/text_format.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/stream_executor_based_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/cpu/cpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/gpu/gpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_base.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/context/stream_executor_based_impl.h"
+#include "mlir/xla/ral/device/cpu/cpu_driver.h"
+#include "mlir/xla/ral/device/gpu/gpu_driver.h"
+#include "mlir/xla/ral/ral_base.h"
+#include "mlir/xla/ral/ral_helper.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/common_context_impl_mkldnn.cc b/tao_compiler/mlir/xla/ral/context/common_context_impl_mkldnn.cc
index 07503d2f04b..01d99682f27 100644
--- a/tao_compiler/mlir/xla/ral/context/common_context_impl_mkldnn.cc
+++ b/tao_compiler/mlir/xla/ral/context/common_context_impl_mkldnn.cc
@@ -21,8 +21,8 @@
 #include "arm_compute/runtime/Scheduler.h"
 #endif
 
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl_mkldnn.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/mkldnn/ideep/ideep_pin_singletons.hpp"
+#include "mlir/xla/ral/context/common_context_impl_mkldnn.h"
+#include "mlir/xla/ral/context/mkldnn/ideep/ideep_pin_singletons.hpp"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/common_context_impl_mkldnn.h b/tao_compiler/mlir/xla/ral/context/common_context_impl_mkldnn.h
index 3dd308abe26..5262f3c67f4 100644
--- a/tao_compiler/mlir/xla/ral/context/common_context_impl_mkldnn.h
+++ b/tao_compiler/mlir/xla/ral/context/common_context_impl_mkldnn.h
@@ -18,17 +18,17 @@
 #include <thread>
 
 #include "dnnl_threadpool_iface.hpp"
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/mkldnn/ideep/ideep.hpp"
-#include "tensorflow/compiler/mlir/xla/ral/device/cpu/cpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_base.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/context/mkldnn/ideep/ideep.hpp"
+#include "mlir/xla/ral/device/cpu/cpu_driver.h"
+#include "mlir/xla/ral/ral_base.h"
+#include "mlir/xla/ral/ral_helper.h"
 
 #if defined(TAO_AARCH64)
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/NEON/NEFunctions.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl_acl.h"
+#include "mlir/xla/ral/context/common_context_impl_acl.h"
 #endif
 
 namespace tao {
diff --git a/tao_compiler/mlir/xla/ral/context/common_context_impl_patine.cc b/tao_compiler/mlir/xla/ral/context/common_context_impl_patine.cc
index e5df68d6a87..5e0e0c66716 100644
--- a/tao_compiler/mlir/xla/ral/context/common_context_impl_patine.cc
+++ b/tao_compiler/mlir/xla/ral/context/common_context_impl_patine.cc
@@ -11,12 +11,12 @@
 
 #if defined(TAO_CPU_ONLY) && defined(TAO_ENABLE_PATINE)
 
+#include "mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/device/cpu/cpu_driver.h"
+#include "mlir/xla/ral/ral_base.h"
+#include "mlir/xla/ral/ral_helper.h"
 #include "patine/client/interface.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/cpu/cpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_base.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/common_context_impl_pdll.cc b/tao_compiler/mlir/xla/ral/context/common_context_impl_pdll.cc
index 698b964cc93..4eb47b93aed 100644
--- a/tao_compiler/mlir/xla/ral/context/common_context_impl_pdll.cc
+++ b/tao_compiler/mlir/xla/ral/context/common_context_impl_pdll.cc
@@ -9,14 +9,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/pdll_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/cpu/cpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_base.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/context/pdll_util.h"
+#include "mlir/xla/ral/device/cpu/cpu_driver.h"
+#include "mlir/xla/ral/ral_base.h"
+#include "mlir/xla/ral/ral_helper.h"
 
 #if defined(TAO_CPU_ONLY)
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl_quantization.h"
+#include "mlir/xla/ral/context/common_context_impl_quantization.h"
 #endif
 
 //===----------------------------------------------------------------------===//
diff --git a/tao_compiler/mlir/xla/ral/context/common_context_impl_quantization.cc b/tao_compiler/mlir/xla/ral/context/common_context_impl_quantization.cc
index 9f942d3f606..b8873fe1cc5 100644
--- a/tao_compiler/mlir/xla/ral/context/common_context_impl_quantization.cc
+++ b/tao_compiler/mlir/xla/ral/context/common_context_impl_quantization.cc
@@ -10,7 +10,7 @@
 // limitations under the License.
 
 #if defined(TAO_CPU_ONLY)
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl_quantization.h"
+#include "mlir/xla/ral/context/common_context_impl_quantization.h"
 
 // aarch64 related
 #if defined(TAO_AARCH64)
@@ -19,8 +19,8 @@
 
 // x86 related
 #if defined(TAO_X86)
-#include "tensorflow/compiler/mlir/xla/ral/context/mkldnn/ideep/ideep/abstract_types.hpp"
-#include "tensorflow/compiler/mlir/xla/ral/context/mkldnn/ideep/ideep/attributes.hpp"
+#include "mlir/xla/ral/context/mkldnn/ideep/ideep/abstract_types.hpp"
+#include "mlir/xla/ral/context/mkldnn/ideep/ideep/attributes.hpp"
 #endif
 
 namespace tao {
diff --git a/tao_compiler/mlir/xla/ral/context/common_context_impl_quantization.h b/tao_compiler/mlir/xla/ral/context/common_context_impl_quantization.h
index 7f65b53cc02..6ebbe8a9a62 100644
--- a/tao_compiler/mlir/xla/ral/context/common_context_impl_quantization.h
+++ b/tao_compiler/mlir/xla/ral/context/common_context_impl_quantization.h
@@ -17,9 +17,9 @@
 
 #include <thread>
 
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl_mkldnn.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/pdll_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/cpu/cpu_driver.h"
+#include "mlir/xla/ral/context/common_context_impl_mkldnn.h"
+#include "mlir/xla/ral/context/pdll_util.h"
+#include "mlir/xla/ral/device/cpu/cpu_driver.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/context_util.h b/tao_compiler/mlir/xla/ral/context/context_util.h
index 31caa3fb0df..e0986002153 100644
--- a/tao_compiler/mlir/xla/ral/context/context_util.h
+++ b/tao_compiler/mlir/xla/ral/context/context_util.h
@@ -14,8 +14,8 @@
 
 #include <algorithm>
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_logging.h"
+#include "mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_logging.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/cuda_impl_sparse.cc b/tao_compiler/mlir/xla/ral/context/cuda_impl_sparse.cc
index f1b52fcc351..54eb099dd61 100644
--- a/tao_compiler/mlir/xla/ral/context/cuda_impl_sparse.cc
+++ b/tao_compiler/mlir/xla/ral/context/cuda_impl_sparse.cc
@@ -15,10 +15,10 @@
 #include <sstream>
 #include <thread>
 
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/stream_executor_based_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/gpu/gpu_driver.h"
+#include "mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/context/stream_executor_based_impl.h"
+#include "mlir/xla/ral/device/gpu/gpu_driver.h"
 
 #if defined(PLATFORM_ALIBABA) and defined(ENABLE_BLADE_GEMM)
 #include "bladnn/bladnn.h"
diff --git a/tao_compiler/mlir/xla/ral/context/custom_library/dynamic_sort.cu.cc b/tao_compiler/mlir/xla/ral/context/custom_library/dynamic_sort.cu.cc
index b31108da031..65b93691414 100644
--- a/tao_compiler/mlir/xla/ral/context/custom_library/dynamic_sort.cu.cc
+++ b/tao_compiler/mlir/xla/ral/context/custom_library/dynamic_sort.cu.cc
@@ -9,8 +9,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/dynamic_sort.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/tf_topk.cu.h"
+#include "mlir/xla/ral/context/custom_library/dynamic_sort.h"
+#include "mlir/xla/ral/context/custom_library/tf_topk.cu.h"
 
 // tensorflow top-k impl
 template <typename T>
diff --git a/tao_compiler/mlir/xla/ral/context/custom_library/random.h b/tao_compiler/mlir/xla/ral/context/custom_library/random.h
index cd4605a7d33..1b4868feece 100644
--- a/tao_compiler/mlir/xla/ral/context/custom_library/random.h
+++ b/tao_compiler/mlir/xla/ral/context/custom_library/random.h
@@ -19,7 +19,7 @@
 #include <cstring>
 #include <type_traits>
 
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/philox_random.h"
+#include "mlir/xla/ral/context/custom_library/philox_random.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/custom_library/random_gpu.cu.cc b/tao_compiler/mlir/xla/ral/context/custom_library/random_gpu.cu.cc
index a0662ac96b4..02ba4ac1e76 100644
--- a/tao_compiler/mlir/xla/ral/context/custom_library/random_gpu.cu.cc
+++ b/tao_compiler/mlir/xla/ral/context/custom_library/random_gpu.cu.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/random.h"
+#include "mlir/xla/ral/context/custom_library/random.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/custom_library/tf_topk.cu.h b/tao_compiler/mlir/xla/ral/context/custom_library/tf_topk.cu.h
index f689b3fe4dc..fb9525e7f05 100644
--- a/tao_compiler/mlir/xla/ral/context/custom_library/tf_topk.cu.h
+++ b/tao_compiler/mlir/xla/ral/context/custom_library/tf_topk.cu.h
@@ -14,7 +14,7 @@
 
 #include "absl/base/casts.h"
 #include "absl/types/optional.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/gpu_helper.h"
+#include "mlir/xla/ral/context/custom_library/gpu_helper.h"
 
 #if GOOGLE_CUDA
 #include <cuda_runtime.h>
diff --git a/tao_compiler/mlir/xla/ral/context/custom_library/tf_transpose.cu.h b/tao_compiler/mlir/xla/ral/context/custom_library/tf_transpose.cu.h
index b472e939448..c7675b3d26b 100644
--- a/tao_compiler/mlir/xla/ral/context/custom_library/tf_transpose.cu.h
+++ b/tao_compiler/mlir/xla/ral/context/custom_library/tf_transpose.cu.h
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <vector>
 
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/dimensions.h"
+#include "mlir/xla/ral/context/custom_library/dimensions.h"
 
 #if GOOGLE_CUDA
 #include <cuda_runtime.h>
diff --git a/tao_compiler/mlir/xla/ral/context/custom_library/transpose_gpu.cu.cc b/tao_compiler/mlir/xla/ral/context/custom_library/transpose_gpu.cu.cc
index 5b2aecfe26a..cdfaeb6cb75 100644
--- a/tao_compiler/mlir/xla/ral/context/custom_library/transpose_gpu.cu.cc
+++ b/tao_compiler/mlir/xla/ral/context/custom_library/transpose_gpu.cu.cc
@@ -9,10 +9,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/gpu_helper.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/tf_transpose.cu.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/transpose.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/stream_executor_based_impl.h"
+#include "mlir/xla/ral/context/custom_library/gpu_helper.h"
+#include "mlir/xla/ral/context/custom_library/tf_transpose.cu.h"
+#include "mlir/xla/ral/context/custom_library/transpose.h"
+#include "mlir/xla/ral/context/stream_executor_based_impl.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/dynamic_sort_impl.cc b/tao_compiler/mlir/xla/ral/context/dynamic_sort_impl.cc
index e15420c611c..a4e59514f51 100644
--- a/tao_compiler/mlir/xla/ral/context/dynamic_sort_impl.cc
+++ b/tao_compiler/mlir/xla/ral/context/dynamic_sort_impl.cc
@@ -9,13 +9,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/xla/ral/context/dynamic_sort_impl.h"
+#include "mlir/xla/ral/context/dynamic_sort_impl.h"
 
 #include <vector>
 
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/dynamic_sort.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/gpu/gpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_driver.h"
+#include "mlir/xla/ral/context/custom_library/dynamic_sort.h"
+#include "mlir/xla/ral/device/gpu/gpu_driver.h"
+#include "mlir/xla/ral/ral_driver.h"
 
 using tao::ral::buffer_t;
 using tao::ral::Context;
diff --git a/tao_compiler/mlir/xla/ral/context/dynamic_sort_impl.h b/tao_compiler/mlir/xla/ral/context/dynamic_sort_impl.h
index 64e6d6498eb..3feac9860ad 100644
--- a/tao_compiler/mlir/xla/ral/context/dynamic_sort_impl.h
+++ b/tao_compiler/mlir/xla/ral/context/dynamic_sort_impl.h
@@ -12,8 +12,8 @@
 #ifndef TENSORFLOW_COMPILER_MLIR_XLA_RAL_CUSTOM_LIB_CALL_DYNAMIC_SORT_IMPL_H_
 #define TENSORFLOW_COMPILER_MLIR_XLA_RAL_CUSTOM_LIB_CALL_DYNAMIC_SORT_IMPL_H_
 
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/ral_helper.h"
 
 namespace {
 
diff --git a/tao_compiler/mlir/xla/ral/context/init_stream_executor.cc b/tao_compiler/mlir/xla/ral/context/init_stream_executor.cc
index 3eaa6455394..22d3173da0e 100644
--- a/tao_compiler/mlir/xla/ral/context/init_stream_executor.cc
+++ b/tao_compiler/mlir/xla/ral/context/init_stream_executor.cc
@@ -9,9 +9,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/xla/ral/context/init_stream_executor.h"
+#include "mlir/xla/ral/context/init_stream_executor.h"
 
-#include "tensorflow/compiler/mlir/xla/ral/context/base/cuda/cuda_stream.h"
+#include "mlir/xla/ral/context/base/cuda/cuda_stream.h"
 #include "tensorflow/compiler/xla/stream_executor/gpu/gpu_executor.h"
 #include "tensorflow/compiler/xla/stream_executor/stream.h"
 #include "tensorflow/core/util/env_var.h"
diff --git a/tao_compiler/mlir/xla/ral/context/init_stream_executor.h b/tao_compiler/mlir/xla/ral/context/init_stream_executor.h
index a4f3b6876b9..93f9ebe0bfe 100644
--- a/tao_compiler/mlir/xla/ral/context/init_stream_executor.h
+++ b/tao_compiler/mlir/xla/ral/context/init_stream_executor.h
@@ -12,7 +12,7 @@
 #ifndef RAL_CONTEXT_INIT_STREAM_EXECUTOR_H_
 #define RAL_CONTEXT_INIT_STREAM_EXECUTOR_H_
 
-#include "tensorflow/compiler/mlir/xla/ral/context/stream_executor_based_impl.h"
+#include "mlir/xla/ral/context/stream_executor_based_impl.h"
 #include "tensorflow/compiler/xla/stream_executor/gpu/gpu_types.h"
 #include "tensorflow/compiler/xla/stream_executor/stream.h"
 
diff --git a/tao_compiler/mlir/xla/ral/context/pdll_util.cc b/tao_compiler/mlir/xla/ral/context/pdll_util.cc
index 2822c265626..004080aafcf 100644
--- a/tao_compiler/mlir/xla/ral/context/pdll_util.cc
+++ b/tao_compiler/mlir/xla/ral/context/pdll_util.cc
@@ -9,9 +9,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/xla/ral/context/pdll_util.h"
+#include "mlir/xla/ral/context/pdll_util.h"
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_logging.h"
+#include "mlir/xla/ral/ral_logging.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/pdll_util.h b/tao_compiler/mlir/xla/ral/context/pdll_util.h
index e93ecdee22c..f6e060261dc 100644
--- a/tao_compiler/mlir/xla/ral/context/pdll_util.h
+++ b/tao_compiler/mlir/xla/ral/context/pdll_util.h
@@ -19,7 +19,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_context.h"
+#include "mlir/xla/ral/ral_context.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/context/quantized_gpu_kernel_impl.cc b/tao_compiler/mlir/xla/ral/context/quantized_gpu_kernel_impl.cc
index ab851440b91..6477fbf6f05 100644
--- a/tao_compiler/mlir/xla/ral/context/quantized_gpu_kernel_impl.cc
+++ b/tao_compiler/mlir/xla/ral/context/quantized_gpu_kernel_impl.cc
@@ -17,10 +17,10 @@
 #include <iostream>
 
 #include "absl/types/optional.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/stream_executor_based_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/gpu/gpu_driver.h"
+#include "mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/context/stream_executor_based_impl.h"
+#include "mlir/xla/ral/device/gpu/gpu_driver.h"
 
 #if defined(PLATFORM_ALIBABA) and defined(ENABLE_BLADE_GEMM)
 #include "bladnn/bladnn.h"
diff --git a/tao_compiler/mlir/xla/ral/context/random_impl.cc b/tao_compiler/mlir/xla/ral/context/random_impl.cc
index 97144ee73cb..182b043aa21 100644
--- a/tao_compiler/mlir/xla/ral/context/random_impl.cc
+++ b/tao_compiler/mlir/xla/ral/context/random_impl.cc
@@ -15,13 +15,13 @@
 #include <unordered_map>
 #include <vector>
 
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/random.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/gpu/gpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_context.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_logging.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/context/custom_library/random.h"
+#include "mlir/xla/ral/device/gpu/gpu_driver.h"
+#include "mlir/xla/ral/ral_context.h"
+#include "mlir/xla/ral/ral_driver.h"
+#include "mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_logging.h"
 
 using tao::ral::buffer_t;
 using tao::ral::Context;
diff --git a/tao_compiler/mlir/xla/ral/context/stream_executor_based_impl.cc b/tao_compiler/mlir/xla/ral/context/stream_executor_based_impl.cc
index 17dd59538cd..f9cb5c04ce4 100644
--- a/tao_compiler/mlir/xla/ral/context/stream_executor_based_impl.cc
+++ b/tao_compiler/mlir/xla/ral/context/stream_executor_based_impl.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/xla/ral/context/stream_executor_based_impl.h"
+#include "mlir/xla/ral/context/stream_executor_based_impl.h"
 
 #include <dlfcn.h>
 
@@ -17,13 +17,13 @@
 #include <iostream>
 
 #include "absl/types/optional.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/pdll_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/gpu/gpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_base.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_logging.h"
+#include "mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/context/pdll_util.h"
+#include "mlir/xla/ral/device/gpu/gpu_driver.h"
+#include "mlir/xla/ral/ral_base.h"
+#include "mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_logging.h"
 #include "tensorflow/core/public/version.h"
 #include "tensorflow/core/util/env_var.h"
 
diff --git a/tao_compiler/mlir/xla/ral/context/stream_executor_based_impl.h b/tao_compiler/mlir/xla/ral/context/stream_executor_based_impl.h
index 4b4bf0be8ed..367b2566375 100644
--- a/tao_compiler/mlir/xla/ral/context/stream_executor_based_impl.h
+++ b/tao_compiler/mlir/xla/ral/context/stream_executor_based_impl.h
@@ -12,7 +12,7 @@
 #ifndef TENSORFLOW_COMPILER_MLIR_XLA_RAL_CONTEXT_STREAM_EXECUTOR_BASED_IMPL_H_
 #define TENSORFLOW_COMPILER_MLIR_XLA_RAL_CONTEXT_STREAM_EXECUTOR_BASED_IMPL_H_
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_helper.h"
 
 #ifdef TAO_RAL_USE_STREAM_EXECUTOR
 
diff --git a/tao_compiler/mlir/xla/ral/context/tensorflow/tf_context_impl.cc b/tao_compiler/mlir/xla/ral/context/tensorflow/tf_context_impl.cc
index 17b5e80efd7..9638a7a0290 100644
--- a/tao_compiler/mlir/xla/ral/context/tensorflow/tf_context_impl.cc
+++ b/tao_compiler/mlir/xla/ral/context/tensorflow/tf_context_impl.cc
@@ -15,7 +15,7 @@
 // limitations under the License.
 // ============================================================================
 
-#include "tensorflow/compiler/mlir/xla/ral/context/tensorflow/tf_context_impl.h"
+#include "mlir/xla/ral/context/tensorflow/tf_context_impl.h"
 
 #include <array>
 #include <cstdlib>
@@ -23,10 +23,10 @@
 #include <string>
 #include <unordered_map>
 
-#include "tensorflow/compiler/mlir/xla/ral/context/common_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/context/common_context_impl.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/ral_driver.h"
+#include "mlir/xla/ral/ral_helper.h"
 #include "tensorflow/core/public/version.h"
 #include "tensorflow/stream_executor/device_description.h"
 
diff --git a/tao_compiler/mlir/xla/ral/context/tensorflow/tf_context_impl.h b/tao_compiler/mlir/xla/ral/context/tensorflow/tf_context_impl.h
index fe1f68ffc63..0d386ecbbcc 100644
--- a/tao_compiler/mlir/xla/ral/context/tensorflow/tf_context_impl.h
+++ b/tao_compiler/mlir/xla/ral/context/tensorflow/tf_context_impl.h
@@ -20,9 +20,9 @@
 
 #include <mutex>
 
-#include "tensorflow/compiler/mlir/xla/ral/device/cpu/cpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/gpu/gpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_context.h"
+#include "mlir/xla/ral/device/cpu/cpu_driver.h"
+#include "mlir/xla/ral/device/gpu/gpu_driver.h"
+#include "mlir/xla/ral/ral_context.h"
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/stream_executor/kernel_spec.h"
diff --git a/tao_compiler/mlir/xla/ral/context/tensorflow/tf_kernel_impl.cc b/tao_compiler/mlir/xla/ral/context/tensorflow/tf_kernel_impl.cc
index 4bc50831394..83a9bedf4ab 100644
--- a/tao_compiler/mlir/xla/ral/context/tensorflow/tf_kernel_impl.cc
+++ b/tao_compiler/mlir/xla/ral/context/tensorflow/tf_kernel_impl.cc
@@ -20,10 +20,10 @@
 #include <unordered_map>
 
 #include "absl/types/optional.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/tensorflow/tf_context_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/cpu/cpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/gpu/gpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/context/tensorflow/tf_context_impl.h"
+#include "mlir/xla/ral/device/cpu/cpu_driver.h"
+#include "mlir/xla/ral/device/gpu/gpu_driver.h"
+#include "mlir/xla/ral/ral_driver.h"
+#include "mlir/xla/ral/ral_helper.h"
 
 // Placeholder for tf-context-specific custom call impl.
diff --git a/tao_compiler/mlir/xla/ral/context/transpose_impl.cc b/tao_compiler/mlir/xla/ral/context/transpose_impl.cc
index 5eacce1ff02..4699e79869b 100644
--- a/tao_compiler/mlir/xla/ral/context/transpose_impl.cc
+++ b/tao_compiler/mlir/xla/ral/context/transpose_impl.cc
@@ -13,14 +13,14 @@
 #include <cuda_runtime.h>
 #endif
 
-#include "tensorflow/compiler/mlir/xla/ral/context/context_util.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/transpose.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/stream_executor_based_impl.h"
-#include "tensorflow/compiler/mlir/xla/ral/device/gpu/gpu_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_context.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_logging.h"
+#include "mlir/xla/ral/context/context_util.h"
+#include "mlir/xla/ral/context/custom_library/transpose.h"
+#include "mlir/xla/ral/context/stream_executor_based_impl.h"
+#include "mlir/xla/ral/device/gpu/gpu_driver.h"
+#include "mlir/xla/ral/ral_context.h"
+#include "mlir/xla/ral/ral_driver.h"
+#include "mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_logging.h"
 
 using tao::ral::buffer_t;
 using tao::ral::Context;
diff --git a/tao_compiler/mlir/xla/ral/device/cpu/cpu_driver.cc b/tao_compiler/mlir/xla/ral/device/cpu/cpu_driver.cc
index 6cac9f075d5..b92d4c6cb20 100644
--- a/tao_compiler/mlir/xla/ral/device/cpu/cpu_driver.cc
+++ b/tao_compiler/mlir/xla/ral/device/cpu/cpu_driver.cc
@@ -15,12 +15,12 @@
 // limitations under the License.
 // ===========================================================================
 
-#include "tensorflow/compiler/mlir/xla/ral/device/cpu/cpu_driver.h"
+#include "mlir/xla/ral/device/cpu/cpu_driver.h"
 
 #include <functional>
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_context.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_context.h"
+#include "mlir/xla/ral/ral_helper.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/device/cpu/cpu_driver.h b/tao_compiler/mlir/xla/ral/device/cpu/cpu_driver.h
index fb4a55327be..47074427006 100644
--- a/tao_compiler/mlir/xla/ral/device/cpu/cpu_driver.h
+++ b/tao_compiler/mlir/xla/ral/device/cpu/cpu_driver.h
@@ -21,8 +21,8 @@
 #include <memory>
 #include <string>
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_driver.h"
+#include "mlir/xla/ral/ral_helper.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/device/gpu/gpu_driver.cc b/tao_compiler/mlir/xla/ral/device/gpu/gpu_driver.cc
index 4805b601909..3e6b0366042 100644
--- a/tao_compiler/mlir/xla/ral/device/gpu/gpu_driver.cc
+++ b/tao_compiler/mlir/xla/ral/device/gpu/gpu_driver.cc
@@ -15,12 +15,12 @@
 // limitations under the License.
 // =============================================================================
 
-#include "tensorflow/compiler/mlir/xla/ral/device/gpu/gpu_driver.h"
+#include "mlir/xla/ral/device/gpu/gpu_driver.h"
 
 #include <functional>
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_context.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_context.h"
+#include "mlir/xla/ral/ral_helper.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/device/gpu/gpu_driver.h b/tao_compiler/mlir/xla/ral/device/gpu/gpu_driver.h
index 5d670b021f1..e96faa90251 100644
--- a/tao_compiler/mlir/xla/ral/device/gpu/gpu_driver.h
+++ b/tao_compiler/mlir/xla/ral/device/gpu/gpu_driver.h
@@ -21,7 +21,7 @@
 #include <memory>
 #include <string>
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_driver.h"
+#include "mlir/xla/ral/ral_driver.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/ral_api.cc b/tao_compiler/mlir/xla/ral/ral_api.cc
index 816744f27e0..781f66b9d80 100644
--- a/tao_compiler/mlir/xla/ral/ral_api.cc
+++ b/tao_compiler/mlir/xla/ral/ral_api.cc
@@ -15,12 +15,12 @@
 // limitations under the License.
 // =============================================================================
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_api.h"
+#include "mlir/xla/ral/ral_api.h"
 
 #include <iostream>
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_context.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_logging.h"
+#include "mlir/xla/ral/ral_context.h"
+#include "mlir/xla/ral/ral_logging.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/tao_compiler/mlir/xla/ral/ral_context.cc b/tao_compiler/mlir/xla/ral/ral_context.cc
index 3944f16d7a0..eb49eb3d73e 100644
--- a/tao_compiler/mlir/xla/ral/ral_context.cc
+++ b/tao_compiler/mlir/xla/ral/ral_context.cc
@@ -15,16 +15,16 @@
 // limitations under the License.
 // =============================================================================
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_context.h"
+#include "mlir/xla/ral/ral_context.h"
 
 #include <array>
 #include <atomic>
 #include <iostream>
 #include <thread>
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_driver.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
-#include "tensorflow/compiler/mlir/xla/ral/ral_logging.h"
+#include "mlir/xla/ral/ral_driver.h"
+#include "mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_logging.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/ral_context.h b/tao_compiler/mlir/xla/ral/ral_context.h
index 8562943106b..e749345018e 100644
--- a/tao_compiler/mlir/xla/ral/ral_context.h
+++ b/tao_compiler/mlir/xla/ral/ral_context.h
@@ -27,7 +27,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_base.h"
+#include "mlir/xla/ral/ral_base.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/ral_driver.h b/tao_compiler/mlir/xla/ral/ral_driver.h
index 5509f3a509f..81f8e382b7d 100644
--- a/tao_compiler/mlir/xla/ral/ral_driver.h
+++ b/tao_compiler/mlir/xla/ral/ral_driver.h
@@ -18,7 +18,7 @@
 #ifndef RAL_RAL_DRIVER_H_
 #define RAL_RAL_DRIVER_H_
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_base.h"
+#include "mlir/xla/ral/ral_base.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/ral_helper.cc b/tao_compiler/mlir/xla/ral/ral_helper.cc
index 6809d2e675c..1b374786697 100644
--- a/tao_compiler/mlir/xla/ral/ral_helper.cc
+++ b/tao_compiler/mlir/xla/ral/ral_helper.cc
@@ -15,13 +15,13 @@
 // limitations under the License.
 // =============================================================================
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_helper.h"
+#include "mlir/xla/ral/ral_helper.h"
 
 #include <iostream>
 #include <mutex>
 #include <unordered_map>
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_logging.h"
+#include "mlir/xla/ral/ral_logging.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/ral_helper.h b/tao_compiler/mlir/xla/ral/ral_helper.h
index 51840e08102..3bdf84caea0 100644
--- a/tao_compiler/mlir/xla/ral/ral_helper.h
+++ b/tao_compiler/mlir/xla/ral/ral_helper.h
@@ -26,7 +26,7 @@
 #include <string>
 #include <vector>
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_base.h"
+#include "mlir/xla/ral/ral_base.h"
 
 namespace tao {
 namespace ral {
diff --git a/tao_compiler/mlir/xla/ral/ral_logging.cc b/tao_compiler/mlir/xla/ral/ral_logging.cc
index 69f1dff3110..5ac1b0d64d0 100644
--- a/tao_compiler/mlir/xla/ral/ral_logging.cc
+++ b/tao_compiler/mlir/xla/ral/ral_logging.cc
@@ -15,7 +15,7 @@
 // limitations under the License.
 // =============================================================================
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_logging.h"
+#include "mlir/xla/ral/ral_logging.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/tao_compiler/mlir/xla/ral/ral_md5.cc b/tao_compiler/mlir/xla/ral/ral_md5.cc
index 462212e8b66..2b4b7abeab2 100644
--- a/tao_compiler/mlir/xla/ral/ral_md5.cc
+++ b/tao_compiler/mlir/xla/ral/ral_md5.cc
@@ -47,7 +47,7 @@ documentation and/or software.
 
 /* interface header */
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_md5.h"
+#include "mlir/xla/ral/ral_md5.h"
 
 /* system implementation headers */
 #include <cstdio>
diff --git a/tao_compiler/mlir/xla/ral/ral_metadata.cc b/tao_compiler/mlir/xla/ral/ral_metadata.cc
index 10e0ba9e90f..f08fe64a339 100644
--- a/tao_compiler/mlir/xla/ral/ral_metadata.cc
+++ b/tao_compiler/mlir/xla/ral/ral_metadata.cc
@@ -15,7 +15,7 @@
 // limitations under the License.
 // =============================================================================
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_metadata.h"
+#include "mlir/xla/ral/ral_metadata.h"
 
 #include <unordered_map>
 
diff --git a/tao_compiler/tensorflow/compiler/mlir b/tao_compiler/tensorflow/compiler/mlir
deleted file mode 120000
index 3b16bb6ccc9..00000000000
--- a/tao_compiler/tensorflow/compiler/mlir
+++ /dev/null
@@ -1,1 +0,0 @@
-../../mlir/
\ No newline at end of file
diff --git a/tf_community b/tf_community
index f9ebf7a3dc4..c397df44e9c 160000
--- a/tf_community
+++ b/tf_community
@@ -1,1 +1,1 @@
-Subproject commit f9ebf7a3dc43b8e03bb13906b28ffaf11b52da83
+Subproject commit c397df44e9c21c1f3ac2f98cef91ca6d097289a3


Test patch:
diff --git a/pytorch_blade/tests/torch-disc-pdll/BUILD b/pytorch_blade/tests/torch-disc-pdll/BUILD
index 263d7720c55..c97799c752b 100644
--- a/pytorch_blade/tests/torch-disc-pdll/BUILD
+++ b/pytorch_blade/tests/torch-disc-pdll/BUILD
@@ -14,7 +14,7 @@ cc_library(
         "@mlir-hlo//:mlir_hlo",
         "@llvm-project//mlir:IR",
         "@llvm-project//llvm:Support",
-        "@org_tensorflow//tensorflow/compiler/mlir/disc:disc_pdl_utils",
+        "@org_disc_compiler//mlir/disc:disc_pdl_utils",
         "@torch-mlir//:TorchMLIRTorchDialect",
     ]
 )
diff --git a/pytorch_blade/tests/torch-disc-pdll/torch-disc-pdll.cpp b/pytorch_blade/tests/torch-disc-pdll/torch-disc-pdll.cpp
index a9683f3f0c7..0c2cebe578a 100644
--- a/pytorch_blade/tests/torch-disc-pdll/torch-disc-pdll.cpp
+++ b/pytorch_blade/tests/torch-disc-pdll/torch-disc-pdll.cpp
@@ -19,7 +19,7 @@
 #include "mlir/Parser/Parser.h"
 #include "mlir/Support/FileUtilities.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
+#include "mlir/disc/IR/hlo_disc_ops.h"
 #include "torch-mlir/InitAll.h"
 
 #include <string>
diff --git a/pytorch_blade/tests/torch-disc-pdll/utils.h b/pytorch_blade/tests/torch-disc-pdll/utils.h
index 0ad698619e4..9dc55031e71 100644
--- a/pytorch_blade/tests/torch-disc-pdll/utils.h
+++ b/pytorch_blade/tests/torch-disc-pdll/utils.h
@@ -12,7 +12,7 @@
 #ifndef TORCH_DISC_PDLL_UTILS_H_
 #define TORCH_DISC_PDLL_UTILS_H_
 
-#include "tensorflow/compiler/mlir/disc/transforms/disc_pdl_utils.h"
+#include "mlir/disc/transforms/disc_pdl_utils.h"
 
 namespace mlir {
 class PDLPatternModule;
diff --git a/scripts/ci/build_and_test.sh b/scripts/ci/build_and_test.sh
index dcb5e9a79cf..da579f58415 100644
--- a/scripts/ci/build_and_test.sh
+++ b/scripts/ci/build_and_test.sh
@@ -42,7 +42,7 @@ fi
 
 # copy libtao_ops.so and tao_compiler_main to blade-disc-tf
 cp tao/bazel-bin/libtao_ops.so ${BLADE_DISC_DIR}
-cp tf_community/bazel-bin/tensorflow/compiler/decoupling/tao_compiler_main ${BLADE_DISC_DIR}
+cp tao_compiler/bazel-bin/decoupling/tao_compiler_main ${BLADE_DISC_DIR}
 
 if [[ -n "$ROCM" ]] || [[ -n "$DCU" ]]; then
   # TODO: skip the following stages if rocm build
@@ -56,7 +56,7 @@ fi
 # copy Python wheel package to build folder
 mkdir -p build && \
 cp tao/dist/blade_disc*.whl ./build
-cp tf_community/bazel-bin/tensorflow/compiler/mlir/disc/tools/disc-replay/disc-replay-main ./build/
+#cp tao_compiler/bazel-bin/mlir/disc/tools/disc-replay/disc-replay-main ./build/
 
 # test example models
 if [[ -z "$ROCM" ]] && [[ -z "$DCU" ]]; then
diff --git a/tao/tao_bridge/test/tao_ut_common.py b/tao/tao_bridge/test/tao_ut_common.py
index 1cc8bbc8cc8..52e3ac5460c 100644
--- a/tao/tao_bridge/test/tao_ut_common.py
+++ b/tao/tao_bridge/test/tao_ut_common.py
@@ -36,9 +36,8 @@ def _locate_tao_compiler():
         """
         if 'TAO_COMPILER_PATH' not in os.environ:
             file_dir = os.path.abspath(os.path.dirname(__file__))
-            compiler = os.path.join(file_dir, os.pardir, os.pardir, os.pardir, "tf_community",
-                                    "bazel-bin", "tensorflow", "compiler", "decoupling",
-                                    "tao_compiler_main")
+            compiler = os.path.join(file_dir, os.pardir, os.pardir, os.pardir, "tao_compiler",
+                                    "bazel-bin", "decoupling", "tao_compiler_main")
             compiler = os.path.abspath(compiler)
             assert os.path.exists(compiler), \
                 "Tao compiler not found at: " + compiler
diff --git a/tao_compiler/decoupling/tao_compiler_trace_test.cc b/tao_compiler/decoupling/tao_compiler_trace_test.cc
index 2712d3749b5..0c04f2a54a1 100644
--- a/tao_compiler/decoupling/tao_compiler_trace_test.cc
+++ b/tao_compiler/decoupling/tao_compiler_trace_test.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/decoupling/tao_compiler_trace.h"
+#include "decoupling/tao_compiler_trace.h"
 
 #include <fstream>
 
diff --git a/tao_compiler/mlir/disc/IR/tests/BUILD b/tao_compiler/mlir/disc/IR/tests/BUILD
index f631e28b320..b5b8d9b6119 100644
--- a/tao_compiler/mlir/disc/IR/tests/BUILD
+++ b/tao_compiler/mlir/disc/IR/tests/BUILD
@@ -1,5 +1,5 @@
-load("//tensorflow:tensorflow.bzl", "filegroup")
-load("//tensorflow/compiler/mlir/disc:glob_lit_test.bzl", "glob_lit_tests")
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "filegroup")
+load("//mlir/disc:glob_lit_test.bzl", "glob_lit_tests")
 
 package(licenses = ["notice"])
 
@@ -14,7 +14,7 @@ filegroup(
     name = "test_utilities",
     testonly = True,
     data = [
-        "//tensorflow/compiler/mlir/disc:disc-opt",
+        "//mlir/disc:disc-opt",
         "@llvm-project//llvm:FileCheck",
     ],
 )
\ No newline at end of file
diff --git a/tao_compiler/mlir/disc/glob_lit_test.bzl b/tao_compiler/mlir/disc/glob_lit_test.bzl
index 7600ecac460..dc206ffa0d0 100644
--- a/tao_compiler/mlir/disc/glob_lit_test.bzl
+++ b/tao_compiler/mlir/disc/glob_lit_test.bzl
@@ -55,17 +55,16 @@ def _run_lit_test(name, data, size, tags, driver, features, exec_properties):
     if name.startswith('cpu-only'):
         # Since tf's test_tag_filters will filt `no_gpu` for gpu config
         tags.append('no_gpu')
-
     # Disable tests on windows for now, to enable testing rest of all xla and mlir.
     native.py_test(
         name = name,
         srcs = ["@llvm-project//llvm:lit"],
         tags = tags + ["no_pip", "no_windows"],
         args = [
-            "tensorflow/compiler/mlir/disc/" + paths.basename(data[-1]) + " --config-prefix=runlit -v",
+            "mlir/disc/" + paths.basename(data[-1]) + " --config-prefix=runlit -v",
         ] + features,
         data = data + [
-            "//tensorflow/compiler/mlir/disc:litfiles",
+            "//mlir/disc:litfiles",
             "@llvm-project//llvm:FileCheck",
             "@llvm-project//llvm:count",
             "@llvm-project//llvm:not",
diff --git a/tao_compiler/mlir/disc/tests/BUILD b/tao_compiler/mlir/disc/tests/BUILD
index 059ee23a65f..d1c4fb95218 100644
--- a/tao_compiler/mlir/disc/tests/BUILD
+++ b/tao_compiler/mlir/disc/tests/BUILD
@@ -1,12 +1,12 @@
-load("//tensorflow:tensorflow.bzl", "tf_cc_test", "tf_native_cc_binary",  "tf_copts")
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "tf_cc_test", "tf_native_cc_binary",  "tf_copts")
 load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda_is_configured",)
 load("@local_config_rocm//rocm:build_defs.bzl", "if_rocm_is_configured",)
-load("//tensorflow/core/platform:build_config.bzl", "tf_proto_library",)
-load("//tensorflow/core/platform:build_config_root.bzl", "if_static")
-load("//tensorflow/compiler/mlir/util:util.bzl", "disc_cc_library")
+load("@org_tensorflow//tensorflow/core/platform:build_config.bzl", "tf_proto_library",)
+load("@org_tensorflow//tensorflow/core/platform:build_config_root.bzl", "if_static")
+load("//mlir/util:util.bzl", "disc_cc_library")
 
 # buildifier: disable=same-origin-load
-load("//tensorflow:tensorflow.bzl", "get_compatible_with_cloud")
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "get_compatible_with_cloud")
 load("@llvm-project//mlir:tblgen.bzl", "gentbl_cc_library", "gentbl_filegroup", "td_library")
 
 load(
@@ -14,6 +14,7 @@ load(
     "cc_proto_library",
 )
 
+
 package(
     default_visibility = [":friends"],
     licenses = ["notice"],  # Apache 2.0
@@ -27,10 +28,7 @@ package_group(
         "//learning/brain/experimental/swift_mlir/...",
         "//learning/brain/google/xla/kernels/...",
         "//learning/brain/swift/swift_mlir/...",
-        "//tensorflow/compiler/mlir/...",
-        "//tensorflow/compiler/tf2xla/...",
-        "//tensorflow/compiler/xla/...",
-        "//tensorflow/compiler/...",
+        "//mlir/...",
         "//third_party/iree/...",
         "//third_party/mlir_edge/...",
         "//third_party/tf_runtime/tools/tf_kernel_gen/...",
@@ -42,12 +40,12 @@ disc_cc_library(
     srcs = ["mlir_test.cc"],
     hdrs = ["mlir_test.h"],
     deps = [
-        "//tensorflow/core:lib",
-        "//tensorflow/core:framework",
-        "//tensorflow/core:tensorflow",
+        "@org_tensorflow//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:framework",
+        "@org_tensorflow//tensorflow/core:tensorflow",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
-        "//tensorflow/compiler/mlir/xla/ral:ral_base_context_lib",
+        "//mlir/xla/ral:ral_base_context_lib",
     ] + if_cuda_is_configured([
         "@local_config_cuda//cuda:cuda_headers",
         "@local_config_cuda//cuda:cuda_driver",
@@ -66,7 +64,7 @@ disc_cc_library(
     hdrs = ["mlir_feature_test.h"],
     deps = [
         ":mlir_test",
-        "//tensorflow/core:test_main",
+        "@org_tensorflow//tensorflow/core:test_main",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
     ],
diff --git a/tao_compiler/mlir/disc/tests/disc-transform/BUILD b/tao_compiler/mlir/disc/tests/disc-transform/BUILD
index c06d07c0a81..42e9e351b86 100644
--- a/tao_compiler/mlir/disc/tests/disc-transform/BUILD
+++ b/tao_compiler/mlir/disc/tests/disc-transform/BUILD
@@ -1,4 +1,4 @@
-load("//tensorflow/compiler/mlir/disc/tests:glob_op_test.bzl", "glob_op_tests")
+load("//mlir/disc/tests:glob_op_test.bzl", "glob_op_tests")
 
 glob_op_tests(
     data = [],
diff --git a/tao_compiler/mlir/disc/tests/disc-transform/default_schedule_matmul.cc b/tao_compiler/mlir/disc/tests/disc-transform/default_schedule_matmul.cc
index a99a9be1e84..5dd29d0b935 100644
--- a/tao_compiler/mlir/disc/tests/disc-transform/default_schedule_matmul.cc
+++ b/tao_compiler/mlir/disc/tests/disc-transform/default_schedule_matmul.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/disc-transform/data/";
+const std::string c_ft_path = "mlir/disc/tests/disc-transform/data/";
 
 static bool init_threads = []() {
   setenv("OMP_NUM_THREADS", "1", 1);
diff --git a/tao_compiler/mlir/disc/tests/disc-transform/matmul.cc b/tao_compiler/mlir/disc/tests/disc-transform/matmul.cc
index 96d76716cc0..766380c5a24 100644
--- a/tao_compiler/mlir/disc/tests/disc-transform/matmul.cc
+++ b/tao_compiler/mlir/disc/tests/disc-transform/matmul.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/disc-transform/data/";
+const std::string c_ft_path = "mlir/disc/tests/disc-transform/data/";
 
 static bool init_threads = []() {
   setenv("OMP_NUM_THREADS", "1", 1);
diff --git a/tao_compiler/mlir/disc/tests/disc-transform/matmul_multithread.cc b/tao_compiler/mlir/disc/tests/disc-transform/matmul_multithread.cc
index b6a4ad9d148..02882f4e3d3 100644
--- a/tao_compiler/mlir/disc/tests/disc-transform/matmul_multithread.cc
+++ b/tao_compiler/mlir/disc/tests/disc-transform/matmul_multithread.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/disc-transform/data/";
+const std::string c_ft_path = "mlir/disc/tests/disc-transform/data/";
 
 static bool init_threads = []() {
   setenv("OMP_NUM_THREADS", "8", 1);
diff --git a/tao_compiler/mlir/disc/tests/disc-transform/packed_matmul.cc b/tao_compiler/mlir/disc/tests/disc-transform/packed_matmul.cc
index 0ff26ad5615..71e4b543571 100644
--- a/tao_compiler/mlir/disc/tests/disc-transform/packed_matmul.cc
+++ b/tao_compiler/mlir/disc/tests/disc-transform/packed_matmul.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/disc-transform/data/";
+const std::string c_ft_path = "mlir/disc/tests/disc-transform/data/";
 
 static bool init_threads = []() {
   setenv("OMP_NUM_THREADS", "1", 1);
diff --git a/tao_compiler/mlir/disc/tests/disc-transform/use_inlined_code.cc b/tao_compiler/mlir/disc/tests/disc-transform/use_inlined_code.cc
index 631375a39cd..f87eba28dce 100644
--- a/tao_compiler/mlir/disc/tests/disc-transform/use_inlined_code.cc
+++ b/tao_compiler/mlir/disc/tests/disc-transform/use_inlined_code.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/disc-transform/data/";
+const std::string c_ft_path = "mlir/disc/tests/disc-transform/data/";
 
 static bool init_threads = []() {
   setenv("OMP_NUM_THREADS", "1", 1);
diff --git a/tao_compiler/mlir/disc/tests/glob_op_test.bzl b/tao_compiler/mlir/disc/tests/glob_op_test.bzl
index ff9dd7d36dd..139cceb9fa3 100644
--- a/tao_compiler/mlir/disc/tests/glob_op_test.bzl
+++ b/tao_compiler/mlir/disc/tests/glob_op_test.bzl
@@ -6,9 +6,9 @@
 """Lit runner globbing test
 """
 
-load("//tensorflow:tensorflow.bzl", "filegroup")
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "filegroup")
 load("@bazel_skylib//lib:paths.bzl", "paths")
-load("//tensorflow:tensorflow.bzl", "tf_cc_test", "tf_native_cc_binary",  "tf_copts")
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "tf_cc_test", "tf_native_cc_binary",  "tf_copts")
 
 # Default values used by the test runner.
 _default_test_file_exts = ["mlir", ".pbtxt", ".td"]
@@ -62,15 +62,15 @@ def _run_lit_test(name, test_file, data, size, tags, driver, features, exec_prop
 	srcs = test_file,
 	size = size,
 	deps = [
-		"//tensorflow/compiler/mlir/disc/tests:mlir_feature_test",
-		"//tensorflow/core:test",
-		"//tensorflow/core:test_main",
-		"//tensorflow/core:testlib",
+		"//mlir/disc/tests:mlir_feature_test",
+		"@org_tensorflow//tensorflow/core:test",
+		"@org_tensorflow//tensorflow/core:test_main",
+		"@org_tensorflow//tensorflow/core:testlib",
 	],
 	data = [":" + local_test_files] + data  + [
-		"//tensorflow/compiler/mlir/disc:disc_compiler_main",
-		"//tensorflow/compiler/mlir:tf-mlir-translate",
-		"//tensorflow/compiler/mlir:tf-opt",
+		"//mlir/disc:disc_compiler_main",
+		"@org_tensorflow//tensorflow/compiler/mlir:tf-mlir-translate",
+		"@org_tensorflow//tensorflow/compiler/mlir:tf-opt",
 	],
     )
 
diff --git a/tao_compiler/mlir/disc/tests/mlir_feature_test.cc b/tao_compiler/mlir/disc/tests/mlir_feature_test.cc
index c6e0efa342a..259b49379f6 100644
--- a/tao_compiler/mlir/disc/tests/mlir_feature_test.cc
+++ b/tao_compiler/mlir/disc/tests/mlir_feature_test.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
 
 #include <stdio.h>
 
diff --git a/tao_compiler/mlir/disc/tests/mlir_feature_test.h b/tao_compiler/mlir/disc/tests/mlir_feature_test.h
index 20472ccdac5..b711294fa6d 100644
--- a/tao_compiler/mlir/disc/tests/mlir_feature_test.h
+++ b/tao_compiler/mlir/disc/tests/mlir_feature_test.h
@@ -13,7 +13,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 
 namespace mlir_test {
 
diff --git a/tao_compiler/mlir/disc/tests/mlir_test.cc b/tao_compiler/mlir/disc/tests/mlir_test.cc
index ed7d2ae30d4..3b816b72cee 100644
--- a/tao_compiler/mlir/disc/tests/mlir_test.cc
+++ b/tao_compiler/mlir/disc/tests/mlir_test.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 
 #include <dlfcn.h>
 
@@ -27,15 +27,15 @@
 #endif
 
 #if defined(GOOGLE_CUDA) || defined(TENSORFLOW_USE_ROCM)
-#include "tensorflow/compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.h"
+#include "mlir/xla/ral/context/base/cuda/cuda_context_impl.h"
 #else
 // TODO(disc): figure out why the bazel does not trigger re-compile this file
 // after we update ral.
 //
-#include "tensorflow/compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.h"
+#include "mlir/xla/ral/context/base/cpu/cpu_context_impl.h"
 #endif
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_api.h"
+#include "mlir/xla/ral/ral_api.h"
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_shape.h"
@@ -216,19 +216,21 @@ MlirTest::MlirTest(const std::string& mlir_file_path,
       profiling_(profiling),
       multi_cc_mode_(multi_cc_mode),
       multi_cc_mode_dbg_ptx_only_(multi_cc_mode_dbg_ptx_only) {
-  ReadStringFromEnvVar("TF_OPT_PATH", "tensorflow/compiler/mlir/tf-opt",
-                       &tf_opt_path_);
+  ReadStringFromEnvVar(
+      "TF_OPT_PATH", "external/org_tensorflow/tensorflow/compiler/mlir/tf-opt",
+      &tf_opt_path_);
 
   ReadStringFromEnvVar("DHLO_COMPILER_MAIN_PATH",
-                       "tensorflow/compiler/mlir/disc/disc_compiler_main",
+                       "mlir/disc/disc_compiler_main",
                        &dhlo_compiler_main_path_);
 
-  ReadStringFromEnvVar("TF_MLIR_TRANSLATE_PATH",
-                       "tensorflow/compiler/mlir/tf-mlir-translate",
-                       &tf_mlir_translate_path_);
+  ReadStringFromEnvVar(
+      "TF_MLIR_TRANSLATE_PATH",
+      "external/org_tensorflow/tensorflow/compiler/mlir/tf-mlir-translate",
+      &tf_mlir_translate_path_);
 
   compiled_so_file_ = tmp_dir_ + test_name_ + ".so";
-
+  VLOG(0) << "tf_opt_pat: " << tf_opt_path_;
   VLOG(0) << "mlir_file_path: " << mlir_file_path_;
   VLOG(0) << "tmp_dir: " << tmp_dir_;
   VLOG(0) << "test_name: " << test_name_;
@@ -236,8 +238,10 @@ MlirTest::MlirTest(const std::string& mlir_file_path,
 
 Status MlirTest::Run() {
   TF_RETURN_IF_ERROR(CompileMlirToBinary());
+  VLOG(0) << "run compiled program\n";
   TF_RETURN_IF_ERROR(GenerateInputAndRun());
   if (expected_output_vals_.empty()) {
+    VLOG(0) << "run golden tf\n";
     TF_RETURN_IF_ERROR(RunGoldenTF());
   }
   TF_RETURN_IF_ERROR(CompareResults());
@@ -250,6 +254,7 @@ int MlirTest::CallBinary(std::string program_path,
   process.SetProgram(program_path, args);
   process.SetChannelAction(tensorflow::CHAN_STDOUT, tensorflow::ACTION_PIPE);
   process.SetChannelAction(tensorflow::CHAN_STDERR, tensorflow::ACTION_PIPE);
+  VLOG(0) << "program_path: " << program_path << "\n";
   if (!process.Start()) {
     return 1;
   }
@@ -267,6 +272,7 @@ int MlirTest::CallBinary(std::string program_path,
           << stdout_output << "\n============ END ============\n";
   VLOG(0) << "-- stderr:\n"
           << stderr_output << "\n============ END ============\n";
+  VLOG(0) << "ret: " << s << "\n";
   return s;
 }
 
@@ -275,6 +281,7 @@ Status MlirTest::CompileMlirToBinary() {
   std::string tf_dialect_file = tmp_dir_ + test_name_ + "_tf_dialect.mlir";
   std::vector<std::string> args = {tf_opt_path_, "--tf-standard-pipeline",
                                    mlir_file_path_, "-o", tf_dialect_file};
+  VLOG(0) << "tf_opt_path: " << tf_opt_path_ << "\n";
   if (CallBinary(tf_opt_path_, args)) {
     return Internal("tf_executor dialect -> tf dialect failed");
   }
diff --git a/tao_compiler/mlir/disc/tests/pdll/BUILD b/tao_compiler/mlir/disc/tests/pdll/BUILD
index b415c508ff7..0a16ca8be1b 100644
--- a/tao_compiler/mlir/disc/tests/pdll/BUILD
+++ b/tao_compiler/mlir/disc/tests/pdll/BUILD
@@ -1,4 +1,4 @@
-load("//tensorflow/compiler/mlir/disc/tests:glob_op_test.bzl", "glob_op_tests")
+load("//mlir/disc/tests:glob_op_test.bzl", "glob_op_tests")
 
 glob_op_tests(
     data = [],
diff --git a/tao_compiler/mlir/disc/tests/pdll/qgemm.cc b/tao_compiler/mlir/disc/tests/pdll/qgemm.cc
index 706c067d9ae..3347fcb90a0 100644
--- a/tao_compiler/mlir/disc/tests/pdll/qgemm.cc
+++ b/tao_compiler/mlir/disc/tests/pdll/qgemm.cc
@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path = "tensorflow/compiler/mlir/disc/tests/pdll/data/";
+const std::string c_ft_path = "mlir/disc/tests/pdll/data/";
 
 TEST(SimpleTest, FusedAddMul) {
   EnvSetting setting = {
diff --git a/tao_compiler/mlir/disc/tests/pdll/quantized_conv2d.cc b/tao_compiler/mlir/disc/tests/pdll/quantized_conv2d.cc
index ff6236c357b..9f2c4ef3816 100644
--- a/tao_compiler/mlir/disc/tests/pdll/quantized_conv2d.cc
+++ b/tao_compiler/mlir/disc/tests/pdll/quantized_conv2d.cc
@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path = "tensorflow/compiler/mlir/disc/tests/pdll/data/";
+const std::string c_ft_path = "mlir/disc/tests/pdll/data/";
 
 TEST(TFQuantziedConv2d, STATIC_SHAPE_NHWC_I8_PER_CHANNEL_1) {
   EnvSetting setting = {
diff --git a/tao_compiler/mlir/disc/tests/pdll/simple.cc b/tao_compiler/mlir/disc/tests/pdll/simple.cc
index 53199743023..370645918a3 100644
--- a/tao_compiler/mlir/disc/tests/pdll/simple.cc
+++ b/tao_compiler/mlir/disc/tests/pdll/simple.cc
@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path = "tensorflow/compiler/mlir/disc/tests/pdll/data/";
+const std::string c_ft_path = "mlir/disc/tests/pdll/data/";
 
 TEST(SimpleTest, FusedAddMul) {
   EnvSetting setting = {
diff --git a/tao_compiler/mlir/disc/tests/regression/BUILD b/tao_compiler/mlir/disc/tests/regression/BUILD
index 318cdc36e8b..72302a2617e 100644
--- a/tao_compiler/mlir/disc/tests/regression/BUILD
+++ b/tao_compiler/mlir/disc/tests/regression/BUILD
@@ -1,4 +1,4 @@
-load("//tensorflow/compiler/mlir/disc/tests:glob_op_test.bzl", "glob_op_tests")
+load("//mlir/disc/tests:glob_op_test.bzl", "glob_op_tests")
 
 package(
     default_visibility = [":friends"],
diff --git a/tao_compiler/mlir/disc/tests/regression/algebraic_simplifier.cc b/tao_compiler/mlir/disc/tests/regression/algebraic_simplifier.cc
index dcfd8a21eda..6dd2cf77077 100644
--- a/tao_compiler/mlir/disc/tests/regression/algebraic_simplifier.cc
+++ b/tao_compiler/mlir/disc/tests/regression/algebraic_simplifier.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(AlgebraicSimplifier, PowF32DynamicTest) {
   EXPECT_TRUE(feature_test_main(
diff --git a/tao_compiler/mlir/disc/tests/regression/bladnn.cc b/tao_compiler/mlir/disc/tests/regression/bladnn.cc
index acd0010bef2..aa6bc82828e 100644
--- a/tao_compiler/mlir/disc/tests/regression/bladnn.cc
+++ b/tao_compiler/mlir/disc/tests/regression/bladnn.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 static bool init_disc_bladnn_mode = []() {
   setenv("BLADE_GEMM_TUNE_JIT", "1", 1);
diff --git a/tao_compiler/mlir/disc/tests/regression/corner_case.cc b/tao_compiler/mlir/disc/tests/regression/corner_case.cc
index 0ec957a0d09..2673616b432 100644
--- a/tao_compiler/mlir/disc/tests/regression/corner_case.cc
+++ b/tao_compiler/mlir/disc/tests/regression/corner_case.cc
@@ -9,14 +9,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 #if CUDA_VERSION >= 11100
 // This case fails with PTXAS of version 11.0. Log here to know this error
diff --git a/tao_compiler/mlir/disc/tests/regression/element_type_converter.cc b/tao_compiler/mlir/disc/tests/regression/element_type_converter.cc
index b4f75294a7c..73787a97249 100644
--- a/tao_compiler/mlir/disc/tests/regression/element_type_converter.cc
+++ b/tao_compiler/mlir/disc/tests/regression/element_type_converter.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(ElementTypeConverterTest, Gemm) {
   setenv("TAO_MLIR_ENABLE_AMP", "true", 1);
diff --git a/tao_compiler/mlir/disc/tests/regression/embedding_column.cc b/tao_compiler/mlir/disc/tests/regression/embedding_column.cc
index 20feeb6010a..1bf7824286f 100644
--- a/tao_compiler/mlir/disc/tests/regression/embedding_column.cc
+++ b/tao_compiler/mlir/disc/tests/regression/embedding_column.cc
@@ -9,14 +9,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(EmbeddingColumnTest, DynamicShape3DI64Test) {
   EXPECT_TRUE(feature_test_main(
diff --git a/tao_compiler/mlir/disc/tests/regression/empty_tensor.cc b/tao_compiler/mlir/disc/tests/regression/empty_tensor.cc
index b19b9403f60..b802e1db741 100644
--- a/tao_compiler/mlir/disc/tests/regression/empty_tensor.cc
+++ b/tao_compiler/mlir/disc/tests/regression/empty_tensor.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 // fully dynamic shape test case
 TEST(EmptyTensor, FullyDynamicShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/regression/epilogue_fusion.cc b/tao_compiler/mlir/disc/tests/regression/epilogue_fusion.cc
index 384bbd05df7..0d5d03a46d5 100644
--- a/tao_compiler/mlir/disc/tests/regression/epilogue_fusion.cc
+++ b/tao_compiler/mlir/disc/tests/regression/epilogue_fusion.cc
@@ -9,15 +9,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/util/env_var.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 // GELU f16.
 TEST(EpilogueTest, EpilogueGELUF16) {
diff --git a/tao_compiler/mlir/disc/tests/regression/horizontal_fusion.cc b/tao_compiler/mlir/disc/tests/regression/horizontal_fusion.cc
index dab11bc944c..c713d2dbcb3 100644
--- a/tao_compiler/mlir/disc/tests/regression/horizontal_fusion.cc
+++ b/tao_compiler/mlir/disc/tests/regression/horizontal_fusion.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 // fully dynamic shape test case
 TEST(HorizontalTensor, BasicTest) {
diff --git a/tao_compiler/mlir/disc/tests/regression/int_arithmetic.cc b/tao_compiler/mlir/disc/tests/regression/int_arithmetic.cc
index c676e356676..bd97d668816 100644
--- a/tao_compiler/mlir/disc/tests/regression/int_arithmetic.cc
+++ b/tao_compiler/mlir/disc/tests/regression/int_arithmetic.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(I8AddTest, I8AddTest) {
   EXPECT_TRUE(feature_test_main(
diff --git a/tao_compiler/mlir/disc/tests/regression/io_forwarding.cc b/tao_compiler/mlir/disc/tests/regression/io_forwarding.cc
index 683125ad792..58a115b39e8 100644
--- a/tao_compiler/mlir/disc/tests/regression/io_forwarding.cc
+++ b/tao_compiler/mlir/disc/tests/regression/io_forwarding.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(RalIOForwarding, GPUGPUTest) {
   EXPECT_TRUE(feature_test_main(
diff --git a/tao_compiler/mlir/disc/tests/regression/kstitch_fusion.cc b/tao_compiler/mlir/disc/tests/regression/kstitch_fusion.cc
index ef547214126..479ad94c4b6 100644
--- a/tao_compiler/mlir/disc/tests/regression/kstitch_fusion.cc
+++ b/tao_compiler/mlir/disc/tests/regression/kstitch_fusion.cc
@@ -9,15 +9,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/util/env_var.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 // The column size is small enough to enable warp-wise reduction schedule.
 TEST(KStitchFusionGPUTest, KStitchSimpleSmallColumnF32) {
diff --git a/tao_compiler/mlir/disc/tests/regression/large_concat.cc b/tao_compiler/mlir/disc/tests/regression/large_concat.cc
index 66923e9a43e..ac407a8dc1c 100644
--- a/tao_compiler/mlir/disc/tests/regression/large_concat.cc
+++ b/tao_compiler/mlir/disc/tests/regression/large_concat.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(LargeConcat, CPUTest) {
   std::vector<std::string> input_descriptors(64, "30x4xf32_X");
diff --git a/tao_compiler/mlir/disc/tests/regression/layer_norm.cc b/tao_compiler/mlir/disc/tests/regression/layer_norm.cc
index 1285b763e5e..17c151b648d 100644
--- a/tao_compiler/mlir/disc/tests/regression/layer_norm.cc
+++ b/tao_compiler/mlir/disc/tests/regression/layer_norm.cc
@@ -9,14 +9,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 // LayerNorm
 TEST(LayerNormTest, LayerNorm3DF32) {
diff --git a/tao_compiler/mlir/disc/tests/regression/multi_cc.cc b/tao_compiler/mlir/disc/tests/regression/multi_cc.cc
index e26bac3508a..d888b5ace7d 100644
--- a/tao_compiler/mlir/disc/tests/regression/multi_cc.cc
+++ b/tao_compiler/mlir/disc/tests/regression/multi_cc.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(MultiCCTest, BasicTest) {
   EXPECT_TRUE(feature_test_main(
diff --git a/tao_compiler/mlir/disc/tests/regression/multi_threading_cpu.cc b/tao_compiler/mlir/disc/tests/regression/multi_threading_cpu.cc
index 235ebd554a1..fd9aa1aa3c0 100644
--- a/tao_compiler/mlir/disc/tests/regression/multi_threading_cpu.cc
+++ b/tao_compiler/mlir/disc/tests/regression/multi_threading_cpu.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 static bool init_threads = []() {
   setenv("OMP_NUM_THREADS", "3", 1);
diff --git a/tao_compiler/mlir/disc/tests/regression/onednn.cc b/tao_compiler/mlir/disc/tests/regression/onednn.cc
index 11d5ad0fcc0..4d3c3d479c4 100644
--- a/tao_compiler/mlir/disc/tests/regression/onednn.cc
+++ b/tao_compiler/mlir/disc/tests/regression/onednn.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 static bool init_disc_math_mode = []() {
   setenv("DISC_CPU_MATH_KERNEL_MODE", "onednn", 1);
diff --git a/tao_compiler/mlir/disc/tests/regression/quantized_const.cc b/tao_compiler/mlir/disc/tests/regression/quantized_const.cc
index 4effc838bf6..9c353102b1a 100644
--- a/tao_compiler/mlir/disc/tests/regression/quantized_const.cc
+++ b/tao_compiler/mlir/disc/tests/regression/quantized_const.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(QuantizedConstOpTest, QINT8) {
   EXPECT_TRUE(feature_test_main(
diff --git a/tao_compiler/mlir/disc/tests/regression/quantized_conv2d_with_bias_and_requantize.cc b/tao_compiler/mlir/disc/tests/regression/quantized_conv2d_with_bias_and_requantize.cc
index 955434eb366..0459bff13cd 100644
--- a/tao_compiler/mlir/disc/tests/regression/quantized_conv2d_with_bias_and_requantize.cc
+++ b/tao_compiler/mlir/disc/tests/regression/quantized_conv2d_with_bias_and_requantize.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(QuantizedConv2DWithBiasAndRequantizeOpTest, I8I8I8_NO_BIAS) {
   std::vector<float> inputs(1 * 2 * 2 * 25, -0.6);
diff --git a/tao_compiler/mlir/disc/tests/regression/reshape_fusion_cpu.cc b/tao_compiler/mlir/disc/tests/regression/reshape_fusion_cpu.cc
index b304c3718f7..3bddb71524b 100644
--- a/tao_compiler/mlir/disc/tests/regression/reshape_fusion_cpu.cc
+++ b/tao_compiler/mlir/disc/tests/regression/reshape_fusion_cpu.cc
@@ -9,15 +9,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/util/env_var.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(ReshapeFusionCPUTest, kLoopTest) {
   setenv("DISC_ENABLE_STITCH", "true", 1);
diff --git a/tao_compiler/mlir/disc/tests/regression/softmax.cc b/tao_compiler/mlir/disc/tests/regression/softmax.cc
index 9d23a4cbb2d..46845f1fdb4 100644
--- a/tao_compiler/mlir/disc/tests/regression/softmax.cc
+++ b/tao_compiler/mlir/disc/tests/regression/softmax.cc
@@ -9,14 +9,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 // Softmax
 TEST(SoftmaxTest, Softmax3DF32) {
diff --git a/tao_compiler/mlir/disc/tests/regression/transpose_simplifier.cc b/tao_compiler/mlir/disc/tests/regression/transpose_simplifier.cc
index 285fab76339..8fb2c43849e 100644
--- a/tao_compiler/mlir/disc/tests/regression/transpose_simplifier.cc
+++ b/tao_compiler/mlir/disc/tests/regression/transpose_simplifier.cc
@@ -9,14 +9,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(TransposeSimplifierTest, ConvReluConvReluAddTest0) {
   EXPECT_TRUE(feature_test_main(
diff --git a/tao_compiler/mlir/disc/tests/regression/uint_cast.cc b/tao_compiler/mlir/disc/tests/regression/uint_cast.cc
index 7e65bb09d42..8c7b4a77ed8 100644
--- a/tao_compiler/mlir/disc/tests/regression/uint_cast.cc
+++ b/tao_compiler/mlir/disc/tests/regression/uint_cast.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(UintCastTest, UintCastTest) {
   EXPECT_TRUE(feature_test_main(
diff --git a/tao_compiler/mlir/disc/tests/regression/use_expect_output.cc b/tao_compiler/mlir/disc/tests/regression/use_expect_output.cc
index 71f5fd03f19..6c7390e1c01 100644
--- a/tao_compiler/mlir/disc/tests/regression/use_expect_output.cc
+++ b/tao_compiler/mlir/disc/tests/regression/use_expect_output.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(UseExpectOutput, BasicTest) {
   tensorflow::Tensor output(tensorflow::DataType::DT_FLOAT, {2, 3});
diff --git a/tao_compiler/mlir/disc/tests/regression/weight_prepacking_cpu.cc b/tao_compiler/mlir/disc/tests/regression/weight_prepacking_cpu.cc
index 011ea2008c4..30667cf0c89 100644
--- a/tao_compiler/mlir/disc/tests/regression/weight_prepacking_cpu.cc
+++ b/tao_compiler/mlir/disc/tests/regression/weight_prepacking_cpu.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(WeightPrepackingTest, MatmulOnednnNotPacking) {
   setenv("DISC_CPU_MATH_KERNEL_MODE", "onednn", 1);
diff --git a/tao_compiler/mlir/disc/tests/regression/where_fusion.cc b/tao_compiler/mlir/disc/tests/regression/where_fusion.cc
index d50252f9872..eb106972569 100644
--- a/tao_compiler/mlir/disc/tests/regression/where_fusion.cc
+++ b/tao_compiler/mlir/disc/tests/regression/where_fusion.cc
@@ -9,14 +9,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/regression/data/";
+const std::string c_ft_path = "mlir/disc/tests/regression/data/";
 
 TEST(WhereFusionTest, WhereFusionDynamicShape3DI64Test) {
   setenv("DISC_EXPECTED_KERNELS_IN_UT", "1", 1);
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/BUILD b/tao_compiler/mlir/disc/tests/tensorflow_ops/BUILD
index 318cdc36e8b..72302a2617e 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/BUILD
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/BUILD
@@ -1,4 +1,4 @@
-load("//tensorflow/compiler/mlir/disc/tests:glob_op_test.bzl", "glob_op_tests")
+load("//mlir/disc/tests:glob_op_test.bzl", "glob_op_tests")
 
 package(
     default_visibility = [":friends"],
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/abs.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/abs.cc
index 53bef80613f..e782fd2380d 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/abs.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/abs.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFAbsOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/add.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/add.cc
index 5db268ba6a9..c7b8c037bce 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/add.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/add.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFAddOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/add_n.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/add_n.cc
index a4fb195a328..51e245646b3 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/add_n.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/add_n.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFAddNOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/add_v2.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/add_v2.cc
index db66292646c..8c4a2c5b95a 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/add_v2.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/add_v2.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFAddV2OpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/all.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/all.cc
index fa1fe534662..01212c0cdec 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/all.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/all.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFAllOpTest, ReduceToScalarKeepDimStaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/any.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/any.cc
index e1c11db6d63..dd0da5a76fa 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/any.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/any.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFAnyOpTest, ColReduceNotKeepDimStaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/batch_matmul.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/batch_matmul.cc
index 80bd3fefb16..f3239949bb0 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/batch_matmul.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/batch_matmul.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFBatchMatMulOpTest, StaticShapeNNF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/batch_matmul_v2.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/batch_matmul_v2.cc
index 2f6bdaa48cf..e372fc7dfb1 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/batch_matmul_v2.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/batch_matmul_v2.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // TODO(disc): re-enable after we support general cases of dot_general op.
 // Currently tf2mhlo converter using tf2xla bridge to convert tf.MatMulV2Op
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/bias_add.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/bias_add.cc
index bbacfbc8694..caf30775e59 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/bias_add.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/bias_add.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFBiasAddOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/broadcast_to.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/broadcast_to.cc
index 5695835251f..ac842180fa4 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/broadcast_to.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/broadcast_to.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFBroadcastOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/bucketize.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/bucketize.cc
index 9a15d266d63..90d40c77640 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/bucketize.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/bucketize.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // f32 static shape test case
 TEST(TFBucketizeOpTest, StaticShapeF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/cast.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/cast.cc
index 717f006800f..715ba2a317c 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/cast.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/cast.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test cast f32 to f16
 TEST(TFCastOpTest, StaticShape2DF32ToF16) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/ceil.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/ceil.cc
index e45c1e5320c..083c4148e83 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/ceil.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/ceil.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test cast
 TEST(TFCeilOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/concat_v2.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/concat_v2.cc
index dbcbe1de6de..9f7d05cc3b5 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/concat_v2.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/concat_v2.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFConcatV2OpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/const.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/const.cc
index 04a3fba6d48..dcbac06a8b5 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/const.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/const.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFConstOpTest, ScalarF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/conv2d.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/conv2d.cc
index 228ed2248b2..61a3847f240 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/conv2d.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/conv2d.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // NHWC
 // static shape test case with NHWC/VALID/FP32
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/conv2d_backprop_filter.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/conv2d_backprop_filter.cc
index f8eeea8eb0c..04611a4400e 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/conv2d_backprop_filter.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/conv2d_backprop_filter.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // fully dynamic shape test case with NHWC/SAME/FP32
 TEST(TFConv2DBackpropFilterOpTest, FullDynamicShape4DNHWCF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/conv2d_backprop_input.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/conv2d_backprop_input.cc
index e1ffb0d8158..0d519f73dcc 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/conv2d_backprop_input.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/conv2d_backprop_input.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // full dynamic shape test case with NHWC/VALID/FP32
 TEST(TFConv2DBackpropInputOpTest, FullDynamicShape4DNHWCSAMEF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/cos.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/cos.cc
index ba00c44793c..f251e9b2d11 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/cos.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/cos.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFCosOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/depthwise_conv2d_native.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/depthwise_conv2d_native.cc
index 5c2186c4d7b..6f472b9f0e0 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/depthwise_conv2d_native.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/depthwise_conv2d_native.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // NHWC
 // static shape test case with NHWC/VALID/FP32
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/dequantize.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/dequantize.cc
index 6a86aa34702..eb0ba540ac2 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/dequantize.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/dequantize.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // Static shape
 TEST(TFDequantizeTest, INT8_CHANNEL_SCALED_StaticShape) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/dynamic_stitch.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/dynamic_stitch.cc
index 26c12cb3747..86030c408a7 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/dynamic_stitch.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/dynamic_stitch.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFStridedSliceOpTest, StaticShapeF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/einsum.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/einsum.cc
index a32bf58e937..523d8fa8620 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/einsum.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/einsum.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(EinsumTest, StaticShapeF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/equal.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/equal.cc
index 8c07fe3bc8b..2a39bc0b893 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/equal.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/equal.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFEqualOpTest, StaticShape2DI64) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/erf.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/erf.cc
index a51d3dc06ae..a2f3c84bc1d 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/erf.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/erf.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFErfOpTest, ErfStaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/exp.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/exp.cc
index 3fe148d01ce..a27093727e5 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/exp.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/exp.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFExpOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/expand_dims.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/expand_dims.cc
index 3f5a0916930..7509e6c870f 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/expand_dims.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/expand_dims.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFExpandDimsOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/fill.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/fill.cc
index 796063b32f2..fea4be82113 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/fill.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/fill.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFFillOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/floor.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/floor.cc
index c8c7297fc88..c45f6032b5a 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/floor.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/floor.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test cast
 TEST(TFFloorOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/floor_div.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/floor_div.cc
index 124a87e7438..1819280898f 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/floor_div.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/floor_div.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFFloorDivOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/floor_mod.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/floor_mod.cc
index f01eae1930f..0c07fdf1361 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/floor_mod.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/floor_mod.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFFloorModOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/gather_nd.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/gather_nd.cc
index 150a67ff8f2..1def7e02495 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/gather_nd.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/gather_nd.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFGatherNdOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/gather_v2.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/gather_v2.cc
index 4d6f7bdf84b..ccc9649fc53 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/gather_v2.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/gather_v2.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFGatherV2OpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/greater.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/greater.cc
index dc5fac0e411..70a81ca07f1 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/greater.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/greater.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFGreaterOpTest, StaticShape2DI64) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/greater_equal.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/greater_equal.cc
index 8fdf3726844..47955be6779 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/greater_equal.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/greater_equal.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFGreaterEqualOpTest, StaticShape2DI64) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/identity.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/identity.cc
index c854755ace6..2d289b3b609 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/identity.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/identity.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test cast
 TEST(TFIdentityOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/inline_h2d.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/inline_h2d.cc
index e39d5e6c8ae..efc888bd3c1 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/inline_h2d.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/inline_h2d.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFH2DOpTest, StaticShape1DI64) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/isfinite.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/isfinite.cc
index 27d023b781f..45642940708 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/isfinite.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/isfinite.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test cast
 TEST(TFIsFiniteOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/less.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/less.cc
index a487cf03fc3..fa441069ab2 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/less.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/less.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFLessOpTest, StaticShape2DI64) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/less_equal.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/less_equal.cc
index 6c0336c9951..11a8f3d5fc9 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/less_equal.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/less_equal.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFLessEqualOpTest, StaticShape2DI64) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/log.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/log.cc
index 6957afd5ae9..df9c8bad31e 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/log.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/log.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test cast
 TEST(TFLogOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/logical_and.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/logical_and.cc
index a5971fde808..96c658649da 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/logical_and.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/logical_and.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFLogicalAndOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/logical_not.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/logical_not.cc
index 64971acafb2..f43c9d34a3d 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/logical_not.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/logical_not.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFLogicalNotOpTest, StaticShape2DI1) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/logical_or.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/logical_or.cc
index 0a9070fbab5..cd19b4a133e 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/logical_or.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/logical_or.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFLogicalOrOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/matmul.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/matmul.cc
index f61cbd90774..2a9f533c91c 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/matmul.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/matmul.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFMatMulOpTest, StaticShapeNNF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/max.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/max.cc
index d3fdce2ab4e..fdffc12b924 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/max.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/max.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // dynamic shape 3D column reduction test case
 TEST(TFMaxOpTest, ColReduceFullyDynamicShape3DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/maximum.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/maximum.cc
index b9d8efc9270..5ff83bdf6fc 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/maximum.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/maximum.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFMaximumOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/mean.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/mean.cc
index 32853b9003e..167fbcabf97 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/mean.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/mean.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // dynamic shape 3D column reduction test case
 TEST(TFMeanOpTest, ColReduceFullyDynamicShape3DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/min.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/min.cc
index 7494ad8a31f..9aedf00870a 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/min.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/min.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // dynamic shape 3D column reduction test case
 TEST(TFMinOpTest, ColReduceFullyDynamicShape3DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/minimum.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/minimum.cc
index 120f2732d33..bf18323e014 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/minimum.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/minimum.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFMinimumOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/mul.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/mul.cc
index ee19ecc5125..8b4fb5d0208 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/mul.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/mul.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFMulOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/neg.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/neg.cc
index dccbfd34f7a..55edbaf015a 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/neg.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/neg.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test cast
 TEST(TFNegOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/not_equal.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/not_equal.cc
index b7dd17e59e9..d12a3ddb6b6 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/not_equal.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/not_equal.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFNotEqualOpTest, StaticShape2DI64) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/pack.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/pack.cc
index 5653e577279..25429a4df8e 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/pack.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/pack.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFPackOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/pad.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/pad.cc
index ad9d64ac706..36bb6a98414 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/pad.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/pad.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFPadOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/pow.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/pow.cc
index 4139507e7b6..d18c399808c 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/pow.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/pow.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFPowOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/prod.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/prod.cc
index e87de0f5059..8dd76266f6d 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/prod.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/prod.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // dynamic shape 3D column reduction test case
 TEST(TFProdOpTest, ColReduceFullyDynamicShape3DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/quantize_v2.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/quantize_v2.cc
index c97da94ae96..3af27632cb6 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/quantize_v2.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/quantize_v2.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // Static shape
 TEST(TFQuantizeV2Test, INT8_SCALAR_MIN_FIRST_StaticShape) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/quantized_conv2d.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/quantized_conv2d.cc
index 960689da510..cccde111577 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/quantized_conv2d.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/quantized_conv2d.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 TEST(TFQuantziedConv2d, STATIC_SHAPE_NHWC_I8_PER_CHANNEL) {
   std::vector<float> inputs(1 * 2 * 2 * 25, -0.6);
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/quantized_matmul.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/quantized_matmul.cc
index eda71e8196b..73581c51ca3 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/quantized_matmul.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/quantized_matmul.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 TEST(TFQuantziedMatMul, STATIC_SHAPE_I8_PER_CHANNEL) {
   std::vector<float> inputs(4 * 25, -0.6);
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/random_uniform.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/random_uniform.cc
index 7db4ae97580..71f09c9a6f9 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/random_uniform.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/random_uniform.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // Test RandomUniform Op U(0,1) has : Mean(X) ~ E(X) = 0.5
 TEST(TaoMlirFeatureTest, TF2XLA_RandomUniformTest1) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/range.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/range.cc
index 870be88b29c..c96bb753e89 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/range.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/range.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // test with provided data to test i64
 TEST(TFRangeOpTest, ProvidedDataShape2DI64) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/real_div.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/real_div.cc
index 78aff5b1f3d..a715ba3b4de 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/real_div.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/real_div.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFRealDivOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/relu.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/relu.cc
index 7930deecdde..0f7d0af262f 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/relu.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/relu.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFReluOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/relu6.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/relu6.cc
index 6f421b8cf32..7c8d2e41d16 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/relu6.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/relu6.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFRelu6OpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/relu_grad.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/relu_grad.cc
index ac0b95d780d..ea613d23890 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/relu_grad.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/relu_grad.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFReluGradOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/reshape.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/reshape.cc
index b81a092f6c8..7f6c09dd01c 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/reshape.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/reshape.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFReshapeOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/reverse.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/reverse.cc
index e4bc2405c18..7e3085a95bf 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/reverse.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/reverse.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFReverseOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/round.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/round.cc
index 8a6d063e67f..e462aa88d16 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/round.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/round.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test cast
 TEST(TFRoundOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/rsqrt.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/rsqrt.cc
index 9d1cc74b8ac..b2b968f88e9 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/rsqrt.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/rsqrt.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test cast
 TEST(TFRsqrtOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/select.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/select.cc
index 8655ead632c..522aef4e951 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/select.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/select.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFSelectOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/select_v2.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/select_v2.cc
index fe9e3354876..e1a95ed3958 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/select_v2.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/select_v2.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape + same shape test case
 TEST(TFSelectV2OpTest, StaticShapeSameShapeF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/shape.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/shape.cc
index 0bd6f6998ab..99a0364cc7e 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/shape.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/shape.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFShapeOpTest, ScalarI32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/sigmoid.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/sigmoid.cc
index 89cd558f27d..541af7060ec 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/sigmoid.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/sigmoid.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFSigmoidOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/sigmoid_grad.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/sigmoid_grad.cc
index 67dceae48eb..066676f4d00 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/sigmoid_grad.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/sigmoid_grad.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFSigmoidGradOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/sign.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/sign.cc
index 79be4a91256..f9008bedf87 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/sign.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/sign.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFSignOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/sin.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/sin.cc
index 8bf21fbcec8..11658a46bf5 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/sin.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/sin.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFSinOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/slice.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/slice.cc
index 816ff8f5b09..c600124297b 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/slice.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/slice.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFSliceOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/snapshot.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/snapshot.cc
index 0c095a1f661..1f2f70609e1 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/snapshot.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/snapshot.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test cast
 TEST(TFSnapshotOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/softmax.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/softmax.cc
index 50f0eb0bcae..ff7618867c1 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/softmax.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/softmax.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // dynamic shape softmax test case
 TEST(TFSoftmaxOpTest, FullyDynamicShape3DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/softmax_cross_entropy_with_logits.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/softmax_cross_entropy_with_logits.cc
index e54869d9f65..fd96be9a735 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/softmax_cross_entropy_with_logits.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/softmax_cross_entropy_with_logits.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // dynamic shape softmax_cross_entropy_with_logits test case
 TEST(TFSoftmaxCrossEntropyWithLogitsOpTest, FullyDynamicShape3DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/softplus.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/softplus.cc
index 431906eca49..34046f534d5 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/softplus.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/softplus.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // dynamic shape softmax test case
 TEST(TFSoftplusOpTest, FullyDynamicShape3DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/sparse_fill_empty_rows.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/sparse_fill_empty_rows.cc
index 8f0baa46986..6a80ecd8b89 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/sparse_fill_empty_rows.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/sparse_fill_empty_rows.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 TEST(TFSparseFillEmptyRowsOpTest, DynamicShapeI64) {
   EXPECT_TRUE(feature_test_main(
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/sparse_reshape.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/sparse_reshape.cc
index d515eecc8d1..0e0472aecca 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/sparse_reshape.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/sparse_reshape.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 TEST(TFSparseReshapeOpTest, BasicI64) {
   EXPECT_TRUE(feature_test_main(
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/sparse_segment_mean.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/sparse_segment_mean.cc
index 3add33e607b..d92662939ee 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/sparse_segment_mean.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/sparse_segment_mean.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 TEST(TFSparseSegmentMeanOpTest, DynamicShapeF32Dim3Input) {
   EXPECT_TRUE(feature_test_main(
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/split.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/split.cc
index 96a1412a371..81496aefd2b 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/split.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/split.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFSplitOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/sqrt.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/sqrt.cc
index d636c089008..c9048d9f842 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/sqrt.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/sqrt.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFSqrtOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/squared_difference.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/squared_difference.cc
index 8447aeaecfd..6ae7337bdd0 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/squared_difference.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/squared_difference.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFSquaredDifferenceOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/squeeze.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/squeeze.cc
index 6cfea61b1e8..1e4c7f08f25 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/squeeze.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/squeeze.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // dynamic shape test with dim_size 1
 TEST(TFSqueezeOpTest, DynamicShapeTest) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/strided_slice.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/strided_slice.cc
index 1284f4332fc..09c22074190 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/strided_slice.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/strided_slice.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFStridedSliceOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/sub.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/sub.cc
index a190096ebeb..b82209ddab3 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/sub.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/sub.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFSubOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/sum.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/sum.cc
index 7872ea9f92e..0662f0c638b 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/sum.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/sum.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // dynamic shape 2D column reduction test case
 TEST(TFSumOpTest, ColReduceFullyDynamicShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/tanh.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/tanh.cc
index a4b41591e1d..127f1d0e99c 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/tanh.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/tanh.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test cast
 TEST(TFTanhOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/tile.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/tile.cc
index 63566f5574a..139bbc9c259 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/tile.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/tile.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFTileOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/topk.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/topk.cc
index cc4d7916c65..4f695ff8bac 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/topk.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/topk.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 TEST(TFTopKOpTest, DynamicShape2DF32Small) {
   EXPECT_TRUE(
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/transpose.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/transpose.cc
index 84c073e9892..806582314c7 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/transpose.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/transpose.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // test with library call
 TEST(TFTransposeOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/unpack.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/unpack.cc
index 761bfe0011e..1ae4b80c11b 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/unpack.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/unpack.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFUnpackOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/where.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/where.cc
index 6f5d96a9fc4..cf53bd63ec8 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/where.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/where.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // boolean
 TEST(TFWhereOpTest, DynamicShapeBoolean1DInput) {
diff --git a/tao_compiler/mlir/disc/tests/tensorflow_ops/zeros_like.cc b/tao_compiler/mlir/disc/tests/tensorflow_ops/zeros_like.cc
index 8969e1e3fe0..f33b56b08f4 100644
--- a/tao_compiler/mlir/disc/tests/tensorflow_ops/zeros_like.cc
+++ b/tao_compiler/mlir/disc/tests/tensorflow_ops/zeros_like.cc
@@ -13,14 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/tests/mlir_feature_test.h"
-#include "tensorflow/compiler/mlir/disc/tests/mlir_test.h"
+#include "mlir/disc/tests/mlir_feature_test.h"
+#include "mlir/disc/tests/mlir_test.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace mlir_test {
 
-const std::string c_ft_path =
-    "tensorflow/compiler/mlir/disc/tests/tensorflow_ops/data/";
+const std::string c_ft_path = "mlir/disc/tests/tensorflow_ops/data/";
 
 // static shape test case
 TEST(TFZerosLikeOpTest, StaticShape2DF32) {
diff --git a/tao_compiler/mlir/disc/tools/disc-pdll/tests/BUILD b/tao_compiler/mlir/disc/tools/disc-pdll/tests/BUILD
index 9ed0eaba800..8937ad8a5a2 100644
--- a/tao_compiler/mlir/disc/tools/disc-pdll/tests/BUILD
+++ b/tao_compiler/mlir/disc/tools/disc-pdll/tests/BUILD
@@ -1,5 +1,5 @@
-load("//tensorflow:tensorflow.bzl", "filegroup")
-load("//tensorflow/compiler/mlir/disc:glob_lit_test.bzl", "glob_lit_tests")
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "filegroup")
+load("//mlir/disc:glob_lit_test.bzl", "glob_lit_tests")
 
 package(licenses = ["notice"])
 
@@ -17,7 +17,7 @@ filegroup(
         "*.pdll",
     ]),
     data = [
-        "//tensorflow/compiler/mlir/disc:disc-pdll",
+        "//mlir/disc:disc-pdll",
         "@llvm-project//llvm:FileCheck",
     ],
 )
\ No newline at end of file
diff --git a/tao_compiler/mlir/disc/tools/disc-replay/replay_test.cc b/tao_compiler/mlir/disc/tools/disc-replay/replay_test.cc
index a6da7435df0..40e6c6c8758 100644
--- a/tao_compiler/mlir/disc/tools/disc-replay/replay_test.cc
+++ b/tao_compiler/mlir/disc/tools/disc-replay/replay_test.cc
@@ -11,8 +11,8 @@
 
 #include <cstdio>
 
-#include "tensorflow/compiler/mlir/disc/tools/disc-replay/disc_interpreter.h"
-#include "tensorflow/compiler/mlir/disc/tools/disc-replay/tar_helper.h"
+#include "mlir/disc/tools/disc-replay/disc_interpreter.h"
+#include "mlir/disc/tools/disc-replay/tar_helper.h"
 #include "tensorflow/core/platform/path.h"
 #include "tensorflow/core/platform/test.h"
 
@@ -81,10 +81,9 @@ TEST(BladeDISCReplayTest, TestInterPreter_CUDA) {
 #endif
   // The test.tar is generated by quick start demo manually offline.
   // setting environment variable DISC_DEBUG=true to enable debug mode.
-  std::string tar_fname =
-      "tensorflow/compiler/mlir/disc/tools/disc-replay/test_data/data.tar";
+  std::string tar_fname = "mlir/disc/tools/disc-replay/test_data/data.tar";
   std::string program_fname =
-      "tensorflow/compiler/mlir/disc/tools/disc-replay/test_data/program.pb";
+      "mlir/disc/tools/disc-replay/test_data/program.pb";
   DiscInterpreter disc;
   CompiledResult result;
   // 1. Init replay record from tarball
diff --git a/tao_compiler/mlir/disc/tools/disc-source-emitter/tests/BUILD b/tao_compiler/mlir/disc/tools/disc-source-emitter/tests/BUILD
index 7319ea5ef0b..dc4e5b4683b 100644
--- a/tao_compiler/mlir/disc/tools/disc-source-emitter/tests/BUILD
+++ b/tao_compiler/mlir/disc/tools/disc-source-emitter/tests/BUILD
@@ -1,5 +1,5 @@
-load("//tensorflow:tensorflow.bzl", "filegroup")
-load("//tensorflow/compiler/mlir/disc:glob_lit_test.bzl", "glob_lit_tests")
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "filegroup")
+load("//mlir/disc:glob_lit_test.bzl", "glob_lit_tests")
 
 package(licenses = ["notice"])
 
@@ -14,7 +14,7 @@ filegroup(
     name = "test_utilities",
     testonly = True,
     data = [
-        "//tensorflow/compiler/mlir/disc:disc-source-emitter",
+        "//mlir/disc:disc-source-emitter",
         "@llvm-project//llvm:FileCheck",
     ],
 )
\ No newline at end of file
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/tests/BUILD b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/tests/BUILD
index f631e28b320..b5b8d9b6119 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/tests/BUILD
+++ b/tao_compiler/mlir/disc/tools/disc-transform/LinalgExt/tests/BUILD
@@ -1,5 +1,5 @@
-load("//tensorflow:tensorflow.bzl", "filegroup")
-load("//tensorflow/compiler/mlir/disc:glob_lit_test.bzl", "glob_lit_tests")
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "filegroup")
+load("//mlir/disc:glob_lit_test.bzl", "glob_lit_tests")
 
 package(licenses = ["notice"])
 
@@ -14,7 +14,7 @@ filegroup(
     name = "test_utilities",
     testonly = True,
     data = [
-        "//tensorflow/compiler/mlir/disc:disc-opt",
+        "//mlir/disc:disc-opt",
         "@llvm-project//llvm:FileCheck",
     ],
 )
\ No newline at end of file
diff --git a/tao_compiler/mlir/disc/tools/disc-transform/transforms/tests/BUILD b/tao_compiler/mlir/disc/tools/disc-transform/transforms/tests/BUILD
index 65c40e56fc5..21933059d1d 100644
--- a/tao_compiler/mlir/disc/tools/disc-transform/transforms/tests/BUILD
+++ b/tao_compiler/mlir/disc/tools/disc-transform/transforms/tests/BUILD
@@ -1,5 +1,5 @@
-load("//tensorflow:tensorflow.bzl", "filegroup")
-load("//tensorflow/compiler/mlir/disc:glob_lit_test.bzl", "glob_lit_tests")
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "filegroup")
+load("//mlir/disc:glob_lit_test.bzl", "glob_lit_tests")
 
 package(licenses = ["notice"])
 
@@ -17,7 +17,7 @@ filegroup(
         "metadata-only*.mlir",
     ]),
     data = [
-        "//tensorflow/compiler/mlir/disc:disc-opt",
+        "//mlir/disc:disc-opt",
         "@llvm-project//llvm:FileCheck",
     ],
 )
\ No newline at end of file
diff --git a/tao_compiler/mlir/disc/transforms/tests/BUILD b/tao_compiler/mlir/disc/transforms/tests/BUILD
index f631e28b320..b5b8d9b6119 100644
--- a/tao_compiler/mlir/disc/transforms/tests/BUILD
+++ b/tao_compiler/mlir/disc/transforms/tests/BUILD
@@ -1,5 +1,5 @@
-load("//tensorflow:tensorflow.bzl", "filegroup")
-load("//tensorflow/compiler/mlir/disc:glob_lit_test.bzl", "glob_lit_tests")
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "filegroup")
+load("//mlir/disc:glob_lit_test.bzl", "glob_lit_tests")
 
 package(licenses = ["notice"])
 
@@ -14,7 +14,7 @@ filegroup(
     name = "test_utilities",
     testonly = True,
     data = [
-        "//tensorflow/compiler/mlir/disc:disc-opt",
+        "//mlir/disc:disc-opt",
         "@llvm-project//llvm:FileCheck",
     ],
 )
\ No newline at end of file
diff --git a/tao_compiler/mlir/disc/utils/cycle_detector_test.cc b/tao_compiler/mlir/disc/utils/cycle_detector_test.cc
index 36062a18829..ce74546eaee 100644
--- a/tao_compiler/mlir/disc/utils/cycle_detector_test.cc
+++ b/tao_compiler/mlir/disc/utils/cycle_detector_test.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/mlir/disc/utils/cycle_detector.h"
+#include "mlir/disc/utils/cycle_detector.h"
 
 #include "tensorflow/compiler/xla/test.h"
 
diff --git a/tao_compiler/mlir/xla/ral/context/custom_library/philox_random_test.cc b/tao_compiler/mlir/xla/ral/context/custom_library/philox_random_test.cc
index 21883c5f746..0dc9d10dc0e 100644
--- a/tao_compiler/mlir/xla/ral/context/custom_library/philox_random_test.cc
+++ b/tao_compiler/mlir/xla/ral/context/custom_library/philox_random_test.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/xla/ral/context/custom_library/philox_random.h"
+#include "mlir/xla/ral/context/custom_library/philox_random.h"
 
 #include <gtest/gtest.h>
 #include <math.h>
diff --git a/tao_compiler/mlir/xla/ral/ral_metadata_test.cc b/tao_compiler/mlir/xla/ral/ral_metadata_test.cc
index f3eb4fc6670..184cd997941 100644
--- a/tao_compiler/mlir/xla/ral/ral_metadata_test.cc
+++ b/tao_compiler/mlir/xla/ral/ral_metadata_test.cc
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/compiler/mlir/xla/ral/ral_metadata.h"
+#include "mlir/xla/ral/ral_metadata.h"
 
 #include "tensorflow/core/platform/test.h"
 
diff --git a/tao_compiler/mlir/xla/ral/test/raw_cuda_test.cc b/tao_compiler/mlir/xla/ral/test/raw_cuda_test.cc
index 84c755929fc..46f5443460a 100644
--- a/tao_compiler/mlir/xla/ral/test/raw_cuda_test.cc
+++ b/tao_compiler/mlir/xla/ral/test/raw_cuda_test.cc
@@ -19,7 +19,7 @@
 
 #include "absl/strings/str_split.h"
 #include "cuda.h"
-#include "tensorflow/compiler/mlir/xla/ral/context/base/cuda/cuda_context_impl.h"
+#include "mlir/xla/ral/context/base/cuda/cuda_context_impl.h"
 
 using namespace tao::ral;
 
@@ -28,22 +28,22 @@ using namespace tao::ral;
 //   bazel build //tensorflow/compiler/mlir:dhlo_compiler_main
 // step 2:
 //   TAO_ENABLE_RAL=true bazel-bin/tensorflow/compiler/mlir/dhlo_compiler_main
-//   tensorflow/compiler/mlir/xla/ral/test/test.mlir
+//   mlir/xla/raltest/test.mlir
 // step 3:
 //   bazel build //tensorflow/compiler/mlir/xla/ral:raw_cuda_test
 // step 4:
 //   bazel build //tensorflow/compiler/mlir/xla/ral:libral_base_context.so
 // step 5: h/d for host/device
-//   bazel-bin/tensorflow/compiler/mlir/xla/ral/raw_cuda_test
-//   bazel-bin/tensorflow/compiler/mlir/xla/ral/libral_base_context.so ./out.so
+//   bazel-bin/mlir/xla/ralraw_cuda_test
+//   bazel-bin/mlir/xla/rallibral_base_context.so ./out.so
 //   -o1 -i2 2x3xf32_h 2x3xf32_d [f32_d]
 
 // In case you may need to debug llvm generated code:
 // (here tmp.ll refers to the generated llvm ir after the last pass during
 // step 2.) llvm-as tmp.ll llc --debugger-tune=gdb --relocation-model=pic
 // --filetype=obj tmp.bc gcc tmp.o -shared -o out.so gdb
-// bazel-bin/tensorflow/compiler/mlir/xla/ral/raw_cuda_test
-//   r bazel-bin/tensorflow/compiler/mlir/xla/ral/libral_base_context.so
+// bazel-bin/mlir/xla/ralraw_cuda_test
+//   r bazel-bin/mlir/xla/rallibral_base_context.so
 //   ./out.so
 
 static int32_t reportErrorIfAny(CUresult result, const char* where) {