Update tensorflow_gnn usage of tf.lite.interpreter to run ai-edge-litert.interpreter

BUILD

@@ -43,6 +43,15 @@ py_library(
     deps = [],
 )
 
+py_library(
+    name = "expect_ai_edge_litert_installed",
+    # This is a dummy rule used as a ai-edge-litert dependency in open-source.
+    # We expect ai-edge-litert to already be installed on the system, e.g. via
+    # `pip install ai-edge-litert`
+    visibility = ["//visibility:public"],
+    deps = [],
+)
+
 py_library(
     name = "expect_tf_keras_installed",
     # This is a dummy rule used as a tensorflow dependency in open-source.

README.md

@@ -68,6 +68,8 @@ Key platform requirements:
     TF_USE_LEGACY_KERAS=1**,
     see our [Keras version](tensorflow_gnn/docs/guide/keras_version.md) guide for details.
   * Apache Beam for distributed graph sampling.
+  * For some tests or scripts that requires tensorflow.lite it is required to
+    install ai-edge-litert by using `pip install ai-edge-litert`
 
 TF-GNN is developed and tested on Linux. Running on other platforms supported
 by TensorFlow may be possible.

kokoro/github/ubuntu/cpu/build_versioned.sh

@@ -24,6 +24,14 @@ sudo apt-get install -y "python${PYTHON_VERSION}"
 sudo update-alternatives --install /usr/bin/python3 python3 "/usr/bin/python$PYTHON_VERSION" 1
 sudo apt-get install -y python$PYTHON_VERSION-venv
 
+echo "====================="
+sudo apt install libstdc++6 -y
+echo $?
+sudo apt install g++-10 -y
+echo $?
+strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX
+echo "DONE INSTALLING"
+
 PYTHON_BINARY="/usr/bin/python${PYTHON_VERSION}"
 PIP_TEST_PREFIX=bazel_pip
 
@@ -39,6 +47,9 @@ rm -rf "$TEST_ROOT"
 mkdir -p "$TEST_ROOT"
 ln -s "$(pwd)"/tensorflow_gnn "$TEST_ROOT"/tensorflow_gnn
 
+# Print the OS version
+cat /etc/os-release
+
 # Prepend common tag filters to a defined env_var
 # For example, tests for TF 2.8 shouldn't run RNG-dependent tests
 # These tag filters are enforced to start with a comma for separation

requirements-dev.txt

@@ -1,4 +1,5 @@
 mock
 wheel
 torch_geometric
-torch < 2
+torch < 2
+ai-edge-litert

tensorflow_gnn/graph/BUILD

@@ -263,6 +263,7 @@ tf_py_test(
         ":graph_tensor_test_utils",
         "//:expect_absl_installed_testing",
         "//:expect_tensorflow_installed",
+        "//:expect_ai_edge_litert_installed",
     ],
 )
 
@@ -280,6 +281,7 @@ tf_py_test(
         ":readout",
         "//:expect_absl_installed_testing",
         "//:expect_tensorflow_installed",
+        "//:expect_ai_edge_litert_installed",
     ],
 )
 

tensorflow_gnn/graph/graph_tensor_ops_test.py

@@ -25,6 +25,9 @@
 from tensorflow_gnn.graph import graph_tensor_ops as ops
 from tensorflow_gnn.graph import pool_ops
 from tensorflow_gnn.graph import readout
+# pylint: disable=g-direct-tensorflow-import
+from ai_edge_litert import interpreter as tfl_interpreter
+# pylint: enable=g-direct-tensorflow-import
 
 as_tensor = tf.convert_to_tensor
 as_ragged = tf.ragged.constant
@@ -642,7 +645,7 @@ def testTFLite(self):
                     f'got TF {tf.__version__}')
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner('serving_default')
     obtained = signature_runner(**test_graph_dict)['final_edge_adjacency']
     self.assertAllEqual(expected, obtained)
@@ -1308,7 +1311,7 @@ def testTFLite(self):
                     f'got TF {tf.__version__}')
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner('serving_default')
     obtained = signature_runner(**test_graph_dict)['final_edge_adjacency']
     self.assertAllEqual(expected, obtained)
@@ -1680,7 +1683,7 @@ def testTFLite(self):
                     f'got TF {tf.__version__}')
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner('serving_default')
     obtained = signature_runner(**test_graph_dict)['final_edge_adjacency']
     self.assertAllEqual(expected, obtained)

tensorflow_gnn/graph/graph_tensor_test.py

@@ -25,6 +25,7 @@
 from tensorflow_gnn.graph import graph_tensor_test_utils as tu
 
 # pylint: disable=g-direct-tensorflow-import
+from ai_edge_litert import interpreter as tfl_interpreter
 from tensorflow.python.framework import type_spec
 # pylint: enable=g-direct-tensorflow-import
 
