updated docker files to R5 release (#16)

openvinotoolkit · Feb 6, 2019 · 561344a · 561344a
1 parent 1815eda
commit 561344a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 27 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,12 +11,9 @@ jobs:
     docker:
       - image: ubuntu:16.04
         environment:
-          PYTHONPATH: /opt/intel/computer_vision_sdk/python/python3.5/ubuntu16
+          PYTHONPATH: /opt/intel/computer_vision_sdk/python/python3.5/ubuntu16:/opt/intel/computer_vision_sdk/python/python3.5
           LD_LIBRARY_PATH: >-
-            /opt/intel/computer_vision_sdk/deployment_toolsinference_engine/external/gna/lib
-            :/opt/intel/computer_vision_sdk/deployment_tools/inference_engine/external/mkltiny_lnx/lib
-            :/opt/intel/computer_vision_sdk/deployment_tools/inference_engine/external/omp/lib
-            :/opt/intel/computer_vision_sdk/deployment_tools/inference_engine/lib/ubuntu_16.04/intel64
+            /opt/intel/computer_vision_sdk/deployment_tools/inference_engine/external/gna/lib:/opt/intel/computer_vision_sdk/deployment_tools/inference_engine/external/mkltiny_lnx/lib:/opt/intel/computer_vision_sdk/deployment_tools/inference_engine/external/omp/lib:/opt/intel/computer_vision_sdk/deployment_tools/inference_engine/lib/ubuntu_16.04/intel64
     environment:
       TEMP_DIR: /tmp/openvino_installer
     steps:
@@ -28,7 +25,7 @@ jobs:
             cd $TEMP_DIR &&
             apt-get update &&
             apt-get install -y --no-install-recommends cpio wget cpio cmake sudo python3-pip python3-venv python3-dev python3-setuptools virtualenv build-essential &&
-            wget -c $OPENVINO_DOWNLOAD_LINK_R4 &&
+            wget -c $OPENVINO_DOWNLOAD_LINK_R5 &&
             tar xf l_openvino_toolkit*.tgz &&
             cd l_openvino_toolkit* &&
             sed -i 's/decline/accept/g' silent.cfg &&
@@ -51,7 +48,7 @@ jobs:
       - checkout
       - run:
           name: Build docker image
-          command: wget -c $OPENVINO_DOWNLOAD_LINK_R4 && make docker_build_bin
+          command: wget -c $OPENVINO_DOWNLOAD_LINK_R5 && make docker_build_bin
       - run:
           name: Get Google Cloud credentials
           command: echo "${GOOGLE_KEY}" | base64 -d > ${GOOGLE_APPLICATION_CREDENTIALS}

diff --git a/Dockerfile b/Dockerfile
@@ -34,13 +34,13 @@ RUN apt-get update && apt-get install -y \
             gstreamer1.0-plugins-base \
             libusb-1.0-0-dev \
             libopenblas-dev
-ARG DLDT_DIR=/dldt-2018_R4
-RUN git clone --depth=1 -b 2018_R4 https://github.com/opencv/dldt.git ${DLDT_DIR} && \
+ARG DLDT_DIR=/dldt-2018_R5
+RUN git clone --depth=1 -b 2018_R5 https://github.com/opencv/dldt.git ${DLDT_DIR} && \
     cd ${DLDT_DIR} && git submodule init && git submodule update --recursive && \
     rm -Rf .git && rm -Rf model-optimizer
 
 WORKDIR ${DLDT_DIR}
-RUN curl -L -o ${DLDT_DIR}/mklml_lnx_2019.0.1.20180928.tgz https://github.com/intel/mkl-dnn/releases/download/v0.17/mklml_lnx_2019.0.1.20180928.tgz && \
+RUN curl -L -o ${DLDT_DIR}/mklml_lnx_2019.0.1.20180928.tgz https://github.com/intel/mkl-dnn/releases/download/v0.17.2/mklml_lnx_2019.0.1.20180928.tgz && \
     tar -xzf ${DLDT_DIR}/mklml_lnx_2019.0.1.20180928.tgz && rm ${DLDT_DIR}/mklml_lnx_2019.0.1.20180928.tgz
 WORKDIR ${DLDT_DIR}/inference-engine
 RUN mkdir build && cd build && cmake -DGEMM=MKL  -DMKLROOT=${DLDT_DIR}/mklml_lnx_2019.0.1.20180928 -DENABLE_MKL_DNN=ON  -DCMAKE_BUILD_TYPE=Release ..
@@ -56,22 +56,22 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
             ca-certificates \
             python3-pip \
             python3-dev \
-            vim \
-            virtualenv
+            virtualenv \
+            libgomp1
 WORKDIR /ie-serving-py
 
 COPY requirements.txt /ie-serving-py/
 RUN virtualenv -p python3 .venv && \
-    . .venv/bin/activate && pip3 --no-cache-dir install -r requirements.txt
+    . .venv/bin/activate && pip3 install -r requirements.txt
 
 COPY start_server.sh setup.py requirements.txt version /ie-serving-py/
 COPY ie_serving /ie-serving-py/ie_serving
 
 RUN . .venv/bin/activate && pip3 install .
 
-COPY --from=DEV /dldt-2018_R4/inference-engine/bin/intel64/Release/lib/*.so /usr/local/lib/
-COPY --from=DEV /dldt-2018_R4/inference-engine/ie_bridges/python/build/ /usr/local/lib/openvino/
-COPY --from=DEV /dldt-2018_R4/mklml_lnx_2019.0.1.20180928/lib/lib*.so /usr/local/lib/
+COPY --from=DEV /dldt-2018_R5/inference-engine/bin/intel64/Release/lib/*.so /usr/local/lib/
+COPY --from=DEV /dldt-2018_R5/inference-engine/ie_bridges/python/bin/intel64/Release/python_api/python3.5/openvino/ /usr/local/lib/openvino/
+COPY --from=DEV /dldt-2018_R5/mklml_lnx_2019.0.1.20180928/lib/lib*.so /usr/local/lib/
 ENV LD_LIBRARY_PATH=/usr/local/lib
 ENV PYTHONPATH=/usr/local/lib
 
diff --git a/Dockerfile_binary_openvino b/Dockerfile_binary_openvino
@@ -30,13 +30,13 @@ ENV LD_LIBRARY_PATH="$DL_INSTALL_DIR/inference_engine/external/gna/lib:$DL_INSTA
 ENV https_proxy $https_proxy
 ENV HTTPS_PROXY $https_proxy
 
-COPY start_server.sh setup.py requirements.txt version /ie-serving-py/
-COPY ie_serving /ie-serving-py/ie_serving
-
 WORKDIR /ie-serving-py
 
+COPY start_server.sh setup.py version requirements.txt /ie-serving-py/
 RUN virtualenv -p python3 .venv && \
-    . .venv/bin/activate && pip3 --no-cache-dir install -r requirements.txt
+    . .venv/bin/activate && pip3 install -r requirements.txt
+
+COPY ie_serving /ie-serving-py/ie_serving
 
 RUN . .venv/bin/activate && pip3 install .
 
diff --git a/Dockerfile_intelpython b/Dockerfile_intelpython
@@ -33,13 +33,13 @@ RUN apt-get update && apt-get install -y \
             libusb-1.0-0-dev \
             libopenblas-dev
 
-ARG DLDT_DIR=/dldt-2018_R4
-RUN git clone --depth=1 -b 2018_R4 https://github.com/opencv/dldt.git ${DLDT_DIR} && \
+ARG DLDT_DIR=/dldt-2018_R5
+RUN git clone --depth=1 -b 2018_R5 https://github.com/opencv/dldt.git ${DLDT_DIR} && \
     cd ${DLDT_DIR} && git submodule init && git submodule update --recursive && \
     rm -Rf .git && rm -Rf model-optimizer
 
 WORKDIR ${DLDT_DIR}
-RUN curl -L -o ${DLDT_DIR}/mklml_lnx_2019.0.1.20180928.tgz https://github.com/intel/mkl-dnn/releases/download/v0.17/mklml_lnx_2019.0.1.20180928.tgz && \
+RUN curl -L -o ${DLDT_DIR}/mklml_lnx_2019.0.1.20180928.tgz https://github.com/intel/mkl-dnn/releases/download/v0.17.2/mklml_lnx_2019.0.1.20180928.tgz && \
     tar -xzf ${DLDT_DIR}/mklml_lnx_2019.0.1.20180928.tgz && rm ${DLDT_DIR}/mklml_lnx_2019.0.1.20180928.tgz
 WORKDIR ${DLDT_DIR}/inference-engine
 RUN mkdir build && cd build && cmake -DGEMM=MKL  -DMKLROOT=${DLDT_DIR}/mklml_lnx_2019.0.1.20180928 -DENABLE_MKL_DNN=ON  -DCMAKE_BUILD_TYPE=Release ..
@@ -55,9 +55,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
             ca-certificates \
             vim
 
-COPY --from=DEV /dldt-2018_R4/inference-engine/bin/intel64/Release/lib/*.so /usr/local/lib/
-COPY --from=DEV /dldt-2018_R4/inference-engine/ie_bridges/python/build/ /usr/local/lib/openvino/
-COPY --from=DEV /dldt-2018_R4/mklml_lnx_2019.0.1.20180928/lib/lib*.so /usr/local/lib/
+COPY --from=DEV /dldt-2018_R5/inference-engine/bin/intel64/Release/lib/*.so /usr/local/lib/
+COPY --from=DEV /dldt-2018_R5/inference-engine/ie_bridges/python/bin/intel64/Release/python_api/python3.6/openvino/ /usr/local/lib/openvino/
+COPY --from=DEV /dldt-2018_R5/mklml_lnx_2019.0.1.20180928/lib/lib*.so /usr/local/lib/
 ENV LD_LIBRARY_PATH=/usr/local/lib
 ENV PYTHONPATH=/usr/local/lib
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
-setuptools==34.3.0
 grpcio==1.14.1
 numpy<=1.15.4
 protobuf==3.6.1