update litert handling

Author: stefantaubert

.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
         run: |
           pytest -m "load_model" -n auto
 
-  build-and-test-no-litert:
+  build-and-test-standard:
     needs: build-and-dl-models
     runs-on: ${{ matrix.os }}
 
@@ -63,7 +63,7 @@ jobs:
             macos-15-intel,
             windows-2025,
           ]
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v4
@@ -92,27 +92,31 @@ jobs:
 
       - name: Run tests
         run: |
-          pytest -m "not load_model and not repro and (not litert and not gpu)" -n auto
+          pytest -m "not repro and load_model" -n auto --max-worker-restart=0
+          pytest -m "not repro and not load_model and (not litert and not gpu)" -n auto --max-worker-restart=0
+          pytest -m "not repro and not load_model and litert" -n auto --max-worker-restart=0
 
       - name: Test build
         run: |
           python -m build -o dist/
           python -m twine check dist/*
 
-  build-and-test-with-litert:
+  build-and-test-repro:
     needs: build-and-dl-models
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
-        os: [
+        os:
+          [
             ubuntu-slim,
             ubuntu-24.04,
             ubuntu-24.04-arm,
             macos-15,
-            # intel mac and windows not supported for litert
+            macos-15-intel,
+            windows-2025,
           ]
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -128,16 +132,13 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install uv build --upgrade
-          python -m uv pip install --system .[tests,litert]
-
-      # - name: Run linters
-      #   run: |
-      #     ruff check src/mel_cepstral_distance
-      #     ruff check src/mel_cepstral_distance_tests
-
-      # - name: Type checking
-      #   run: mypy
+          python -m uv pip install --system .[tests,repro]
 
       - name: Run tests
         run: |
-          pytest -m "not load_model and not repro and litert" -n auto
+          pytest -m "load_model" -n auto --max-worker-restart=0
+          # run normal tests including repro tests
+          pytest -m "not load_model and (not litert and not gpu)" -n auto --max-worker-restart=0
+          # run litert tests including repro tests
+          pytest -m "not load_model and litert" -n auto --max-worker-restart=0
+          # gpu tests are not supported to be run with repro environment

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Removed `litert` install option, now litert is always installed if possible
 - Improved prediction speed, esp. for half-precision models (+10 seg/s)
 - Lowered dependencies
 - Update `ai-edge-litert` to version 2.0.3 on `repro`
@@ -27,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added `repro` option to be able to get reproducible results
 - Added support for Python 3.13
+- Added CI on GitHub Actions for testing on multiple OS and Python versions
 
 ### Removed
 

pyproject.toml

@@ -42,28 +42,69 @@ dependencies = [
   "psutil >= 5.9.0", # 2021/12/29
   "pyarrow >= 7.0.0", # 2022/02/03
   "tensorflow >= 2.8.0", # 2022/02/02
+  "ai-edge-litert >= 2.0.2 ; python_version < '3.13' and (sys_platform == 'linux' or sys_platform == 'darwin')", # 2025/09/17
 ]
 
 [project.optional-dependencies]
-litert = [
-  "ai-edge-litert >= 2.0.2" # 2025/09/17
-]
 and-cuda = [
   "tensorflow[and-cuda] >= 2.8.0" # 2022/02/02
 ]
 repro = [
-  # "resampy == 0.4.3",
+  # Reproducible results only with Python 3.12 and on CPU
+  # Direct dependencies
   "soundfile == 0.12.1",
   "scipy == 1.16.3",
   "ordered-set == 4.1.0",
   "tqdm == 4.67.1",
-  "numpy == 2.0.2",
-  # "numba == 0.62.1",
+  "numpy == 2.1.0",
   "pandas == 2.3.3",
   "psutil == 7.1.3",
   "pyarrow == 22.0.0",
   "tensorflow == 2.20.0",
-  "ai-edge-litert == 2.0.3; sys_platform == 'linux' or sys_platform == 'darwin'",
+  "ai-edge-litert == 2.0.3 ; sys_platform == 'linux' or sys_platform == 'darwin'",
+  # Indirect dependencies
+  "absl-py == 2.3.1",
+  "astunparse == 1.6.3",
+  "backports.strenum == 1.2.8",
+  "certifi == 2025.11.12",
+  "cffi == 2.0.0",
+  "charset-normalizer == 3.4.4",
+  "flatbuffers == 25.9.23",
+  "gast == 0.6.0",
+  "google-pasta == 0.2.0",
+  "grpcio == 1.76.0",
+  "h5py == 3.15.1",
+  "idna == 3.11",
+  "keras == 3.12.0",
+  "libclang == 18.1.1",
+  "Markdown == 3.10",
+  "markdown-it-py == 4.0.0",
+  "MarkupSafe == 3.0.3",
+  "mdurl == 0.1.2",
+  "ml_dtypes == 0.5.4",
+  "namex == 0.1.0",
+  "opt_einsum == 3.4.0",
+  "optree == 0.18.0",
+  "packaging == 25.0",
+  "pillow == 12.0.0",
+  "protobuf == 6.33.1",
+  "pycparser == 2.23",
+  "Pygments == 2.19.2",
+  "python-dateutil == 2.9.0.post0",
+  "pytz == 2025.2",
+  "requests == 2.32.5",
+  "rich == 14.2.0",
+  "setuptools == 80.9.0",
+  "six == 1.17.0",
+  "tensorboard == 2.20.0",
+  "tensorboard-data-server == 0.7.2",
+  "termcolor == 3.2.0",
+  "typing_extensions == 4.15.0",
+  "tzdata == 2025.2",
+  "urllib3 == 2.5.0",
+  "Werkzeug == 3.1.3",
+  "wheel == 0.45.1",
+  "wrapt == 2.0.1",
 ]
 tests = [
   "uv >= 0.9.7",
@@ -145,7 +186,7 @@ known-first-party = ["birdnet*"]
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-envlist = py{311,312}, py{312}-repro, py{313}
+envlist = py{311,312,313}, py{312}-repro
 isolated_build = True
 
 [testenv]
@@ -156,31 +197,25 @@ allowlist_externals = uv
 install_command = uv pip install {opts} {packages}
 
 deps = 
-  .[tests,litert,and-cuda]
+  .[tests,and-cuda]
 commands = 
   # ruff check src/birdnet
   # ruff check src/birdnet_tests
-  pytest -m "load_model" -n auto
-  pytest -m "not load_model and not repro and (not litert and not gpu)" -n auto
-  pytest -m "not load_model and not repro and litert" -n auto
-  pytest -m "not load_model and not repro and gpu" -n 1
+  pytest -m "not repro and load_model" -n auto --max-worker-restart=0
+  pytest -m "not repro and not load_model and (not litert and not gpu)" -n auto --max-worker-restart=0
+  pytest -m "not repro and not load_model and litert" -n auto --max-worker-restart=0
+  pytest -m "not repro and not load_model and gpu" -n 1 --max-worker-restart=0
 
 [testenv:py312-repro]
 deps =
   .[tests,repro]
 commands = 
-  pytest -m "load_model" -n auto
-  pytest -m "not load_model and repro and (not litert and not gpu)" -n auto
-  pytest -m "not load_model and repro and litert" -n auto
-  pytest -m "not load_model and repro and gpu" -n 1
-
-[testenv:py313]
-deps =
-  .[tests,and-cuda]
-commands = 
-  pytest -m "load_model" -n auto
-  pytest -m "not load_model and not repro and (not litert and not gpu)" -n auto
-  pytest -m "not load_model and not repro and gpu" -n 1
+  pytest -m "load_model" -n auto --max-worker-restart=0
+  # run normal tests including repro tests
+  pytest -m "not load_model and (not litert and not gpu)" -n auto --max-worker-restart=0
+  # run litert tests including repro tests
+  pytest -m "not load_model and litert" -n auto --max-worker-restart=0
+  # gpu tests are not supported to be run with repro environment
 """
 
 [build-system]