@@ -1549,7 +1550,7 @@ def testTFLite(self):
                     f'got TF {tf.__version__}')
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner('serving_default')
     obtained = signature_runner(
         **test_graph_dict)['private__make_graph_tensor_merged']
@@ -1752,7 +1753,7 @@ def testTFLite(self):
 
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner('serving_default')
     obtained = signature_runner(
         node_sizes=test_tensor)['node_set_sizes_to_test_results']

tensorflow_gnn/keras/layers/BUILD

@@ -119,6 +119,7 @@ tf_py_test(
         "//tensorflow_gnn/graph:adjacency",
         "//tensorflow_gnn/graph:graph_constants",
         "//tensorflow_gnn/graph:graph_tensor",
+        "//:expect_ai_edge_litert_installed",
     ],
 )
 
@@ -219,6 +220,7 @@ tf_py_test(
         "//:expect_tensorflow_installed",
         "//tensorflow_gnn/graph:graph_constants",
         "//tensorflow_gnn/utils:tf_test_utils",
+        "//:expect_ai_edge_litert_installed",
     ],
 )
 
@@ -257,6 +259,7 @@ tf_py_test(
         "//tensorflow_gnn/graph:preprocessing_common",
         "//tensorflow_gnn/keras:keras_tensors",
         "//tensorflow_gnn/utils:tf_test_utils",
+        "//:expect_ai_edge_litert_installed",
     ],
 )
 

tensorflow_gnn/keras/layers/graph_ops_test.py

@@ -23,6 +23,9 @@
 from tensorflow_gnn.graph import graph_constants as const
 from tensorflow_gnn.graph import graph_tensor as gt
 from tensorflow_gnn.keras.layers import graph_ops
+# pylint: disable=g-direct-tensorflow-import
+from ai_edge_litert import interpreter as tfl_interpreter
+# pylint: enable=g-direct-tensorflow-import
 
 
 class ReadoutTest(tf.test.TestCase, parameterized.TestCase):
@@ -170,7 +173,7 @@ def testTFLite(self, location):
                     f"got TF {tf.__version__}")
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner("serving_default")
     obtained = signature_runner(**test_graph_134_dict)["test_readout"]
     self.assertAllEqual(expected, obtained)
@@ -304,7 +307,7 @@ def testTFLite(self):
                     f"got TF {tf.__version__}")
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner("serving_default")
     obtained = signature_runner(**test_graph_22_dict)["test_readout_first"]
     self.assertAllEqual(expected, obtained)
@@ -431,7 +434,7 @@ def testTFLite(self):
 
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner("serving_default")
     actual = signature_runner(
         **test_graph_structured_readout_dict)["output_layer"]
@@ -565,7 +568,7 @@ def testTFLite(self):
 
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner("serving_default")
     actual = signature_runner(
         **test_graph_structured_readout_dict)["output_layer"]
@@ -628,7 +631,7 @@ def testTFLite(self):
 
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner("serving_default")
     actual = signature_runner(
         **test_graph_structured_readout_dict)["output_layer"]
@@ -750,7 +753,7 @@ def testTFLite(self):
                     f"got TF {tf.__version__}")
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner("serving_default")
     obtained = signature_runner(**test_graph_134_dict)["final_edge_states"]
     self.assertAllEqual(expected, obtained)
@@ -952,7 +955,7 @@ def testTFLite(self, tag, location):
                     f"got TF {tf.__version__}")
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner("serving_default")
     obtained = signature_runner(**test_values)["test_broadcast"]
     self.assertAllEqual(expected, obtained)
@@ -1260,7 +1263,7 @@ def testTFLite(self, tag, location, reduce_type):
                     f"got TF {tf.__version__}")
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner("serving_default")
     obtained = signature_runner(**test_values)["test_pool"]
     self.assertAllEqual(expected, obtained)

tensorflow_gnn/keras/layers/next_state_test.py

@@ -19,6 +19,9 @@
 from tensorflow_gnn.graph import graph_constants as const
 from tensorflow_gnn.keras.layers import next_state as next_state_lib
 from tensorflow_gnn.utils import tf_test_utils as tftu
+# pylint: disable=g-direct-tensorflow-import
+from ai_edge_litert import interpreter as tfl_interpreter
+# pylint: enable=g-direct-tensorflow-import
 
 
 class NextStateFromConcatTest(tf.test.TestCase, parameterized.TestCase):
@@ -179,7 +182,7 @@ def testTFLite(self):
 
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner("serving_default")
     obtained = signature_runner(**test_input_dict)["residual_next_state"]
     self.assertAllClose(expected, obtained)

tensorflow_gnn/keras/layers/padding_ops_test.py

@@ -23,6 +23,9 @@
 from tensorflow_gnn.keras import keras_tensors  # For registration. pylint: disable=unused-import
 from tensorflow_gnn.keras.layers import padding_ops
 from tensorflow_gnn.utils import tf_test_utils as tftu
