Merge commit '84683e67355ed15fb00a38d928e9d4d9257dd058'

This is the commit that was included in OpenVINO 2019 R3.

Author: Roman Donchenko

.gitattributes

@@ -5,3 +5,5 @@
 /ci/** -omz.package
 /demos/build_demos.sh omz.package=l,m
 /demos/build_demos_msvc.bat omz.package=w
+/demos/tests/** -omz.package
+/tools/downloader/tests/** -omz.package

README.md

@@ -1,13 +1,14 @@
 # [OpenVINO™ Toolkit](https://01.org/openvinotoolkit) - Open Model Zoo repository
 [![Build Status](http://134.191.240.124/buildStatus/icon?job=omz/2018/trigger)](http://134.191.240.124/job/omz/job/2018/job/trigger/)
-[![Stable release](https://img.shields.io/badge/version-2019_R2-green.svg)](https://github.com/opencv/open_model_zoo/releases/tag/2019_R2)
+[![Stable release](https://img.shields.io/badge/version-2019_R3-green.svg)](https://github.com/opencv/open_model_zoo/releases/tag/2019_R3)
 [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/open_model_zoo/community)
 [![Apache License Version 2.0](https://img.shields.io/badge/license-Apache_2.0-green.svg)](LICENSE)
 
 This repository includes optimized deep learning models and a set of demos to expedite development of high-performance deep learning inference applications. Use these free pre-trained models instead of training your own models to speed-up the development and production deployment process.
 
 ## Repository Components:
-* [Pre-Trained Models](intel_models/index.md)
+* [Pre-Trained Models](models/intel/index.md)
+* [Public Models Description](models/public/index.md)
 * [Model Downloader](tools/downloader/README.md) and other automation tools
 * [Demos](demos/README.md) that demonstrate models usage with Deep Learning Deployment Toolkit
 * [Accuracy Checker](tools/accuracy_checker/README.md) tool for models accuracy validation

ci/requirements-ac.txt

@@ -1,12 +1,12 @@
 joblib==0.13.2            # via scikit-learn
-nibabel==2.4.1
-numpy==1.16.0
-pillow==6.0.0
+nibabel==2.5.0
+numpy==1.17.0
+pillow==6.1.0
 py-cpuinfo==4.0.0
-pyyaml==5.1.1
-scikit-learn==0.21.2
+pyyaml==5.1.2
+scikit-learn==0.21.3
 scipy==0.19.0
 shapely==1.6.4.post2
 six==1.12.0               # via nibabel
-tqdm==4.32.1
+tqdm==4.33.0
 yamlloader==0.5.5

ci/requirements-conversion.txt

@@ -0,0 +1,40 @@
+absl-py==0.7.1            # via tensorboard, tensorflow
+astor==0.8.0              # via tensorflow
+certifi==2019.6.16        # via requests
+chardet==3.0.4            # via requests
+decorator==4.4.0          # via networkx
+defusedxml==0.6.0
+gast==0.2.2               # via tensorflow
+google-pasta==0.1.7       # via tensorflow
+graphviz==0.8.4           # via mxnet
+grpcio==1.22.0            # via tensorboard, tensorflow
+h5py==2.9.0               # via keras-applications
+idna==2.8                 # via requests
+keras-applications==1.0.8  # via tensorflow
+keras-preprocessing==1.1.0  # via tensorflow
+markdown==3.1.1           # via tensorboard
+mxnet==1.3.1
+networkx==2.3
+numpy==1.14.6
+onnx==1.5.0
+pillow==6.1.0             # via torchvision
+protobuf==3.6.1
+requests==2.22.0          # via mxnet
+scipy==1.3.1
+six==1.12.0               # via absl-py, grpcio, h5py, keras-preprocessing, onnx, protobuf, tensorboard, tensorflow, test-generator, torchvision
+tensorboard==1.14.0       # via tensorflow
+tensorflow-estimator==1.14.0  # via tensorflow
+tensorflow==1.14.0
+termcolor==1.1.0          # via tensorflow
+test-generator==0.1.1
+torch==1.2.0
+torchvision==0.4.0
+typing-extensions==3.7.4  # via onnx
+typing==3.7.4             # via onnx
+urllib3==1.25.3           # via requests
+werkzeug==0.15.5          # via tensorboard
+wheel==0.33.4             # via tensorboard, tensorflow
+wrapt==1.11.2             # via tensorflow
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools==41.0.1        # via markdown, protobuf, tensorboard

ci/requirements-demos.txt

@@ -0,0 +1 @@
+numpy==1.17.0 ; python_version >= "3.4"

ci/requirements-downloader.txt

@@ -4,9 +4,9 @@
 #
 #    pip-compile --output-file=ci/requirements-downloader.txt tools/downloader/requirements.in
 #
-certifi==2019.3.9         # via requests
+certifi==2019.6.16        # via requests
 chardet==3.0.4            # via requests
 idna==2.8                 # via requests
-pyyaml==5.1
+pyyaml==5.1.2
 requests==2.22.0
 urllib3==1.25.3           # via requests

ci/requirements-mo.txt

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-cmake_minimum_required (VERSION 2.8.11)
+cmake_minimum_required (VERSION 2.8.12)
 
 project(Demos)
 
@@ -155,6 +155,10 @@ macro(ie_add_sample)
         endif()
     endif()
 
+    if(TARGET IE::ie_cpu_extension)
+        add_definitions(-DWITH_EXTENSIONS)
+    endif()
+
     # Create named folders for the sources within the .vcproj
     # Empty name lists them directly under the .vcproj
     source_group("src" FILES ${IE_SAMPLES_SOURCES})
@@ -174,8 +178,12 @@ macro(ie_add_sample)
     endif()
     target_include_directories(${IE_SAMPLE_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../common")
 
+    if(TARGET IE::ie_cpu_extension)
+        target_link_libraries(${IE_SAMPLE_NAME} PRIVATE IE::ie_cpu_extension)
+    endif()
+
     target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${OpenCV_LIBRARIES} ${InferenceEngine_LIBRARIES}
-                                                    ${IE_SAMPLE_DEPENDENCIES} IE::ie_cpu_extension gflags)
+                                                    ${IE_SAMPLE_DEPENDENCIES} gflags)
 
     if(UNIX)
         target_link_libraries(${IE_SAMPLE_NAME} PRIVATE pthread)