diff --git a/scripts/install_helpers.sh b/scripts/install_helpers.sh index 1a885b3..780cb2c 100644 --- a/scripts/install_helpers.sh +++ b/scripts/install_helpers.sh @@ -9,23 +9,20 @@ get_tf_whl () { aarch64-39) WHL=tflite_runtime-2.11.0-cp39-none-linux_aarch64.whl ;; - aarch64-310) - WHL=tflite_runtime-2.11.0-cp310-none-linux_aarch64.whl - ;; aarch64-311) - WHL=tflite_runtime-2.11.0-cp311-cp311-linux_aarch64.whl + WHL=tflite_runtime-2.17.1-cp311-cp311-linux_aarch64.whl ;; aarch64-312) - WHL=tflite_runtime-2.11.0-cp312-cp312-linux_aarch64.whl + WHL=tflite_runtime-2.17.1-cp312-cp312-linux_aarch64.whl ;; x86_64-39) WHL=tflite_runtime-2.11.0-cp39-cp39-linux_x86_64.whl ;; x86_64-311) - WHL=tflite_runtime-2.11.0-cp311-cp311-linux_x86_64.whl + WHL=tflite_runtime-2.17.1-cp311-cp311-linux_x86_64.whl ;; x86_64-312) - WHL=tflite_runtime-2.11.0-cp312-cp312-linux_x86_64.whl + WHL=tflite_runtime-2.17.1-cp312-cp312-linux_x86_64.whl ;; *) echo "No tflite version found for ${ARCH}-${PY_VERSION}" diff --git a/scripts/update_birdnet_snippets.sh b/scripts/update_birdnet_snippets.sh index eb31dfe..a55d540 100755 --- a/scripts/update_birdnet_snippets.sh +++ b/scripts/update_birdnet_snippets.sh @@ -130,8 +130,9 @@ version=$($HOME/BirdNET-Pi/birdnet/bin/python3 -c "import seaborn; print(seaborn version=$($HOME/BirdNET-Pi/birdnet/bin/python3 -c "import suntime; print(suntime.__version__)") [[ $version != "1.3.2" ]] && sudo_with_user $HOME/BirdNET-Pi/birdnet/bin/pip3 install suntime==1.3.2 +PY_VERSION=$($HOME/BirdNET-Pi/birdnet/bin/python3 -c "import sys; print(f'{sys.version_info[0]}{sys.version_info[1]}')") tf_version=$($HOME/BirdNET-Pi/birdnet/bin/python3 -c "import tflite_runtime; print(tflite_runtime.__version__)") -if [ "$tf_version" != "2.11.0" ]; then +if [ "$PY_VERSION" == 39 ] && [ "$tf_version" != "2.11.0" ] || [ "$PY_VERSION" != 39 ] && [ "$tf_version" != "2.17.1" ]; then get_tf_whl # include our numpy dependants so pip can figure out which numpy version to install sudo_with_user $HOME/BirdNET-Pi/birdnet/bin/pip3 install $HOME/BirdNET-Pi/$WHL pandas librosa matplotlib