Commit cee4dde8 authored by Ukhu's avatar Ukhu
Browse files

Update 2020.4.287

parent 131d6c7b
......@@ -3,7 +3,7 @@
FROM local/dockervino:phase2 as phase2
FROM local/dockervino:phase1 as phase1
MAINTAINER jdg:juan-diego.gonzales-zuniga@kontron.com
ENV tools=$INSTALL_DIR/deployment_tools
ENV tools=$INTEL_OPENVINO_DIR/deployment_tools
ENV downloader=$tools/tools/model_downloader/downloader.py
ENV optimizer=$tools/model_optimizer
ENV converter=$tools/tools/model_downloader/converter.py
......@@ -11,7 +11,7 @@ ENV models=/root/openvino_models
# Copy models from phase2
COPY --from=phase2 /root/openvino_models/ir /root/openvino_models/ir
WORKDIR $INSTALL_DIR/deployment_tools
WORKDIR $INTEL_OPENVINO_DIR/deployment_tools
RUN apt install -y x11-utils vim strace libtool autoconf libmosquittopp-dev mosquitto mosquitto-clients
WORKDIR /tmp
RUN wget https://github.com/libusb/libusb/archive/v1.0.22.zip && \
......
FROM local/dockervino:phase2 as phase2
FROM local/dockervino:phase1 as phase1
WORKDIR $INSTALL_DIR/deployment_tools
WORKDIR ${INTEL_OPENVINO_DIR}/deployment_tools
RUN apt install -y libmosquittopp-dev && \
rm -rf open_model_zoo && \
pip3 install paho-mqtt scipy && \
export ngraph_DIR=/opt/intel/openvino/deployment_tools/ngraph/cmake && \
git clone https://github.com/Ukhupacha/open_model_zoo.git --branch kontron --depth 1 && \
$INSTALL_DIR/deployment_tools/inference_engine/demos/build_demos.sh -DENABLE_PYTHON=on && \
${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/demos/build_demos.sh -DENABLE_PYTHON=on && \
apt autoremove -y && rm -rf /var/lib/apt/lists/*
FROM scratch
COPY --from=phase1 / /
......
......@@ -31,12 +31,12 @@ device=CPU
###### CPU YOLO V3 ########
if [ "$device" == CPU ]; then
app=${examples_dir}/object_detection_demo_yolov3_async
model=/root/openvino_models/ir/yolo/FP32/yolo_v3.xml
model=${models_dir}/yolo/FP32/yolo_v3.xml
fi
###### NCS2 YOLO V3 ########
if [ "$device" == MYRIAD ]; then
app=${examples_dir}/object_detection_demo_yolov3_async
model=/root/openvino_models/ir/yolo/FP16/yolo_v3.xml
model=${models_dir}/yolo/FP16/yolo_v3.xml
fi
opts="--entrypoint=/entrypoint.sh"
......
......@@ -5,7 +5,6 @@
FROM ubuntu:18.04
MAINTAINER jdg:juan-diego.gonzales-zuniga@kontron.com
USER root
WORKDIR /
SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
......@@ -56,46 +55,96 @@ COPY ./$openvinoTar.tgz $TEMP_DIR
# install product by installation script
ENV INTEL_OPENVINO_DIR /opt/intel/openvino
RUN tar -xzf ${TEMP_DIR}/*.tgz --strip 1
RUN sed -i 's/decline/accept/g' silent.cfg && \
${TEMP_DIR}/install.sh -s silent.cfg && \
${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh
${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh && \
cp ${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/97-myriad-usbboot.rules /etc/udev/rules.d/ && \
ldconfig
WORKDIR /tmp
RUN rm -rf ${TEMP_DIR}
# for GPU
ARG GMMLIB=19.3.2
ARG IGC_CORE=1.0.2597
ARG IGC_OPENCL=1.0.2597
ARG INTEL_OPENCL=19.41.14441
ARG INTEL_OCLOC=19.41.14441
ARG TEMP_DIR=/tmp/opencl
WORKDIR ${TEMP_DIR}
RUN apt-get update && \
apt-get install -y --no-install-recommends ocl-icd-libopencl1=2.2.11-1ubuntu1 && \
rm -rf /var/lib/apt/lists/* && \
curl -L "https://github.com/intel/compute-runtime/releases/download/${INTEL_OPENCL}/intel-gmmlib_${GMMLIB}_amd64.deb" --output "intel-gmmlib_${GMMLIB}_amd64.deb" && \
curl -L "https://github.com/intel/compute-runtime/releases/download/${INTEL_OPENCL}/intel-igc-core_${IGC_CORE}_amd64.deb" --output "intel-igc-core_${IGC_CORE}_amd64.deb" && \
curl -L "https://github.com/intel/compute-runtime/releases/download/${INTEL_OPENCL}/intel-igc-opencl_${IGC_OPENCL}_amd64.deb" --output "intel-igc-opencl_${IGC_OPENCL}_amd64.deb" && \
curl -L "https://github.com/intel/compute-runtime/releases/download/${INTEL_OPENCL}/intel-opencl_${INTEL_OPENCL}_amd64.deb" --output "intel-opencl_${INTEL_OPENCL}_amd64.deb" && \
curl -L "https://github.com/intel/compute-runtime/releases/download/${INTEL_OPENCL}/intel-ocloc_${INTEL_OCLOC}_amd64.deb" --output "intel-ocloc_${INTEL_OCLOC}_amd64.deb" && \
dpkg -i ${TEMP_DIR}/*.deb && \
ldconfig && \
rm -rf ${TEMP_DIR}
# for VPU
WORKDIR /opt
RUN curl -L https://github.com/libusb/libusb/archive/v1.0.22.zip --output v1.0.22.zip && \
unzip v1.0.22.zip
WORKDIR /opt/libusb-1.0.22
RUN ./bootstrap.sh && \
./configure --disable-udev --enable-shared && \
make -j4
RUN apt-get update && \
apt-get install -y --no-install-recommends libusb-1.0-0-dev=2:1.0.21-2 && \
rm -rf /var/lib/apt/lists/*
WORKDIR /opt/libusb-1.0.22/libusb
RUN /bin/mkdir -p '/usr/local/lib' && \
/bin/bash ../libtool --mode=install /usr/bin/install -c libusb-1.0.la '/usr/local/lib' && \
/bin/mkdir -p '/usr/local/include/libusb-1.0' && \
/usr/bin/install -c -m 644 libusb.h '/usr/local/include/libusb-1.0' && \
/bin/mkdir -p '/usr/local/lib/pkgconfig'
WORKDIR /opt/libusb-1.0.22/
RUN /usr/bin/install -c -m 644 libusb-1.0.pc '/usr/local/lib/pkgconfig' && \
ldconfig
# installing dependencies for package
# for HDDL
WORKDIR /tmp
RUN apt-get update && \
apt-get install -y --no-install-recommends \
libboost-filesystem1.65-dev=1.65.1+dfsg-0ubuntu5 \
libboost-thread1.65-dev=1.65.1+dfsg-0ubuntu5 \
libjson-c3=0.12.1-1.3 libxxf86vm-dev=1:1.1.4-1 && \
rm -rf /var/lib/apt/lists/*
# dev package dependencies
WORKDIR /tmp
RUN rm -rf ${TEMP_DIR}
RUN ${PYTHON} -m pip install --no-cache-dir setuptools && \
find "${INTEL_OPENVINO_DIR}/" -type f -name "*requirements*.*" -path "*/${PYTHON}/*" -exec ${PYTHON} -m pip install --no-cache-dir -r "{}" \; && \
find "${INTEL_OPENVINO_DIR}/" -type f -name "*requirements*.*" -not -path "*/post_training_optimization_toolkit/*" -not -name "*windows.txt" -not -name "*ubuntu16.txt" -not -path "*/python3*/*" -not -path "*/python2*/*" -exec ${PYTHON} -m pip install --no-cache-dir -r "{}" \;
WORKDIR ${INTEL_OPENVINO_DIR}/deployment_tools/open_model_zoo/tools/accuracy_checker
RUN source ${INTEL_OPENVINO_DIR}/bin/setupvars.sh && \
${PYTHON} -m pip install --no-cache-dir -r ${INTEL_OPENVINO_DIR}/deployment_tools/open_model_zoo/tools/accuracy_checker/requirements.in && \
${PYTHON} ${INTEL_OPENVINO_DIR}/deployment_tools/open_model_zoo/tools/accuracy_checker/setup.py install
WORKDIR ${INTEL_OPENVINO_DIR}/deployment_tools/tools/post_training_optimization_toolkit
RUN if [ -f requirements.txt ]; then \
${PYTHON} -m pip install --no-cache-dir -r ${INTEL_OPENVINO_DIR}/deployment_tools/tools/post_training_optimization_toolkit/requirements.txt && \
${PYTHON} ${INTEL_OPENVINO_DIR}/deployment_tools/tools/post_training_optimization_toolkit/setup.py install; \
fi;
# Install model_optimizer requisites, it needs tf 1.5 for ApolloLake and setuptools
#RUN sed -i 's/<2.0.0/<=1.5.0/g' ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements.txt
#RUN pip3 install torch==1.4.0
#RUN ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/install_prerequisites/install_prerequisites.sh
# Post-installation cleanup and setting up OpenVINO environment variables
RUN if [ -f "${INTEL_OPENVINO_DIR}"/bin/setupvars.sh ]; then \
printf "\nsource \${INTEL_OPENVINO_DIR}/bin/setupvars.sh\n" >> /root/.bashrc; \
fi;
RUN find "${INTEL_OPENVINO_DIR}/" -name "*.*sh" -type f -exec dos2unix {} \;
WORKDIR ${INTEL_OPENVINO_DIR}
RUN ${INTEL_OPENVINO_DIR}/deployment_tools/demo/demo_benchmark_app.sh
WORKDIR ${INTEL_OPENVINO_DIR}
CMD ["/bin/bash"]
......@@ -3,6 +3,8 @@
FROM local/dockervino:phase1
MAINTAINER jdg:juan-diego.gonzales-zuniga@kontron.com
# General envs
ENV tools=${INTEL_OPENVINO_DIR}/deployment_tools
ENV downloader=$tools/tools/model_downloader/downloader.py
ENV optimizer=$tools/model_optimizer
......@@ -48,7 +50,7 @@ RUN python3 $converter --list $tools/open_model_zoo/demos/python_demos/human_pos
# Download Yolo v3
RUN python3 $downloader --name yolo-v3-tf
#wget https://download.01.org/opencv/public_models/022020/yolo_v3/yolov3.pb && \
# wget https://download.01.org/opencv/public_models/022020/yolo_v3/yolo_v3_new.json
#wget https://download.01.org/opencv/public_models/022020/yolo_v3/yolo_v3_new.json
# Optimizer on Yolov3
RUN python3 $optimizer/mo_tf.py \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment