From 4818c08fe295e7b959bff824a71549c3d4b6c864 Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Sat, 7 Aug 2021 15:33:10 -0500 Subject: [PATCH] update for coral updates --- docker/Dockerfile.aarch64 | 2 -- docker/Dockerfile.amd64 | 4 ---- docker/Dockerfile.amd64nvidia | 4 ---- docker/Dockerfile.armv7 | 2 -- docker/Dockerfile.base | 2 +- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index ba7995521..30d69fc83 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -16,8 +16,6 @@ RUN apt-get -qq update \ libpng16-16 \ libtiff5 \ libdc1394-22 \ - ## Tensorflow lite - && pip3 install https://github.com/google-coral/pycoral/releases/download/release-frogfish/tflite_runtime-2.5.0-cp38-cp38-linux_aarch64.whl \ && rm -rf /var/lib/apt/lists/* \ && (apt-get autoremove -y; apt-get autoclean -y) diff --git a/docker/Dockerfile.amd64 b/docker/Dockerfile.amd64 index 2f4a432d2..d583e43f8 100644 --- a/docker/Dockerfile.amd64 +++ b/docker/Dockerfile.amd64 @@ -16,10 +16,6 @@ RUN apt-get -qq update \ libgomp1 \ # VAAPI drivers for Intel hardware accel libva-drm2 libva2 libmfx1 i965-va-driver vainfo intel-media-va-driver-non-free mesa-vdpau-drivers mesa-va-drivers mesa-vdpau-drivers libdrm-radeon1 \ - ## Tensorflow lite - && wget -q https://github.com/google-coral/pycoral/releases/download/release-frogfish/tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \ - && python3.8 -m pip install tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \ - && rm tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \ && rm -rf /var/lib/apt/lists/* \ && (apt-get autoremove -y; apt-get autoclean -y) diff --git a/docker/Dockerfile.amd64nvidia b/docker/Dockerfile.amd64nvidia index 1db9e94d8..f893d684f 100644 --- a/docker/Dockerfile.amd64nvidia +++ b/docker/Dockerfile.amd64nvidia @@ -6,10 +6,6 @@ RUN apt-get -qq update \ && apt-get -qq install --no-install-recommends -y \ # ffmpeg dependencies libgomp1 \ - ## Tensorflow lite - && wget -q https://github.com/google-coral/pycoral/releases/download/release-frogfish/tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \ - && python3.8 -m pip install tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \ - && rm tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \ && rm -rf /var/lib/apt/lists/* \ && (apt-get autoremove -y; apt-get autoclean -y) diff --git a/docker/Dockerfile.armv7 b/docker/Dockerfile.armv7 index a1c360813..af44301b8 100644 --- a/docker/Dockerfile.armv7 +++ b/docker/Dockerfile.armv7 @@ -18,8 +18,6 @@ RUN apt-get -qq update \ libdc1394-22 \ libaom0 \ libx265-179 \ - ## Tensorflow lite - && pip3 install https://github.com/google-coral/pycoral/releases/download/release-frogfish/tflite_runtime-2.5.0-cp38-cp38-linux_armv7l.whl \ && rm -rf /var/lib/apt/lists/* \ && (apt-get autoremove -y; apt-get autoclean -y) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 1b9e1d144..3521d6f04 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -26,7 +26,7 @@ RUN apt-get -qq update \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key adv --fetch-keys https://packages.cloud.google.com/apt/doc/apt-key.gpg \ && echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" > /etc/apt/sources.list.d/coral-edgetpu.list \ && echo "libedgetpu1-max libedgetpu/accepted-eula select true" | debconf-set-selections \ - && apt-get -qq update && apt-get -qq install --no-install-recommends -y libedgetpu1-max=15.0 \ + && apt-get -qq update && apt-get -qq install --no-install-recommends -y libedgetpu1-max python3-tflite-runtime \ && rm -rf /var/lib/apt/lists/* /wheels \ && (apt-get autoremove -y; apt-get autoclean -y)