From e00e2e84d6bf595715e766e5e4748e6ee1ac668e Mon Sep 17 00:00:00 2001 From: "S. Manohar Karlapalem" Date: Tue, 21 Jul 2020 23:48:24 -0700 Subject: [PATCH] [OpenVINO] Update MCR dockerfile with Ubuntu 18.04 package names (#4581) * Update Ubuntu version codename for install components * Specify OpenVINO dockerfile's name in documentation Also install NCS udev rules. --- dockerfiles/Dockerfile.openvino | 4 ++-- dockerfiles/README.md | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dockerfiles/Dockerfile.openvino b/dockerfiles/Dockerfile.openvino index ebc0fc4ffd..d440c00935 100644 --- a/dockerfiles/Dockerfile.openvino +++ b/dockerfiles/Dockerfile.openvino @@ -15,7 +15,7 @@ ENV PATH /opt/miniconda/bin:/code/cmake-3.14.3-Linux-x86_64/bin:$PATH 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" +ENV replacement="COMPONENTS=intel-openvino-ie-sdk-ubuntu-bionic__x86_64;intel-openvino-ie-rt-cpu-ubuntu-bionic__x86_64;intel-openvino-ie-rt-gpu-ubuntu-bionic__x86_64;intel-openvino-ie-rt-vpu-ubuntu-bionic__x86_64;intel-openvino-ie-rt-hddl-ubuntu-bionic__x86_64;intel-openvino-model-optimizer__x86_64;intel-openvino-opencv-lib-ubuntu-bionic__x86_64" COPY l_openvino_*.tgz . 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_2020.3.194 @@ -48,7 +48,7 @@ RUN apt update && \ ./install.sh -s silent.cfg && \ cd - && \ rm -rf l_openvino_toolkit* && \ - cd /opt/intel/openvino/install_dependencies && ./install_openvino_dependencies.sh && ./install_NEO_OCL_driver.sh && dpkg -i *.deb && \ + cd /opt/intel/openvino/install_dependencies && ./install_openvino_dependencies.sh && ./install_NEO_OCL_driver.sh && ./install_NCS_udev_rules.sh && dpkg -i *.deb && \ cd ${MY_ROOT} && \ locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 && \ cd ${MY_ROOT} && \ diff --git a/dockerfiles/README.md b/dockerfiles/README.md index 3d8979ed4a..b9734a4c59 100644 --- a/dockerfiles/README.md +++ b/dockerfiles/README.md @@ -118,7 +118,7 @@ Therefore, ONNX RT Execution Provider for **nGraph** will be deprecated starting - To build your docker image, download the OpenVINO **online installer** package for version **2020.3** for Linux from [this link](https://software.intel.com/en-us/openvino-toolkit/choose-download) and copy the OpenVINO tar file to the same directory before building the Docker image. The online installer size is 19MB and the components needed for the accelerators are mentioned in the dockerfile. Providing the docker build argument DEVICE enables the onnxruntime build for that particular device. You can also provide arguments ONNXRUNTIME_REPO and ONNXRUNTIME_BRANCH to test that particular repo and branch. Default repository is http://github.com/microsoft/onnxruntime and default branch is master. ``` - docker build --rm -t onnxruntime --build-arg DEVICE=$DEVICE . + docker build --rm -t onnxruntime --build-arg DEVICE=$DEVICE -f Dockerfile.openvino . ``` - Pull the official image from DockerHub. @@ -142,7 +142,7 @@ Therefore, ONNX RT Execution Provider for **nGraph** will be deprecated starting 1. Build the docker image from the DockerFile in this repository. ``` - docker build --rm -t onnxruntime-cpu --build-arg DEVICE=CPU_FP32 --network host . + docker build --rm -t onnxruntime-cpu --build-arg DEVICE=CPU_FP32 --network host -f Dockerfile.openvino . ``` 2. Run the docker image ``` @@ -153,7 +153,7 @@ Therefore, ONNX RT Execution Provider for **nGraph** will be deprecated starting 1. Build the docker image from the DockerFile in this repository. ``` - docker build --rm -t onnxruntime-gpu --build-arg DEVICE=GPU_FP32 --network host . + docker build --rm -t onnxruntime-gpu --build-arg DEVICE=GPU_FP32 --network host -f Dockerfile.openvino . ``` 2. Run the docker image ``` @@ -163,7 +163,7 @@ Therefore, ONNX RT Execution Provider for **nGraph** will be deprecated starting 1. Build the docker image from the DockerFile in this repository. ``` - docker build --rm -t onnxruntime-myriad --build-arg DEVICE=MYRIAD_FP16 --network host . + docker build --rm -t onnxruntime-myriad --build-arg DEVICE=MYRIAD_FP16 --network host -f Dockerfile.openvino . ``` 2. Install the Myriad rules drivers on the host machine according to the reference in [here](https://docs.openvinotoolkit.org/latest/_docs_install_guides_installing_openvino_linux.html#additional-NCS-steps) @@ -181,7 +181,7 @@ Therefore, ONNX RT Execution Provider for **nGraph** will be deprecated starting 3. Build the docker image from the DockerFile in this repository. ``` - docker build --rm -t onnxruntime-vadm --build-arg DEVICE=VAD-M_FP16 --network host . + docker build --rm -t onnxruntime-vadm --build-arg DEVICE=VAD-M_FP16 --network host -f Dockerfile.openvino . ``` 4. Run hddldaemon on the host in a separate terminal session using the following command:  ```