diff --git a/Dockerfile b/Dockerfile index 25895859a..934b1b38c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive FROM debian:11 AS base +FROM --platform=linux/amd64 debian:11 AS base_amd64 + FROM debian:11-slim AS slim-base FROM blakeblackshear/frigate-nginx:1.0.2 AS nginx @@ -24,6 +26,21 @@ WORKDIR /rootfs/usr/local/go2rtc/bin RUN wget -qO go2rtc "https://github.com/AlexxIT/go2rtc/releases/download/v0.1-rc.3/go2rtc_linux_${TARGETARCH}" \ && chmod +x go2rtc +# Download and Convert OpenVino model +FROM base_amd64 AS ov-converter +ARG DEBIAN_FRONTEND +RUN apt-get -qq update \ + && apt-get -qq install -y wget python3 python3-distutils +RUN wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \ + && python3 get-pip.py "pip" + +COPY requirements-ov.txt /requirements-ov.txt +RUN pip install -r /requirements-ov.txt + +RUN mkdir /models +RUN cd /models && omz_downloader --name ssdlite_mobilenet_v2 +RUN cd /models && omz_converter --name ssdlite_mobilenet_v2 --precision FP16 + FROM wget AS models @@ -31,6 +48,10 @@ FROM wget AS models RUN wget -qO edgetpu_model.tflite https://github.com/google-coral/test_data/raw/release-frogfish/ssdlite_mobiledet_coco_qat_postprocess_edgetpu.tflite RUN wget -qO cpu_model.tflite https://github.com/google-coral/test_data/raw/release-frogfish/ssdlite_mobiledet_coco_qat_postprocess.tflite COPY labelmap.txt . +# Copy OpenVino model +COPY --from=ov-converter /models/public/ssdlite_mobilenet_v2/FP16 openvino-model +RUN wget -q https://github.com/openvinotoolkit/open_model_zoo/raw/master/data/dataset_classes/coco_91cl_bkgr.txt -O openvino-model/coco_91cl_bkgr.txt + FROM wget AS s6-overlay diff --git a/requirements-ov.txt b/requirements-ov.txt new file mode 100644 index 000000000..e50f6d263 --- /dev/null +++ b/requirements-ov.txt @@ -0,0 +1,3 @@ +numpy == 1.19.* +openvino == 2022.* +openvino-dev[tensorflow2] == 2022.* diff --git a/requirements-wheels.txt b/requirements-wheels.txt index 51e8c659e..2cb6c2a81 100644 --- a/requirements-wheels.txt +++ b/requirements-wheels.txt @@ -3,7 +3,6 @@ Flask == 2.2.* imutils == 0.5.* matplotlib == 3.6.* mypy == 0.942 -# numpy == 1.22.* numpy == 1.19.* opencv-python-headless == 4.5.5.* paho-mqtt == 1.6.*