+# pylint: disable=g-direct-tensorflow-import
+from ai_edge_litert import interpreter as tfl_interpreter
+# pylint: enable=g-direct-tensorflow-import
 
 
 class PadToTotalSizesTest(tf.test.TestCase, parameterized.TestCase):
@@ -119,7 +122,7 @@ def testBasic(self):
     self.skipTest("Padding ops are unsupported in TFLite.")
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner("serving_default")
     obtained = signature_runner(**test_graph_1_dict)["final_node_states"]
     self.assertAllClose(expected, obtained)

tensorflow_gnn/models/gat_v2/BUILD

@@ -110,5 +110,6 @@ tf_py_test(
         "//:expect_tensorflow_installed",
         "//tensorflow_gnn",
         "//tensorflow_gnn/utils:tf_test_utils",
+        "//:expect_ai_edge_litert_installed",
     ],
 )

tensorflow_gnn/models/gat_v2/layers_test.py

@@ -12,13 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for GATv2."""
-
 from absl.testing import parameterized
 import tensorflow as tf
 import tensorflow_gnn as tfgnn
 from tensorflow_gnn.models import gat_v2
 from tensorflow_gnn.utils import tf_test_utils as tftu
+# pylint: disable=g-direct-tensorflow-import
+from ai_edge_litert import interpreter as tfl_interpreter
+# pylint: enable=g-direct-tensorflow-import
 
 
 class GATv2Test(tf.test.TestCase, parameterized.TestCase):
@@ -706,7 +707,7 @@ def testBasic(self):
                     f"got TF {tf.__version__}")
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner("serving_default")
     obtained = signature_runner(**test_graph_1_dict)["final_node_states"]
     self.assertAllClose(expected, obtained)

tensorflow_gnn/models/gcn/BUILD

@@ -47,5 +47,6 @@ tf_py_test(
         "//:expect_tensorflow_installed",
         "//tensorflow_gnn",
         "//tensorflow_gnn/utils:tf_test_utils",
+        "//:expect_ai_edge_litert_installed",
     ],
 )

tensorflow_gnn/models/gcn/gcn_conv_test.py

@@ -12,14 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for gcn_conv."""
 import math
 
 from absl.testing import parameterized
 import tensorflow as tf
 import tensorflow_gnn as tfgnn
 from tensorflow_gnn.models.gcn import gcn_conv
 from tensorflow_gnn.utils import tf_test_utils as tftu
+# pylint: disable=g-direct-tensorflow-import
+from ai_edge_litert import interpreter as tfl_interpreter
+# pylint: enable=g-direct-tensorflow-import
 
 
 class GcnConvTest(tf.test.TestCase, parameterized.TestCase):
@@ -873,7 +875,7 @@ def testBasic(self, add_self_loops, edge_weight_feature_name):
                     f'got TF {tf.__version__}')
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner('serving_default')
     obtained = signature_runner(**test_graph_1_dict)['final_node_states']
     self.assertAllClose(expected, obtained)

tensorflow_gnn/models/graph_sage/BUILD

@@ -46,5 +46,6 @@ tf_py_test(
         "//:expect_tensorflow_installed",
         "//tensorflow_gnn",
         "//tensorflow_gnn/utils:tf_test_utils",
+        "//:expect_ai_edge_litert_installed",
     ],
 )

tensorflow_gnn/models/graph_sage/layers_test.py

@@ -12,16 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for graph_sage."""
-
 import math
 
 from absl.testing import parameterized
 import tensorflow as tf
 import tensorflow_gnn as tfgnn
 from tensorflow_gnn.models.graph_sage import layers as graph_sage
 from tensorflow_gnn.utils import tf_test_utils as tftu
-
+# pylint: disable=g-direct-tensorflow-import
+from ai_edge_litert import interpreter as tfl_interpreter
+# pylint: enable=g-direct-tensorflow-import
 
 _FEATURE_NAME = "f"
 
@@ -626,7 +626,7 @@ def testBasic(self, use_pooling, hidden_units, combine_type):
                     f"got TF {tf.__version__}")
     converter = tf.lite.TFLiteConverter.from_keras_model(model)
     model_content = converter.convert()
-    interpreter = tf.lite.Interpreter(model_content=model_content)
+    interpreter = tfl_interpreter.Interpreter(model_content=model_content)
     signature_runner = interpreter.get_signature_runner("serving_default")
     obtained = signature_runner(**test_graph_1_dict)["final_node_states"]
     self.assertAllClose(expected, obtained)

tensorflow_gnn/models/hgt/BUILD

@@ -106,5 +106,6 @@ tf_py_test(
         "//:expect_tensorflow_installed",
         "//tensorflow_gnn",
         "//tensorflow_gnn/utils:tf_test_utils",
+        "//:expect_ai_edge_litert_installed",
     ],
 )