Merge remote-tracking branch 'upstream/main'

.github/workflows/ci_pip.yml

@@ -0,0 +1,40 @@
+name: CI_pip_no_jaxtrain
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  # Allows to run this workflow manually from the Actions tab on GitHub.
+  workflow_dispatch:
+
+jobs:
+  test-ubuntu:
+    name: "test on ${{ matrix.python-version }} on ${{ matrix.os }}"
+    runs-on: "${{ matrix.os }}"
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11"]
+        os: [ubuntu-latest]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Chirp and its dependencies via pip.
+        run: |
+          sudo apt-get update
+          sudo apt-get install libsndfile1 ffmpeg
+          pip install absl-py
+          pip install requests
+          pip install tensorflow-cpu
+          pip install git+https://github.com/google-research/perch.git
+      - name: Test with unittest
+        run: python -m unittest discover -s chirp/tests -p "*test.py"
+      - name: Test inference with unittest
+        run: python -m unittest discover -s chirp/inference/tests -p "*test.py"
+      - name: Test hoplite with unittest
+        run: python -m unittest discover -s chirp/projects/agile2/tests -p "*test.py"
+      - name: Test agile2 with unittest
+        run: python -m unittest discover -s chirp/projects/hoplite/tests -p "*test.py"

chirp/projects/zoo/models.py

@@ -33,8 +33,6 @@
 import tensorflow.compat.v1 as tf1
 import tensorflow_hub as hub
 
-from ai_edge_litert import interpreter as tfl_interpreter  # pylint: disable=g-direct-tensorflow-import
-
 
 @dataclasses.dataclass
 class SeparateEmbedModel(zoo_interface.EmbeddingModel):
@@ -328,7 +326,7 @@ def from_config(cls, config: config_dict.ConfigDict) -> 'BirdNet':
       with tempfile.NamedTemporaryFile() as tmpf:
         model_file = epath.Path(config.model_path)
         model_file.copy(tmpf.name, overwrite=True)
-        model = tfl_interpreter.Interpreter(
+        model = tf.lite.Interpreter(
             tmpf.name, num_threads=config.num_tflite_threads
         )
       model.allocate_tensors()

chirp/train_tests/frontend_test.py

@@ -23,7 +23,6 @@
 
 from absl.testing import absltest
 from absl.testing import parameterized
-from ai_edge_litert import interpreter as tfl_interpreter  # pylint: disable=g-direct-tensorflow-import
 
 
 class FrontendTest(parameterized.TestCase):
@@ -201,7 +200,7 @@ def test_tflite_stft_export(
     tflite_float_model = converter.convert()
 
     # Use the converted TFLite model.
-    interpreter = tfl_interpreter.Interpreter(model_content=tflite_float_model)
+    interpreter = tf.lite.Interpreter(model_content=tflite_float_model)
     interpreter.allocate_tensors()
     input_tensor = interpreter.get_input_details()[0]
     output_tensor = interpreter.get_output_details()[0]
@@ -248,7 +247,7 @@ def test_simple_melspec(self):
     tflite_float_model = converter.convert()
 
     # Use the converted TFLite model.
-    interpreter = tfl_interpreter.Interpreter(model_content=tflite_float_model)
+    interpreter = tf.lite.Interpreter(model_content=tflite_float_model)
     interpreter.allocate_tensors()
     input_tensor = interpreter.get_input_details()[0]
     output_tensor = interpreter.get_output_details()[0]

pyproject.toml

@@ -12,7 +12,6 @@ license = "Apache 2.0"
 # See: https://python-poetry.org/docs/managing-dependencies/#dependency-groups
 python = ">=3.10,<3.12"
 absl-py = "^1.4.0"
-ai-edge-litert = "^1.0.0"
 apache-beam = {version = "^2.50.0", extras = ["gcp"]}
 clu = "^0.0.9"
 flax = "^0.8.1"