Move MLIR-based test files to lite/testing/op_tests.
PiperOrigin-RevId: 390166941
Change-Id: I8f7136b0ea947394016a6e9edf677507084ee83d
diff --git a/tensorflow/lite/experimental/mlir/testing/build_def.bzl b/tensorflow/lite/experimental/mlir/testing/build_def.bzl
index b052f5d..edbfd79 100644
--- a/tensorflow/lite/experimental/mlir/testing/build_def.bzl
+++ b/tensorflow/lite/experimental/mlir/testing/build_def.bzl
@@ -22,7 +22,6 @@
def mlir_only_generated_test_models():
return [
"avg_pool3d",
- "batchmatmul",
"broadcast_args",
"broadcast_to",
"broadcast_gradient_args",
@@ -33,9 +32,7 @@
"conv3d",
"conv3d_transpose",
"cumsum",
- # TODO(b/186563810): Enable after resolving tensorflow_addons dep issue
- # that causes test failures in the exported codebase.
- # copybara:uncomment_begin
+ # copybara:uncomment_begin(Exclude tests that depend on tensorflow_addons APIs)
# "dense_image_warp",
# copybara:uncomment_end
"dynamic_rnn",
diff --git a/tensorflow/lite/experimental/mlir/testing/generate_examples.py b/tensorflow/lite/experimental/mlir/testing/generate_examples.py
index 39c052d..3bdd86f 100644
--- a/tensorflow/lite/experimental/mlir/testing/generate_examples.py
+++ b/tensorflow/lite/experimental/mlir/testing/generate_examples.py
@@ -28,55 +28,55 @@
import tensorflow.compat.v1 as tf
from tensorflow.lite.experimental.mlir.testing import mlir_convert
-# pylint: disable=unused-import
-from tensorflow.lite.experimental.mlir.testing.op_tests.batchmatmul import make_batchmatmul_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.broadcast_args import make_broadcast_args_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.broadcast_gradient_args import make_broadcast_gradient_args_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.broadcast_to import make_broadcast_to_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.complex_abs import make_complex_abs_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.cond import make_cond_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.control_dep import make_control_dep_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.conv3d import make_conv3d_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.conv3d_transpose import make_conv3d_transpose_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.conv_bias_activation import make_conv_bias_relu6_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.cumsum import make_cumsum_tests
-# Placeholder for make_dense_image_warp_tests import
-from tensorflow.lite.experimental.mlir.testing.op_tests.dynamic_rnn import make_dynamic_rnn_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.einsum import make_einsum_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.identify_dilated_conv import make_identify_dilated_conv_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.identify_dilated_conv1d import make_identify_dilated_conv1d_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.imag import make_imag_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.irfft2d import make_irfft2d_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.is_finite import make_is_finite_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.max_pool_with_argmax import make_max_pool_with_argmax_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.parse_example import make_parse_example_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.pool3d import make_avg_pool3d_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.pool3d import make_max_pool3d_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.real import make_real_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.reciprocal import make_reciprocal_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.rfft import make_rfft_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.rfft2d import make_rfft2d_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.roll import make_roll_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.roll import make_roll_with_constant_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.segment_sum import make_segment_sum_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.shape_to_strided_slice import make_shape_to_strided_slice_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.softplus import make_softplus_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.static_hashtable import make_static_hashtable_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.static_rnn_with_control_flow_v2 import make_static_rnn_with_control_flow_v2_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.stft import make_stft_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.tensor_list_concat import make_tensor_list_concat_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.tensor_list_dynamic_shape import make_tensor_list_dynamic_shape_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.tensor_list_get_item import make_tensor_list_get_item_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.tensor_list_length import make_tensor_list_length_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.tensor_list_resize import make_tensor_list_resize_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.tensor_list_set_item import make_tensor_list_set_item_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.tensor_scatter_add import make_tensor_scatter_add_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.tensor_scatter_update import make_tensor_scatter_update_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.where_v2 import make_where_v2_tests
-from tensorflow.lite.experimental.mlir.testing.op_tests.while_loop import make_while_tests
-
from tensorflow.lite.testing import generate_examples_lib
+# pylint: disable=unused-import
+from tensorflow.lite.testing.op_tests.batchmatmul import make_batchmatmul_tests
+from tensorflow.lite.testing.op_tests.broadcast_args import make_broadcast_args_tests
+from tensorflow.lite.testing.op_tests.broadcast_gradient_args import make_broadcast_gradient_args_tests
+from tensorflow.lite.testing.op_tests.broadcast_to import make_broadcast_to_tests
+from tensorflow.lite.testing.op_tests.complex_abs import make_complex_abs_tests
+from tensorflow.lite.testing.op_tests.cond import make_cond_tests
+from tensorflow.lite.testing.op_tests.control_dep import make_control_dep_tests
+from tensorflow.lite.testing.op_tests.conv3d import make_conv3d_tests
+from tensorflow.lite.testing.op_tests.conv3d_transpose import make_conv3d_transpose_tests
+from tensorflow.lite.testing.op_tests.conv_bias_activation import make_conv_bias_relu6_tests
+from tensorflow.lite.testing.op_tests.cumsum import make_cumsum_tests
+# Placeholder for make_dense_image_warp_tests import
+from tensorflow.lite.testing.op_tests.dynamic_rnn import make_dynamic_rnn_tests
+from tensorflow.lite.testing.op_tests.einsum import make_einsum_tests
+from tensorflow.lite.testing.op_tests.identify_dilated_conv import make_identify_dilated_conv_tests
+from tensorflow.lite.testing.op_tests.identify_dilated_conv1d import make_identify_dilated_conv1d_tests
+from tensorflow.lite.testing.op_tests.imag import make_imag_tests
+from tensorflow.lite.testing.op_tests.irfft2d import make_irfft2d_tests
+from tensorflow.lite.testing.op_tests.is_finite import make_is_finite_tests
+from tensorflow.lite.testing.op_tests.max_pool_with_argmax import make_max_pool_with_argmax_tests
+from tensorflow.lite.testing.op_tests.parse_example import make_parse_example_tests
+from tensorflow.lite.testing.op_tests.pool3d import make_avg_pool3d_tests
+from tensorflow.lite.testing.op_tests.pool3d import make_max_pool3d_tests
+from tensorflow.lite.testing.op_tests.real import make_real_tests
+from tensorflow.lite.testing.op_tests.reciprocal import make_reciprocal_tests
+from tensorflow.lite.testing.op_tests.rfft import make_rfft_tests
+from tensorflow.lite.testing.op_tests.rfft2d import make_rfft2d_tests
+from tensorflow.lite.testing.op_tests.roll import make_roll_tests
+from tensorflow.lite.testing.op_tests.roll import make_roll_with_constant_tests
+from tensorflow.lite.testing.op_tests.segment_sum import make_segment_sum_tests
+from tensorflow.lite.testing.op_tests.shape_to_strided_slice import make_shape_to_strided_slice_tests
+from tensorflow.lite.testing.op_tests.softplus import make_softplus_tests
+from tensorflow.lite.testing.op_tests.static_hashtable import make_static_hashtable_tests
+from tensorflow.lite.testing.op_tests.static_rnn_with_control_flow_v2 import make_static_rnn_with_control_flow_v2_tests
+from tensorflow.lite.testing.op_tests.stft import make_stft_tests
+from tensorflow.lite.testing.op_tests.tensor_list_concat import make_tensor_list_concat_tests
+from tensorflow.lite.testing.op_tests.tensor_list_dynamic_shape import make_tensor_list_dynamic_shape_tests
+from tensorflow.lite.testing.op_tests.tensor_list_get_item import make_tensor_list_get_item_tests
+from tensorflow.lite.testing.op_tests.tensor_list_length import make_tensor_list_length_tests
+from tensorflow.lite.testing.op_tests.tensor_list_resize import make_tensor_list_resize_tests
+from tensorflow.lite.testing.op_tests.tensor_list_set_item import make_tensor_list_set_item_tests
+from tensorflow.lite.testing.op_tests.tensor_scatter_add import make_tensor_scatter_add_tests
+from tensorflow.lite.testing.op_tests.tensor_scatter_update import make_tensor_scatter_update_tests
+from tensorflow.lite.testing.op_tests.where_v2 import make_where_v2_tests
+from tensorflow.lite.testing.op_tests.while_loop import make_while_tests
+
MLIR_CONVERTER_KNOWN_BUGS = {
# We need to support dynamic_rnn case.
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/dense_image_warp.py b/tensorflow/lite/experimental/mlir/testing/op_tests/dense_image_warp.py
deleted file mode 100644
index 358010d..0000000
--- a/tensorflow/lite/experimental/mlir/testing/op_tests/dense_image_warp.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-# ==============================================================================
-"""Test configs for dense_image_warp."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import tensorflow as tf
-# Placeholder for internal API
-
-from tensorflow.lite.testing.zip_test_utils import create_tensor_data
-from tensorflow.lite.testing.zip_test_utils import ExtraTocoOptions
-from tensorflow.lite.testing.zip_test_utils import make_zip_of_tests
-from tensorflow.lite.testing.zip_test_utils import register_make_test_function
-
-
-@register_make_test_function()
-def make_dense_image_warp_tests(options):
- """Make a set of tests to do dense_image_warp."""
-
- test_parameters = [{
- 'input_size': [[2, 4, 4, 1], [2, 4, 3, 3], [3, 7, 9, 2]],
- 'flow_size': [[2, 4, 4, 2], [2, 4, 3, 2], [3, 7, 9, 2]],
- }]
-
- def build_graph(parameters):
- """Build the exp op testing graph."""
- input_tensor = tf.compat.v1.placeholder(
- dtype=tf.float32, name='input', shape=parameters['input_size'])
- flow_tensor = tf.compat.v1.placeholder(
- dtype=tf.float32, name='flow', shape=parameters['flow_size'])
- output = dense_image_warp_annotated(input_tensor, flow_tensor)
- return [input_tensor, flow_tensor], [output]
-
- def build_inputs(parameters, sess, inputs, outputs):
- values = [
- create_tensor_data(
- tf.float32, parameters['input_size'], min_value=-10, max_value=10),
- create_tensor_data(
- tf.float32, parameters['flow_size'], min_value=-10, max_value=10)
- ]
- return values, sess.run(outputs, feed_dict=dict(zip(inputs, values)))
-
- extra_toco_options = ExtraTocoOptions()
- extra_toco_options.allow_custom_ops = True
- options.expected_ops_in_converted_model = ['DenseImageWarp']
- make_zip_of_tests(
- options,
- test_parameters,
- build_graph,
- build_inputs,
- extra_toco_options,
- expected_tf_failures=6)
diff --git a/tensorflow/lite/testing/BUILD b/tensorflow/lite/testing/BUILD
index db76fdf..5fbc5c4 100644
--- a/tensorflow/lite/testing/BUILD
+++ b/tensorflow/lite/testing/BUILD
@@ -122,8 +122,11 @@
srcs_version = "PY3",
deps = [
":zip_test_utils",
- "//tensorflow:tensorflow_py",
"//third_party/py/numpy",
+ "//tensorflow:tensorflow_py",
+ # copybara:uncomment_begin(b/186563810)
+ # "//third_party/py/tensorflow_addons",
+ # copybara:uncomment_end
],
)
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/batchmatmul.py b/tensorflow/lite/testing/op_tests/batchmatmul.py
similarity index 96%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/batchmatmul.py
rename to tensorflow/lite/testing/op_tests/batchmatmul.py
index 41f89be..d2a3621 100644
--- a/tensorflow/lite/experimental/mlir/testing/op_tests/batchmatmul.py
+++ b/tensorflow/lite/testing/op_tests/batchmatmul.py
@@ -92,8 +92,8 @@
outputs, feed_dict=dict(zip(inputs, [input0_value])))
return [input0_value], output_values
else:
- input1_shape = parameters["shapes"][3] if not adj_b else \
- swap_last_two_dims(*parameters["shapes"][3])
+ input1_shape = parameters["shapes"][
+ 3] if not adj_b else swap_last_two_dims(*parameters["shapes"][3])
input1_value = create_tensor_data(
parameters["dtype"], input1_shape, min_value=-1.0, max_value=1.0)
output_values = sess.run(
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/broadcast_args.py b/tensorflow/lite/testing/op_tests/broadcast_args.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/broadcast_args.py
rename to tensorflow/lite/testing/op_tests/broadcast_args.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/broadcast_gradient_args.py b/tensorflow/lite/testing/op_tests/broadcast_gradient_args.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/broadcast_gradient_args.py
rename to tensorflow/lite/testing/op_tests/broadcast_gradient_args.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/broadcast_to.py b/tensorflow/lite/testing/op_tests/broadcast_to.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/broadcast_to.py
rename to tensorflow/lite/testing/op_tests/broadcast_to.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/complex_abs.py b/tensorflow/lite/testing/op_tests/complex_abs.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/complex_abs.py
rename to tensorflow/lite/testing/op_tests/complex_abs.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/cond.py b/tensorflow/lite/testing/op_tests/cond.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/cond.py
rename to tensorflow/lite/testing/op_tests/cond.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/control_dep.py b/tensorflow/lite/testing/op_tests/control_dep.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/control_dep.py
rename to tensorflow/lite/testing/op_tests/control_dep.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/conv3d.py b/tensorflow/lite/testing/op_tests/conv3d.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/conv3d.py
rename to tensorflow/lite/testing/op_tests/conv3d.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/conv3d_transpose.py b/tensorflow/lite/testing/op_tests/conv3d_transpose.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/conv3d_transpose.py
rename to tensorflow/lite/testing/op_tests/conv3d_transpose.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/conv_bias_activation.py b/tensorflow/lite/testing/op_tests/conv_bias_activation.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/conv_bias_activation.py
rename to tensorflow/lite/testing/op_tests/conv_bias_activation.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/cumsum.py b/tensorflow/lite/testing/op_tests/cumsum.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/cumsum.py
rename to tensorflow/lite/testing/op_tests/cumsum.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/dynamic_rnn.py b/tensorflow/lite/testing/op_tests/dynamic_rnn.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/dynamic_rnn.py
rename to tensorflow/lite/testing/op_tests/dynamic_rnn.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/einsum.py b/tensorflow/lite/testing/op_tests/einsum.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/einsum.py
rename to tensorflow/lite/testing/op_tests/einsum.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/identify_dilated_conv.py b/tensorflow/lite/testing/op_tests/identify_dilated_conv.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/identify_dilated_conv.py
rename to tensorflow/lite/testing/op_tests/identify_dilated_conv.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/identify_dilated_conv1d.py b/tensorflow/lite/testing/op_tests/identify_dilated_conv1d.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/identify_dilated_conv1d.py
rename to tensorflow/lite/testing/op_tests/identify_dilated_conv1d.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/imag.py b/tensorflow/lite/testing/op_tests/imag.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/imag.py
rename to tensorflow/lite/testing/op_tests/imag.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/irfft2d.py b/tensorflow/lite/testing/op_tests/irfft2d.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/irfft2d.py
rename to tensorflow/lite/testing/op_tests/irfft2d.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/is_finite.py b/tensorflow/lite/testing/op_tests/is_finite.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/is_finite.py
rename to tensorflow/lite/testing/op_tests/is_finite.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/max_pool_with_argmax.py b/tensorflow/lite/testing/op_tests/max_pool_with_argmax.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/max_pool_with_argmax.py
rename to tensorflow/lite/testing/op_tests/max_pool_with_argmax.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/parse_example.py b/tensorflow/lite/testing/op_tests/parse_example.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/parse_example.py
rename to tensorflow/lite/testing/op_tests/parse_example.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/pool3d.py b/tensorflow/lite/testing/op_tests/pool3d.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/pool3d.py
rename to tensorflow/lite/testing/op_tests/pool3d.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/real.py b/tensorflow/lite/testing/op_tests/real.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/real.py
rename to tensorflow/lite/testing/op_tests/real.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/reciprocal.py b/tensorflow/lite/testing/op_tests/reciprocal.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/reciprocal.py
rename to tensorflow/lite/testing/op_tests/reciprocal.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/rfft.py b/tensorflow/lite/testing/op_tests/rfft.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/rfft.py
rename to tensorflow/lite/testing/op_tests/rfft.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/rfft2d.py b/tensorflow/lite/testing/op_tests/rfft2d.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/rfft2d.py
rename to tensorflow/lite/testing/op_tests/rfft2d.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/roll.py b/tensorflow/lite/testing/op_tests/roll.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/roll.py
rename to tensorflow/lite/testing/op_tests/roll.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/segment_sum.py b/tensorflow/lite/testing/op_tests/segment_sum.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/segment_sum.py
rename to tensorflow/lite/testing/op_tests/segment_sum.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/shape_to_strided_slice.py b/tensorflow/lite/testing/op_tests/shape_to_strided_slice.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/shape_to_strided_slice.py
rename to tensorflow/lite/testing/op_tests/shape_to_strided_slice.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/softplus.py b/tensorflow/lite/testing/op_tests/softplus.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/softplus.py
rename to tensorflow/lite/testing/op_tests/softplus.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/static_hashtable.py b/tensorflow/lite/testing/op_tests/static_hashtable.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/static_hashtable.py
rename to tensorflow/lite/testing/op_tests/static_hashtable.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/static_rnn_with_control_flow_v2.py b/tensorflow/lite/testing/op_tests/static_rnn_with_control_flow_v2.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/static_rnn_with_control_flow_v2.py
rename to tensorflow/lite/testing/op_tests/static_rnn_with_control_flow_v2.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/stft.py b/tensorflow/lite/testing/op_tests/stft.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/stft.py
rename to tensorflow/lite/testing/op_tests/stft.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/tensor_list_concat.py b/tensorflow/lite/testing/op_tests/tensor_list_concat.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/tensor_list_concat.py
rename to tensorflow/lite/testing/op_tests/tensor_list_concat.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/tensor_list_dynamic_shape.py b/tensorflow/lite/testing/op_tests/tensor_list_dynamic_shape.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/tensor_list_dynamic_shape.py
rename to tensorflow/lite/testing/op_tests/tensor_list_dynamic_shape.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/tensor_list_get_item.py b/tensorflow/lite/testing/op_tests/tensor_list_get_item.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/tensor_list_get_item.py
rename to tensorflow/lite/testing/op_tests/tensor_list_get_item.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/tensor_list_length.py b/tensorflow/lite/testing/op_tests/tensor_list_length.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/tensor_list_length.py
rename to tensorflow/lite/testing/op_tests/tensor_list_length.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/tensor_list_resize.py b/tensorflow/lite/testing/op_tests/tensor_list_resize.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/tensor_list_resize.py
rename to tensorflow/lite/testing/op_tests/tensor_list_resize.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/tensor_list_set_item.py b/tensorflow/lite/testing/op_tests/tensor_list_set_item.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/tensor_list_set_item.py
rename to tensorflow/lite/testing/op_tests/tensor_list_set_item.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/tensor_scatter_add.py b/tensorflow/lite/testing/op_tests/tensor_scatter_add.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/tensor_scatter_add.py
rename to tensorflow/lite/testing/op_tests/tensor_scatter_add.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/tensor_scatter_update.py b/tensorflow/lite/testing/op_tests/tensor_scatter_update.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/tensor_scatter_update.py
rename to tensorflow/lite/testing/op_tests/tensor_scatter_update.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/where_v2.py b/tensorflow/lite/testing/op_tests/where_v2.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/where_v2.py
rename to tensorflow/lite/testing/op_tests/where_v2.py
diff --git a/tensorflow/lite/experimental/mlir/testing/op_tests/while_loop.py b/tensorflow/lite/testing/op_tests/while_loop.py
similarity index 100%
rename from tensorflow/lite/experimental/mlir/testing/op_tests/while_loop.py
rename to tensorflow/lite/testing/op_tests/while_loop.py
