Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dockerfiles to build with OV 2020.4 by default #290

Merged
merged 6 commits into from
Aug 7, 2020
Merged

Update dockerfiles to build with OV 2020.4 by default #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9e3d469
update clearlinux to default 2020.4
mzegla Aug 5, 2020
7078c84
ov based and apt ov update
mzegla Aug 5, 2020
d7b0201
runtime -> dev
mzegla Aug 5, 2020
fa6294f
ut script update
mzegla Aug 5, 2020
51c40a3
binary package update
mzegla Aug 5, 2020
5fae8ae
merge from master
dtrawins Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN curl -o GPG-PUB-KEY-INTEL-OPENVINO-2020 https://apt.repos.intel.com/openvino
RUN apt-key add GPG-PUB-KEY-INTEL-OPENVINO-2020
RUN echo "deb https://apt.repos.intel.com/openvino/2020/ all main" > /etc/apt/sources.list.d/intel-openvino-2020.list

RUN apt-get update && apt-get install -y intel-openvino-dev-ubuntu18-2020.3.194
RUN apt-get update && apt-get install -y intel-openvino-dev-ubuntu18-2020.4.287

ENV DL_INSTALL_DIR=/opt/intel/openvino/deployment_tools
ENV PYTHONPATH="/opt/intel/openvino/python/python3.6"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_binary_openvino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN mkdir -p $TEMP_DIR && cd $TEMP_DIR/ && \
*openvino_toolkit_fpga_2019.2) \
COMPONENTS='intel-openvino-full__noarch;intel-openvino-dldt-full__noarch;intel-openvino-setupvars__x86_64;intel-openvino-ie-sdk-ubuntu-xenial__x86_64;intel-openvino-ie-rt__x86_64;intel-openvino-ie-rt-core-ubuntu-xenial__x86_64;intel-openvino-ie-rt-cpu-ubuntu-xenial__x86_64;intel-openvino-ie-rt-vpu-ubuntu-xenial__x86_64;intel-openvino-ie-rt-hddl-ubuntu-xenial__x86_64;intel-openvino-gfx-driver__x86_64;intel-openvino-full-pset' \
;; \
*openvino_toolkit_p_2019.3* | *openvino_toolkit_p_2020.1* | *openvino_toolkit_p_2020.2*) \
*openvino_toolkit_p_2019.3* | *openvino_toolkit_p_2020.1* | *openvino_toolkit_p_2020.2* | *openvino_toolkit_p_2020.3* | *openvino_toolkit_p_2020.4*) \
COMPONENTS='intel-openvino-base__noarch;intel-openvino-dldt-base__noarch;intel-openvino-setupvars__noarch;intel-openvino-eula__noarch;intel-openvino-ie-sdk-ubuntu-xenial__x86_64;intel-openvino-ie-bin-python-tools-ubuntu-xenial__x86_64;intel-openvino-ie-samples__x86_64;intel-openvino-ie-rt__x86_64;intel-openvino-ie-bin-3rd-debug__x86_64;intel-openvino-ie-rt-core-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-gna-ubuntu-xenial__x86_64;intel-openvino-ie-rt-hddl-ubuntu-xenial__x86_64;intel-openvino-omz-tools__x86_64;intel-openvino-docs__noarch;intel-openvino-gfx-driver-ubuntu-xenial__x86_64;intel-openvino-base-pset' \
;; \
*openvino_toolkit_fpga_2019.3*) \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_clearlinux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM clearlinux as build

ARG ov_source_branch=2020.3.0
ARG ov_source_branch=2020.4

# Stage for building TF serving API for Python 3.8
RUN swupd bundle-add \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_openvino_base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openvino/ubuntu18_runtime:2020.3
FROM openvino/ubuntu18_runtime:2020.4
USER root

RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ CONFIG := "$(CONFIG)"
ML_DIR := "$(MK_DIR)"
HTTP_PROXY := "$(http_proxy)"
HTTPS_PROXY := "$(https_proxy)"
OVMS_VERSION := "2020.3"
OVMS_VERSION := "2020.4"
DLDT_PACKAGE_URL := "$(dldt_package_url)"
OV_SOURCE_BRANCH ?= "2020.3.0"
OV_SOURCE_BRANCH ?= "2020.4"

TEST_MODELS_DIR = /tmp/ovms_models
DOCKER_OVMS_TAG ?= ie-serving-py:latest
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

setup(
name='ie_serving',
version="2020.3",
version="2020.4",
description="DLDT inference server",
long_description="""DLDT inference server""",
keywords='',
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/functional-tests-bin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ DOCKER_OVMS_TAG="ie-serving-bin:latest"
export TESTS_SUFFIX="bin"
export PORTS_PREFIX="92 57"

make DOCKER_OVMS_TAG=${DOCKER_OVMS_TAG} docker_build_bin dldt_package_url=${OPENVINO_DOWNLOAD_LINK_2020_3}
make DOCKER_OVMS_TAG=${DOCKER_OVMS_TAG} docker_build_bin dldt_package_url=${OPENVINO_DOWNLOAD_LINK_2020_4}

. .venv-jenkins/bin/activate

Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/unit-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LD_LIBRARY_PATH+=:/opt/intel/openvino/deployment_tools/inference_engine/external
LD_LIBRARY_PATH+=:/opt/intel/openvino/deployment_tools/inference_engine/lib/intel64
LD_LIBRARY_PATH+=:/opt/intel/openvino/deployment_tools/ngraph/lib

OPEN_VINO_DOCKER_IMAGE=openvino/ubuntu18_dev:2020.3
OPEN_VINO_DOCKER_IMAGE=openvino/ubuntu18_dev:2020.4
OVMS_TESTS_IMAGE="${OPEN_VINO_DOCKER_IMAGE}-ovms-tests"

docker build \
Expand Down