ai-edge-torch-nightly 0.3.0.dev20240815__py3-none-any.whl → 0.3.0.dev20240816__py3-none-any.whl

ai_edge_torch/hlfb/test/test_mark_pattern.py

@@ -51,7 +51,12 @@ class TestMarkPattern(googletest.TestCase):
     mark_pattern.mark_pattern(exported_program.graph_module, pattern)
     mlir = _export_stablehlo_mlir(exported_program)
 
-    self.assertEqual(mlir.count('stablehlo.composite "test.add"'), 2)
+    lowertools.assert_string_count(
+        self,
+        mlir,
+        {'stablehlo.composite "test.add"': 2},
+        {"stablehlo.custom_call @mark_tensor": 6},
+    )
 
   def test_mark_pattern_with_attr_builder(self):
     class TestModel(torch.nn.Module):
@@ -72,9 +77,15 @@ class TestMarkPattern(googletest.TestCase):
     mark_pattern.mark_pattern(exported_program.graph_module, pattern)
     mlir = _export_stablehlo_mlir(exported_program)
 
-    self.assertEqual(mlir.count('stablehlo.composite "test.add"'), 2)
-    self.assertEqual(
-        mlir.count('composite_attributes = {alias = "test.test_add"}'), 2
+    lowertools.assert_string_count(
+        self,
+        mlir,
+        {
+            'stablehlo.composite "test.add"': 2,
+            'composite_attributes = {alias = "test.test_add"}': 2,
+        },
+        {"stablehlo.custom_call @mark_tensor": 6},
+        {'{"alias": "test.test_add"}': 2},
     )
 
   def test_mark_pattern_with_scalar_attr_tracker(self):
@@ -104,9 +115,17 @@ class TestMarkPattern(googletest.TestCase):
     mark_pattern.mark_pattern(exported_program.graph_module, pattern)
     mlir = _export_stablehlo_mlir(exported_program)
 
-    self.assertEqual(mlir.count('stablehlo.composite "test.log_softmax"'), 5)
-    self.assertEqual(mlir.count("composite_attributes = {dim = 0 : i64}"), 3)
-    self.assertEqual(mlir.count("composite_attributes = {dim = 1 : i64}"), 2)
+    lowertools.assert_string_count(
+        self,
+        mlir,
+        {
+            'stablehlo.composite "test.log_softmax"': 5,
+            "composite_attributes = {dim = 0 : i64}": 3,
+            "composite_attributes = {dim = 1 : i64}": 2,
+        },
+        {"stablehlo.custom_call @mark_tensor": 10},
+        {'{"dim": 0}': 3, '{"dim": 1}': 2},
+    )
 
   def test_mark_tangent_model_and_pattern_input(self):
     class TestModel(torch.nn.Module):
@@ -128,7 +147,12 @@ class TestMarkPattern(googletest.TestCase):
     mark_pattern.mark_pattern(exported_program.graph_module, pattern)
     mlir = _export_stablehlo_mlir(exported_program)
 
-    self.assertEqual(mlir.count('stablehlo.composite "test.relu'), 1)
+    lowertools.assert_string_count(
+        self,
+        mlir,
+        {'stablehlo.composite "test.relu"': 1},
+        {"stablehlo.custom_call @mark_tensor": 2},
+    )
 
 
 if __name__ == "__main__":

ai_edge_torch/hlfb/test/test_stablehlo_composite_builder.py

@@ -16,6 +16,7 @@
 
 import math
 
+from ai_edge_torch import config
 from ai_edge_torch import lowertools
 from ai_edge_torch.hlfb import StableHLOCompositeBuilder
 import torch
@@ -29,6 +30,10 @@ def _export_stablehlo_mlir(model, args):
   return lowertools.exported_program_to_mlir_text(ep)
 
 
+@googletest.skipIf(
+    not config.Config.use_torch_xla,
+    reason="The odml_torch counter part is in odml_torch.",
+)
 class TestStableHLOCompositeBuilder(googletest.TestCase):
 
   def test_build_composite(self):

ai_edge_torch/lowertools/__init__.py

@@ -14,3 +14,4 @@
 # ==============================================================================
 
 from ._shim import *
+from .test_utils import *

ai_edge_torch/lowertools/odml_torch_utils.py

@@ -28,6 +28,7 @@ import tensorflow as tf
 import torch
 
 from tensorflow.compiler.tf2xla.python import xla as tfxla
+from tensorflow.lite.python import conversion_metadata_schema_py_generated as conversion_metadata_fb
 
 MlirBundle = odml_torch.export.MlirLowered
 
@@ -162,7 +163,9 @@ def merged_bundle_to_tfl_model(
     )
 
     converter = tf.lite.TFLiteConverter.from_saved_model(temp_dir_path)
+    converter._set_original_model_type(conversion_metadata_fb.ModelType.PYTORCH)
     converter._experimental_enable_composite_direct_lowering = True
+    converter.model_origin_framework = "PYTORCH"
 
     conversion_utils.apply_tfl_converter_flags(converter, _tfl_converter_flags)
 

ai_edge_torch/lowertools/test_utils.py

@@ -0,0 +1,60 @@
+# Copyright 2024 The AI Edge Torch Authors.
+#
+# 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.
+# ==============================================================================
+
+import re
+from typing import Optional
+from ai_edge_torch import config
+from tensorflow.python.platform import googletest
+
+
+def _extract_backend_configs(mlir):
+  mlir = mlir.replace("\\22", '"')
+  configs = []
+  for match in re.finditer(r"backend_config\s*=\s*\"(\{.*\})\"", mlir):
+    configs.append(match.group(1))
+  return "\n".join(configs)
+
+
+def assert_string_count(
+    test_case: googletest.TestCase,
+    mlir: str,
+    torch_xla_pattern_counter: dict[str, int],
+    odml_torch_pattern_counter: dict[str, int],
+    odml_torch_attr_counter: Optional[dict[str, int]] = None,
+):
+
+  if odml_torch_attr_counter is None:
+    odml_torch_attr_counter = {}
+
+  if config.Config.use_torch_xla:
+    for key in torch_xla_pattern_counter:
+      test_case.assertEqual(
+          mlir.count(key),
+          torch_xla_pattern_counter[key],
+      )
+  else:
+    for key in odml_torch_pattern_counter:
+      test_case.assertEqual(
+          mlir.count(key),
+          odml_torch_pattern_counter[key],
+      )
+    backend_configs = _extract_backend_configs(mlir)
+    print("backend_configs:")
+    print(backend_configs)
+    for key in odml_torch_attr_counter:
+      test_case.assertEqual(
+          backend_configs.count(key),
+          odml_torch_attr_counter[key],
+      )

ai_edge_torch/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 # ==============================================================================
 
-__version__ = "0.3.0.dev20240815"
+__version__ = "0.3.0.dev20240816"

{ai_edge_torch_nightly-0.3.0.dev20240815.dist-info → ai_edge_torch_nightly-0.3.0.dev20240816.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ai-edge-torch-nightly
-Version: 0.3.0.dev20240815
+Version: 0.3.0.dev20240816
 Summary: Supporting PyTorch models with the Google AI Edge TFLite runtime.
 Home-page: https://github.com/google-ai-edge/ai-edge-torch
 Keywords: On-Device ML,AI,Google,TFLite,PyTorch,LLMs,GenAI

{ai_edge_torch_nightly-0.3.0.dev20240815.dist-info → ai_edge_torch_nightly-0.3.0.dev20240816.dist-info}/RECORD

@@ -2,7 +2,7 @@ ai_edge_torch/__init__.py,sha256=48qP37uHT90YPs4eIUQxCiWVwqGEX3idCUs6mQKvX1U,116
 ai_edge_torch/config.py,sha256=PCd9PVrbUNeVIUDFUCnW4goDWU4bjouK28yMYU6VOi0,877
 ai_edge_torch/conftest.py,sha256=r0GTrhMRhlmOGrrkvumHN8hkmyug6WvF60vWq8wRIBI,758
 ai_edge_torch/model.py,sha256=5DYNpFVwvI1w0JbAC1hn83NJVGS1WPX7n742419PMqs,4558
-ai_edge_torch/version.py,sha256=Ac80tDmZqQ9SHOuHGuT0szYDNOLnaak-9rePRq6P7eE,706
+ai_edge_torch/version.py,sha256=UxuGFkLOzBGL1eu0wNKnHSaqw7KhjNX3AGtSb5cAvRo,706
 ai_edge_torch/_convert/__init__.py,sha256=hHLluseD2R0Hh4W6XZRIXY_dRQeYudjsrKGf6LZz65g,671
 ai_edge_torch/_convert/conversion.py,sha256=kcv_QgNgeyDmrqwdzHicGNP68w6zF7GJg7YkMEIXp4Q,3759
 ai_edge_torch/_convert/conversion_utils.py,sha256=Sr8qXVcTwc-ZnZmK7yxVrIOOp1S_vNrwzC0zUvLTI2o,2160
@@ -122,12 +122,13 @@ ai_edge_torch/hlfb/mark_pattern/__init__.py,sha256=cjTprggj_cuktSCm7-A25e7Shop3k
 ai_edge_torch/hlfb/mark_pattern/passes.py,sha256=pjkKcI1nHECPluAt87cFBrt1DP0f3ge7rHq1NhCkBIE,1936
 ai_edge_torch/hlfb/mark_pattern/pattern.py,sha256=uiYRfzD1T8deCEAGfdAFusRbI41m14zeTt0Lz5lNT3M,9808
 ai_edge_torch/hlfb/test/__init__.py,sha256=hHLluseD2R0Hh4W6XZRIXY_dRQeYudjsrKGf6LZz65g,671
-ai_edge_torch/hlfb/test/test_mark_pattern.py,sha256=oYB0RPW-tHOwW9gQFH9GtHKO_Mmh1lkoiemXmTfySqc,4383
-ai_edge_torch/hlfb/test/test_stablehlo_composite_builder.py,sha256=3vSX5E9ZFFhTPZZX6TMiAsGa_kaXABbN851bRbTFsC0,8297
-ai_edge_torch/lowertools/__init__.py,sha256=0M9TOR80sS5y6dikOsIFYx0P9IomqAdNIuYpgkP4PcI,693
+ai_edge_torch/hlfb/test/test_mark_pattern.py,sha256=e53YNSO2w7Sd9Y717jAr6WKjnXq34Tx_52hXRGtGs3A,4833
+ai_edge_torch/hlfb/test/test_stablehlo_composite_builder.py,sha256=7Qbba7GJCBc-J1TUwWIvrpBK0Hwza9nift7sKpW2YVE,8449
+ai_edge_torch/lowertools/__init__.py,sha256=uKGibEN7n4Tqbe0HiXOEEXWmPL9AUmh34xaYA9yx2sg,719
 ai_edge_torch/lowertools/_shim.py,sha256=ilL7x1ebUBj1clg7bagrX4y_nVSHiGrvDrOVfuTeenE,3039
 ai_edge_torch/lowertools/common_utils.py,sha256=emClsZ_MBlbLG_0BBtyLpkdz4dMWp6SyrNioygRBylk,2973
-ai_edge_torch/lowertools/odml_torch_utils.py,sha256=5XVI2ovptp1wsDZcyyaZDgT4oUa1McOiE-PrKhXNhFo,6316
+ai_edge_torch/lowertools/odml_torch_utils.py,sha256=32cak8uiXFIVdkaYFhIW1fWG4NzLrYq-w8xK0pNkhYc,6547
+ai_edge_torch/lowertools/test_utils.py,sha256=vsjaX3Ix2U1163jVUNSJgK9io2WNUtJjRvNFE9DrqF4,1932
 ai_edge_torch/lowertools/torch_xla_utils.py,sha256=-g0NldtVOTCQtX3V2XEjuCQO_I52nSNQlu0r_rIS2IE,8635
 ai_edge_torch/quantize/__init__.py,sha256=aB5dXot04bqyUhpsDFvxt9CIi15QAC4euvqOndJ0XLU,714
 ai_edge_torch/quantize/pt2e_quantizer.py,sha256=CKIEhs9jCcna64qj1jFH9zEbMbRdyeGV_TmSqEBPjes,15741
@@ -136,8 +137,8 @@ ai_edge_torch/quantize/quant_config.py,sha256=U0KisSW-uZkoMJcy-ZP9W57p3tsa594fr9
 ai_edge_torch/testing/__init__.py,sha256=hHLluseD2R0Hh4W6XZRIXY_dRQeYudjsrKGf6LZz65g,671
 ai_edge_torch/testing/model_coverage/__init__.py,sha256=5P8J6Zk5YYtDvTBucFvB9NGSRI7Gw_24WnrbhXgycEE,765
 ai_edge_torch/testing/model_coverage/model_coverage.py,sha256=UPB448aMDUyC0HNYVqio2rcJPnDN0tBQMP08J6vPYew,4718
-ai_edge_torch_nightly-0.3.0.dev20240815.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-ai_edge_torch_nightly-0.3.0.dev20240815.dist-info/METADATA,sha256=aK9kjCcC_P6dkcvL_vcrXJLg7sn3Pfb2jlpSMrrKJ6Q,1885
-ai_edge_torch_nightly-0.3.0.dev20240815.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-ai_edge_torch_nightly-0.3.0.dev20240815.dist-info/top_level.txt,sha256=5KXRaF2hwkApYxf7Y8y_tVb9aulGTlbOoNdbx1aKRkE,14
-ai_edge_torch_nightly-0.3.0.dev20240815.dist-info/RECORD,,
+ai_edge_torch_nightly-0.3.0.dev20240816.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+ai_edge_torch_nightly-0.3.0.dev20240816.dist-info/METADATA,sha256=c3BtvxGP-9OippYjgb8nO-_hfTW3hRVbPiFUH0ldb38,1885
+ai_edge_torch_nightly-0.3.0.dev20240816.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+ai_edge_torch_nightly-0.3.0.dev20240816.dist-info/top_level.txt,sha256=5KXRaF2hwkApYxf7Y8y_tVb9aulGTlbOoNdbx1aKRkE,14
+ai_edge_torch_nightly-0.3.0.dev20240816.dist-info/RECORD,,