From aa041026e362f0728232b4aeec3a23a48ed3d70f Mon Sep 17 00:00:00 2001 From: George Wu Date: Wed, 30 Oct 2019 13:58:24 -0700 Subject: [PATCH] update Dockerfile.openvino (#2286) * install miniconda before openvino installation. add networkx, defusedxml dependencies. * apt-get update * apt-get update * merge Intel changes. --- dockerfiles/Dockerfile.openvino | 43 ++++++++-------------- dockerfiles/scripts/install_common_deps.sh | 4 +- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/dockerfiles/Dockerfile.openvino b/dockerfiles/Dockerfile.openvino index b37d89b59c..f5e8ab6aa1 100644 --- a/dockerfiles/Dockerfile.openvino +++ b/dockerfiles/Dockerfile.openvino @@ -13,6 +13,17 @@ ARG DEVICE=CPU_FP32 ARG ONNXRUNTIME_REPO=https://github.com/microsoft/onnxruntime ARG ONNXRUNTIME_BRANCH=master +WORKDIR /code +ENV PATH /opt/miniconda/bin:/code/cmake-3.14.3-Linux-x86_64/bin:$PATH + +RUN git clone --recursive -b $ONNXRUNTIME_BRANCH $ONNXRUNTIME_REPO onnxruntime && \ + cp onnxruntime/docs/Privacy.md /code/Privacy.md && \ + cp onnxruntime/dockerfiles/LICENSE-IMAGE.txt /code/LICENSE-IMAGE.txt && \ + cp onnxruntime/ThirdPartyNotices.txt /code/ThirdPartyNotices.txt && \ + /bin/sh onnxruntime/dockerfiles/scripts/install_common_deps.sh && \ + cd onnxruntime/cmake/external/onnx && python3 setup.py install && \ + pip install azure-iothub-device-client azure-iothub-service-client azure-iot-provisioning-device-client + ENV pattern="COMPONENTS=DEFAULTS" ENV replacement="COMPONENTS=intel-openvino-ie-sdk-ubuntu-xenial__x86_64;intel-openvino-ie-rt-cpu-ubuntu-xenial__x86_64;intel-openvino-ie-rt-gpu-ubuntu-xenial__x86_64;intel-openvino-ie-rt-vpu-ubuntu-xenial__x86_64;intel-openvino-ie-rt-hddl-ubuntu-xenial__x86_64;intel-openvino-model-optimizer__x86_64;intel-openvino-opencv-lib-ubuntu-xenial__x86_64" COPY l_openvino_*.tgz . @@ -22,45 +33,23 @@ RUN tar -xzf l_openvino_toolkit*.tgz && \ sed -i "s/$pattern/$replacement/" silent.cfg && \ sed -i 's/decline/accept/g' silent.cfg && \ ./install.sh -s silent.cfg && \ - ./install_openvino_dependencies.sh && \ cd - && \ rm -rf l_openvino_toolkit* && \ - cd /opt/intel/openvino/deployment_tools/model_optimizer/install_prerequisites && ./install_prerequisites_onnx.sh + cd /opt/intel/openvino/install_dependencies && ./_install_all_dependencies.sh && dpkg -i *.deb && \ + pip install networkx==2.3 test-generator==0.1.1 defusedxml>=0.5.0 -ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH=/opt/miniconda/lib:/usr/lib:/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH ENV INTEL_OPENVINO_DIR=/opt/intel/openvino_2019.1.144 ENV INTEL_CVSDK_DIR=/opt/intel/openvino_2019.1.144 -ENV LD_LIBRARY_PATH=${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/model_optimizer_caffe/bin:${LD_LIBRARY_PATH} -ENV ModelOptimizer_ROOT_DIR=${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/model_optimizer_caffe -ENV InferenceEngine_DIR=${INTEL_CVSDK_DIR}/deployment_tools/inference_engine/share ENV IE_PLUGINS_PATH=${INTEL_CVSDK_DIR}/deployment_tools/inference_engine/lib/intel64 ENV LD_LIBRARY_PATH=/opt/intel/opencl:${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/cldnn/lib:${INTEL_OPENVINO_DIR}/inference_engine/external/gna/lib:${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/mkltiny_lnx/lib:${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/omp/lib:${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/tbb/lib:${IE_PLUGINS_PATH}:${LD_LIBRARY_PATH} ENV OpenCV_DIR=${INTEL_OPENVINO_DIR}/opencv/share/OpenCV ENV LD_LIBRARY_PATH=${INTEL_OPENVINO_DIR}/opencv/lib:${INTEL_OPENVINO_DIR}/opencv/share/OpenCV/3rdparty/lib:${LD_LIBRARY_PATH} ENV PATH=${INTEL_CVSDK_DIR}/deployment_tools/model_optimizer:$PATH ENV PYTHONPATH=${INTEL_CVSDK_DIR}/deployment_tools/model_optimizer:$PYTHONPATH -# ENV PYTHONPATH=$INTEL_CVSDK_DIR/python/python3.5:${INTEL_CVSDK_DIR}/python/python3.5/ubuntu16:${PYTHONPATH} ENV HDDL_INSTALL_DIR=${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/hddl ENV LD_LIBRARY_PATH=${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/hddl/lib:$LD_LIBRARY_PATH -RUN wget https://github.com/intel/compute-runtime/releases/download/19.15.12831/intel-gmmlib_19.1.1_amd64.deb -RUN wget https://github.com/intel/compute-runtime/releases/download/19.15.12831/intel-igc-core_1.0.2-1787_amd64.deb -RUN wget https://github.com/intel/compute-runtime/releases/download/19.15.12831/intel-igc-opencl_1.0.2-1787_amd64.deb -RUN wget https://github.com/intel/compute-runtime/releases/download/19.15.12831/intel-opencl_19.15.12831_amd64.deb -RUN wget https://github.com/intel/compute-runtime/releases/download/19.15.12831/intel-ocloc_19.15.12831_amd64.deb - -RUN sudo dpkg -i *.deb && rm -rf *.deb - ENV LANG en_US.UTF-8 -WORKDIR /code -ENV PATH /opt/miniconda/bin:/code/cmake-3.14.3-Linux-x86_64/bin:$PATH - -RUN git clone --recursive -b $ONNXRUNTIME_BRANCH $ONNXRUNTIME_REPO /onnxruntime && \ - /bin/sh /onnxruntime/dockerfiles/scripts/install_common_deps.sh && \ - cd /onnxruntime/cmake/external/onnx && python3 setup.py install && \ - cp onnxruntime/docs/Privacy.md /code/Privacy.md &&\ - cp /onnxruntime/dockerfiles/LICENSE-IMAGE.txt /code/LICENSE-IMAGE.txt && \ - cp /onnxruntime/ThirdPartyNotices.txt /code/ThirdPartyNotices.txt && \ - pip install azure-iothub-device-client azure-iothub-service-client azure-iot-provisioning-device-client && \ - cd /onnxruntime && ./build.sh --config RelWithDebInfo --update --build --parallel --use_openvino $DEVICE --build_wheel && \ - pip install /onnxruntime/build/Linux/RelWithDebInfo/dist/*-linux_x86_64.whl && rm -rf /onnxruntime cmake-3.14.3-Linux-x86_64 +RUN cd onnxruntime && ./build.sh --config RelWithDebInfo --update --build --parallel --use_openvino $DEVICE --build_wheel && \ + pip install build/Linux/RelWithDebInfo/dist/*-linux_x86_64.whl && rm -rf /code/onnxruntime /code/cmake-3.14.3-Linux-x86_64 diff --git a/dockerfiles/scripts/install_common_deps.sh b/dockerfiles/scripts/install_common_deps.sh index 173734332b..5916691fd1 100644 --- a/dockerfiles/scripts/install_common_deps.sh +++ b/dockerfiles/scripts/install_common_deps.sh @@ -1,6 +1,6 @@ #!/bin/bash DEBIAN_FRONTEND=noninteractive -apt-get install -y --no-install-recommends \ +apt-get update && apt-get install -y --no-install-recommends \ wget \ zip \ ca-certificates \ @@ -22,4 +22,4 @@ rm -rf /opt/miniconda/pkgs # Dependencies: cmake sudo wget --quiet https://github.com/Kitware/CMake/releases/download/v3.14.3/cmake-3.14.3-Linux-x86_64.tar.gz tar zxf cmake-3.14.3-Linux-x86_64.tar.gz -rm -rf cmake-3.14.3-Linux-x86_64.tar.gz \ No newline at end of file +rm -rf cmake-3.14.3-Linux-x86_64.tar.gz