Skip to content

Commit

Permalink
Merge pull request openvinotoolkit#1032 from IRDonch/release-2020.2
Browse files Browse the repository at this point in the history
Merge OpenVINO toolkit 2020.2 content into master
  • Loading branch information
Roman Donchenko authored Apr 15, 2020
2 parents efd238d + 61cf3a2 commit 7d23575
Show file tree
Hide file tree
Showing 735 changed files with 22,129 additions and 6,704 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/tools/downloader/tests/** -omz.package

/ci/requirements-ac.txt omz.ci.job-for-change.ac
/ci/requirements-ac-test.txt omz.ci.job-for-change.ac
/ci/requirements-conversion.txt omz.ci.job-for-change.demos omz.ci.job-for-change.models
/ci/requirements-demos.txt omz.ci.job-for-change.demos
/ci/requirements-downloader.txt omz.ci.job-for-change.demos omz.ci.job-for-change.models
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ description: >-
This is a TensorFlow\* version of `densenet-121` model, one of the DenseNet
group of models designed to perform image classification. The weights were converted
from DenseNet-Keras Models. For details see repository <https://github.com/pudae/tensorflow-densenet/>,
paper <https://arxiv.org/pdf/1608.06993.pdf>
paper <https://arxiv.org/abs/1608.06993>
task_type: classification
files:
- name: tf-densenet121.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# [OpenVINO™ Toolkit](https://01.org/openvinotoolkit) - Open Model Zoo repository
[![Stable release](https://img.shields.io/badge/version-2020.1-green.svg)](https://github.com/opencv/open_model_zoo/releases/tag/2020.1)
[![Stable release](https://img.shields.io/badge/version-2020.2-green.svg)](https://github.com/opencv/open_model_zoo/releases/tag/2020.2)
[![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)

Expand Down Expand Up @@ -43,7 +43,7 @@ Open Model Zoo is licensed under Apache License, Version 2.0. By contributing to
Please report questions, issues and suggestions using:
* [\#open_model_zoo](https://stackoverflow.com/search?q=%23open_model_zoo) tag on StackOverflow*
* [GitHub* Issues](https://github.com/opencv/open_model_zoo/issues)
* [Forum](https://software.intel.com/en-us/forums/computer-vision)
* [Forum](https://software.intel.com/en-us/forums/intel-distribution-of-openvino-toolkit)
* [Gitter](https://gitter.im/open_model_zoo/community)

---
Expand Down
27 changes: 27 additions & 0 deletions ci/requirements-ac-test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
atomicwrites==1.3.0
attrs==19.3.0 # via pytest
editdistance==0.5.3
importlib-metadata==1.5.0 # via pluggy, pytest
joblib==0.14.1 # via scikit-learn
more-itertools==8.2.0 # via pytest
nibabel==3.0.1
numpy==1.17.5 # via nibabel, scikit-learn, scipy
packaging==20.1 # via pytest
pathlib2==2.3.5 # via pytest
pillow==7.0.0
pluggy==0.13.1 # via pytest
py-cpuinfo==4.0.0
py==1.8.1 # via pytest
pyparsing==2.4.6 # via packaging
pytest-mock==2.0.0
pytest==5.3.5
pyyaml==5.3 # via yamlloader
scikit-learn==0.22.1
scipy==1.4.1
sentencepiece==0.1.85
shapely==1.7.0
six==1.14.0 # via packaging, pathlib2
tqdm==4.42.1
wcwidth==0.1.8 # via pytest
yamlloader==0.5.5
zipp==1.1.0 # via importlib-metadata
27 changes: 11 additions & 16 deletions ci/requirements-ac.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=ci/requirements-ac.txt tools/accuracy_checker/requirements.in
#
joblib==0.14.0 # via scikit-learn
nibabel==2.5.1
numpy==1.17.2
pillow==6.2.0
editdistance==0.5.3
joblib==0.14.1 # via scikit-learn
nibabel==3.0.1
numpy==1.17.5 # via nibabel, scikit-learn, scipy
pillow==7.0.0
py-cpuinfo==4.0.0
pyyaml==5.1.2
scikit-learn==0.21.3
scipy==1.3.1
shapely==1.6.4.post2
six==1.12.0 # via nibabel
tqdm==4.36.1
pyyaml==5.3 # via yamlloader
scikit-learn==0.22.1
scipy==1.4.1
sentencepiece==0.1.85
shapely==1.7.0
tqdm==4.42.1
yamlloader==0.5.5
50 changes: 25 additions & 25 deletions ci/requirements-conversion.txt
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
absl-py==0.8.0 # via tensorboard, tensorflow
astor==0.8.0 # via tensorflow
certifi==2019.9.11 # via requests
absl-py==0.9.0 # via tensorboard, tensorflow
astor==0.8.1 # via tensorflow
certifi==2019.11.28 # via requests
chardet==3.0.4 # via requests
decorator==4.4.0 # via networkx
decorator==4.4.1 # via networkx
defusedxml==0.6.0
future==0.17.1
gast==0.3.2 # via tensorflow
google-pasta==0.1.7 # via tensorflow
future==0.18.2
gast==0.2.2 # via tensorflow
google-pasta==0.1.8 # via tensorflow
graphviz==0.8.4 # via mxnet
grpcio==1.24.0 # via tensorboard, tensorflow
grpcio==1.26.0 # via tensorboard, tensorflow
h5py==2.10.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
mxnet==1.5.1
networkx==2.4
numpy==1.18.1
onnx==1.6.0
pillow==6.2.0 # via torchvision
opt-einsum==3.1.0 # via tensorflow
pillow==7.0.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, torchvision
tensorboard==1.14.0 # via tensorflow
tensorflow-estimator==1.14.0 # via tensorflow
tensorflow==1.14.0
scipy==1.4.1
six==1.14.0 # via absl-py, google-pasta, grpcio, h5py, keras-preprocessing, onnx, protobuf, tensorboard, tensorflow, torchvision
tensorboard==1.15.0 # via tensorflow
tensorflow-estimator==1.15.1 # via tensorflow
tensorflow==1.15.2
termcolor==1.1.0 # via tensorflow
torch==1.2.0
torchvision==0.4.0
typing-extensions==3.7.4 # via onnx
typing==3.7.4 # via onnx
urllib3==1.25.6 # via requests
werkzeug==0.16.0 # via tensorboard
wheel==0.33.6 # via tensorboard, tensorflow
torch==1.4.0
torchvision==0.5.0
typing-extensions==3.7.4.1 # via onnx
urllib3==1.25.8 # via requests
werkzeug==0.16.1 # via tensorboard
wheel==0.34.1 # via tensorboard, tensorflow
wrapt==1.11.2 # via tensorflow

# The following packages are considered to be unsafe in a requirements file:
# setuptools==41.2.0 # via markdown, protobuf, tensorboard
# setuptools
65 changes: 58 additions & 7 deletions ci/requirements-demos.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,58 @@
joblib==0.14.0
nibabel==2.5.1
numpy==1.17.2 ; python_version >= "3.4"
scikit-learn==0.21.3
scipy==1.3.1
six==1.12.0 # via nibabel
tqdm==4.39.0
absl-py==0.9.0 # via tensorboard
attrs==19.3.0 # via pytest
cachetools==4.0.0 # via google-auth
certifi==2019.11.28 # via requests
chardet==3.0.4 # via requests
cycler==0.10.0 # via matplotlib
entrypoints==0.3 # via flake8
flake8-import-order==0.18.1 # via motmetrics
flake8==3.7.9 # via motmetrics
google-auth-oauthlib==0.4.1 # via tensorboard
google-auth==1.11.3 # via google-auth-oauthlib, tensorboard
grpcio==1.27.2 # via tensorboard
idna==2.9 # via requests
importlib-metadata==1.5.0 # via pluggy, pytest
joblib==0.14.1 # via scikit-learn
kiwisolver==1.1.0 # via matplotlib
markdown==3.2.1 # via tensorboard
matplotlib==3.0.3
mccabe==0.6.1 # via flake8
more-itertools==8.2.0 # via pytest
motmetrics==1.2.0
nibabel==3.0.2
numpy==1.18.1 ; python_version >= "3.4"
oauthlib==3.1.0 # via requests-oauthlib
packaging==20.3 # via pytest
pandas==0.24.2 # via motmetrics
pathlib2==2.3.5 # via pytest
pluggy==0.13.1 # via pytest
protobuf==3.11.3 # via tensorboard, tensorboardx
py-cpuinfo==5.0.0 # via pytest-benchmark
py==1.8.1 # via pytest
pyasn1-modules==0.2.8 # via google-auth
pyasn1==0.4.8 # via pyasn1-modules, rsa
pycodestyle==2.5.0 # via flake8, flake8-import-order
pyflakes==2.1.1 # via flake8
pyparsing==2.4.6 # via matplotlib, packaging
pytest-benchmark==3.2.3 # via motmetrics
pytest==5.4.1 # via motmetrics, pytest-benchmark
python-dateutil==2.8.1 # via matplotlib, pandas
pytz==2019.3 # via pandas
requests-oauthlib==1.3.0 # via google-auth-oauthlib
requests==2.23.0 # via requests-oauthlib, tensorboard
rsa==4.0 # via google-auth
scikit-learn==0.22.2.post1
scipy==1.4.1
six==1.14.0 # via absl-py, cycler, google-auth, grpcio, packaging, pathlib2, protobuf, python-dateutil, tensorboard, tensorboardx
tensorboard==2.1.1
tensorboardx==2.0
tqdm==4.43.0
urllib3==1.25.8 # via requests
wcwidth==0.1.8 # via pytest
werkzeug==1.0.0 # via tensorboard
wheel==0.34.2 # via tensorboard
xmltodict==0.12.0 # via motmetrics
zipp==1.2.0 # via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
6 changes: 3 additions & 3 deletions ci/requirements-downloader.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
# pip-compile --output-file=ci/requirements-downloader.txt tools/downloader/requirements.in
#
certifi==2019.9.11 # via requests
certifi==2019.11.28 # via requests
chardet==3.0.4 # via requests
idna==2.8 # via requests
pyyaml==5.1.2
pyyaml==5.3
requests==2.22.0
urllib3==1.25.6 # via requests
urllib3==1.25.8 # via requests
67 changes: 67 additions & 0 deletions ci/update-requirements.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
#!/usr/bin/env python3

"""
This script updates all of the requirements-*.txt files in this directory
with the most recent package versions.
It uses pip-compile (https://github.com/jazzband/pip-tools), so install that
before running it.
"""

import argparse
import functools
import os
import subprocess
import sys

from pathlib import Path

# Package dependencies can vary depending on the Python version.
# We thus have to run pip-compile with the lowest Python version that
# the project supports.
EXPECTED_PYTHON_VERSION = (3, 5)

repo_root = Path(__file__).resolve().parent.parent

def pip_compile(target, *sources, upgrade=False):
print('updating {}...'.format(target), flush=True)

# Use --no-header, since the OpenVINO install path may vary between machines,
# so it should not be embedded in the output file. Also, this script makes
# the information in pip-compile's headers redundant.

subprocess.run(
[sys.executable, '-mpiptools', 'compile',
*(['--upgrade'] if upgrade else []),
'--no-header', '--quiet', '-o', target, '--', *map(str, sources)],
check=True, cwd=str(repo_root))

def main():
parser = argparse.ArgumentParser()
parser.add_argument('--upgrade', action='store_true', help='Bump package versions')
args = parser.parse_args()

if sys.version_info[:2] != EXPECTED_PYTHON_VERSION:
sys.exit("run this with Python {}".format('.'.join(map(str, EXPECTED_PYTHON_VERSION))))

if 'INTEL_OPENVINO_DIR' not in os.environ:
sys.exit("run OpenVINO toolkit's setupvars.sh before this")

openvino_dir = Path(os.environ['INTEL_OPENVINO_DIR'])

pc = functools.partial(pip_compile, upgrade=args.upgrade)

pc('ci/requirements-ac.txt',
'tools/accuracy_checker/requirements.in')
pc('ci/requirements-ac-test.txt',
'tools/accuracy_checker/requirements.in', 'tools/accuracy_checker/requirements-test.in')
pc('ci/requirements-conversion.txt',
'tools/downloader/requirements-pytorch.in', 'tools/downloader/requirements-caffe2.in',
openvino_dir / 'deployment_tools/model_optimizer/requirements.txt')
pc('ci/requirements-demos.txt',
'demos/python_demos/requirements.txt', openvino_dir / 'python/requirements.txt')
pc('ci/requirements-downloader.txt',
'tools/downloader/requirements.in')

if __name__ == '__main__':
main()
18 changes: 6 additions & 12 deletions demos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -157,19 +157,15 @@ 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})
if(IE_SAMPLES_HEADERS)
source_group("include" FILES ${IE_SAMPLES_HEADERS})
source_group("src" FILES ${IE_SAMPLE_SOURCES})
if(IE_SAMPLE_HEADERS)
source_group("include" FILES ${IE_SAMPLE_HEADERS})
endif()

# Create executable file from sources
add_executable(${IE_SAMPLE_NAME} ${IE_SAMPLE_SOURCES} ${IE_SAMPLES_HEADERS})
add_executable(${IE_SAMPLE_NAME} ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS})

if(WIN32)
set_target_properties(${IE_SAMPLE_NAME} PROPERTIES COMPILE_PDB_NAME ${IE_SAMPLE_NAME})
Expand All @@ -180,10 +176,6 @@ 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} gflags)

Expand Down Expand Up @@ -213,6 +205,8 @@ else()
find_package(InferenceEngine 2.0 REQUIRED)
endif()

find_package(ngraph REQUIRED)

# collect all samples subdirectories
file(GLOB samples_dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
# skip building of unnecessary subdirectories
Expand Down
Loading

0 comments on commit 7d23575

Please sign in to comment.