diff --git a/Dockerfile b/Dockerfile index 5bcecea6a4..047dac6329 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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" diff --git a/Dockerfile_binary_openvino b/Dockerfile_binary_openvino index e6481477d3..032eed7069 100644 --- a/Dockerfile_binary_openvino +++ b/Dockerfile_binary_openvino @@ -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*) \ diff --git a/Dockerfile_clearlinux b/Dockerfile_clearlinux index 401080fce6..2de574183f 100644 --- a/Dockerfile_clearlinux +++ b/Dockerfile_clearlinux @@ -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 \ diff --git a/Dockerfile_openvino_base b/Dockerfile_openvino_base index 97288aa5c9..c4f90b9230 100644 --- a/Dockerfile_openvino_base +++ b/Dockerfile_openvino_base @@ -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 \ diff --git a/Makefile b/Makefile index c32adc18f4..1147e77681 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/setup.py b/setup.py index 1381b0709f..87d5ae42d0 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='ie_serving', - version="2020.3", + version="2020.4", description="DLDT inference server", long_description="""DLDT inference server""", keywords='', diff --git a/tests/scripts/functional-tests-bin.sh b/tests/scripts/functional-tests-bin.sh index 43b7943a75..32605a1702 100755 --- a/tests/scripts/functional-tests-bin.sh +++ b/tests/scripts/functional-tests-bin.sh @@ -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 diff --git a/tests/scripts/unit-tests.sh b/tests/scripts/unit-tests.sh index be60aece11..fbadc1b117 100755 --- a/tests/scripts/unit-tests.sh +++ b/tests/scripts/unit-tests.sh @@ -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 \