Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@WenjingKangIntel
WenjingKangIntel committed Oct 21, 2020
2 parents e38b7ae + 05a3b4b commit f16daec
Show file tree
Hide file tree
Showing 111 changed files with 1,717 additions and 469 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
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-2021.2-green.svg)](https://github.com/opencv/open_model_zoo/releases/tag/2021.2)
[![Stable release](https://img.shields.io/badge/version-2021.2-green.svg)](https://github.com/openvinotoolkit/open_model_zoo/releases/tag/2021.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 @@ -31,7 +31,7 @@ Open Model Zoo is licensed under [Apache License Version 2.0](LICENSE).
We welcome community contributions to the Open Model Zoo repository. If you have an idea how to improve the product, please share it with us doing the following steps:
* Make sure you can build the product and run all the demos with your patch.
* In case of a larger feature, provide a relevant demo.
* Submit a pull request at https://github.com/opencv/open_model_zoo/pulls
* Submit a pull request at https://github.com/openvinotoolkit/open_model_zoo/pulls

You can find additional information about model contribution [here](CONTRIBUTING.md).

Expand All @@ -42,7 +42,7 @@ Open Model Zoo is licensed under Apache License, Version 2.0. By contributing to
## Support
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)
* [GitHub* Issues](https://github.com/openvinotoolkit/open_model_zoo/issues)
* [Forum](https://software.intel.com/en-us/forums/intel-distribution-of-openvino-toolkit)
* [Gitter](https://gitter.im/open_model_zoo/community)

Expand Down
8 changes: 6 additions & 2 deletions ci/get-jobs-for-changes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,17 @@ def main():
jobs = {}

for changed_file in changed_files:
if models_dir in changed_file.parents and changed_file.name == "model.yml":
if models_dir in changed_file.parents and \
(changed_file.name == "model.yml" or changed_file.suffix == ".py"):
if Path(changed_file).exists(): # it might've been deleted in the branch
jobs.setdefault("models", []).append(changed_file.parent.name)
jobs.setdefault("models", set()).add(changed_file.parent.name)
else:
# make sure no models.lst files reference the deleted model
jobs["models_lst"] = True

if "models" in jobs:
jobs["models"] = sorted(jobs["models"]) # JSON can't work with a set

git_check_attr_output = subprocess.run(
["git", "check-attr", "--stdin", "-z", "--all"],
input=git_diff_output, stdout=subprocess.PIPE, check=True).stdout
Expand Down
54 changes: 30 additions & 24 deletions ci/requirements-ac-test.txt
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,48 @@
# use update-requirements.py to update this file

atomicwrites==1.4.0 # via -r tools/accuracy_checker/requirements-test.in
attrs==19.3.0 # via pytest
attrs==20.2.0 # via pytest
certifi==2020.6.20 # via matplotlib
click==7.1.2 # via nltk
cycler==0.10.0 # via matplotlib
decorator==4.4.2 # via networkx
editdistance==0.5.3 # via -r tools/accuracy_checker/requirements.in
fast-ctc-decode==0.2.5 # via -r tools/accuracy_checker/requirements.in
imageio==2.9.0 # via scikit-image
importlib-metadata==1.7.0 # via pluggy, pytest
joblib==0.14.1 # via scikit-learn
kiwisolver==1.1.0 # via matplotlib
matplotlib==3.0.3 # via scikit-image
more-itertools==8.4.0 # via pytest
networkx==2.4 # via scikit-image
nibabel==3.0.2 # via -r tools/accuracy_checker/requirements.in
numpy==1.17.5 # via -r tools/accuracy_checker/requirements-core.in, imageio, matplotlib, nibabel, pywavelets, scikit-learn, scipy
packaging==20.4 # via pytest
pathlib2==2.3.5 # via pytest
pillow==7.2.0 # via -r tools/accuracy_checker/requirements.in, imageio, scikit-image
importlib-metadata==2.0.0 # via pluggy, pytest
joblib==0.17.0 # via nltk, scikit-learn
kiwisolver==1.2.0 # via matplotlib
matplotlib==3.3.2 # via scikit-image
more-itertools==8.5.0 # via pytest
networkx==2.5 # via scikit-image
nibabel==3.1.1 # via -r tools/accuracy_checker/requirements.in
nltk==3.5 # via -r tools/accuracy_checker/requirements.in
numpy==1.17.5 # via -r tools/accuracy_checker/requirements-core.in, imageio, matplotlib, nibabel, parasail, pywavelets, scikit-image, scikit-learn, scipy, tifffile
packaging==20.4 # via nibabel, pytest
parasail==1.2 # via -r tools/accuracy_checker/requirements.in
pillow==8.0.0 # via -r tools/accuracy_checker/requirements-core.in, imageio, matplotlib, scikit-image
pluggy==0.13.1 # via pytest
py-cpuinfo==4.0.0 # via -r tools/accuracy_checker/requirements.in
py-cpuinfo==7.0.0 # via -r tools/accuracy_checker/requirements.in
py==1.9.0 # via pytest
pydicom==2.0.0 # via -r tools/accuracy_checker/requirements.in
pyparsing==2.4.7 # via matplotlib, packaging
pypi-kenlm==0.1.20190403 # via -r tools/accuracy_checker/requirements.in
pytest-mock==2.0.0 # via -r tools/accuracy_checker/requirements-test.in
pytest==5.4.3 # via -r tools/accuracy_checker/requirements-test.in, pytest-mock
python-dateutil==2.8.1 # via matplotlib
pywavelets==1.1.1 # via scikit-image
pyyaml==5.3.1 # via -r tools/accuracy_checker/requirements-core.in
scikit-image==0.15.0 # via -r tools/accuracy_checker/requirements.in
scikit-learn==0.22.2.post1 # via -r tools/accuracy_checker/requirements.in
scipy==1.4.1 # via -r tools/accuracy_checker/requirements.in, scikit-image, scikit-learn
regex==2020.10.15 # via nltk
scikit-image==0.17.2 # via -r tools/accuracy_checker/requirements.in
scikit-learn==0.23.2 # via -r tools/accuracy_checker/requirements.in
scipy==1.5.2 # via -r tools/accuracy_checker/requirements.in, scikit-image, scikit-learn
sentencepiece==0.1.91 # via -r tools/accuracy_checker/requirements.in
shapely==1.7.0 # via -r tools/accuracy_checker/requirements.in
six==1.15.0 # via packaging, pathlib2, python-dateutil
tokenizers==0.8.0 # via -r tools/accuracy_checker/requirements.in
tqdm==4.47.0 # via -r tools/accuracy_checker/requirements.in
shapely==1.7.1 # via -r tools/accuracy_checker/requirements.in
six==1.15.0 # via packaging, python-dateutil
threadpoolctl==2.1.0 # via scikit-learn
tifffile==2020.9.3 # via scikit-image
tokenizers==0.9.1 # via -r tools/accuracy_checker/requirements.in
tqdm==4.50.2 # via -r tools/accuracy_checker/requirements.in, nltk
wcwidth==0.2.5 # via pytest
zipp==1.2.0 # via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
wheel==0.35.1 # via parasail
zipp==3.3.0 # via importlib-metadata
46 changes: 27 additions & 19 deletions ci/requirements-ac.txt
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,38 @@
# use update-requirements.py to update this file

certifi==2020.6.20 # via matplotlib
click==7.1.2 # via nltk
cycler==0.10.0 # via matplotlib
decorator==4.4.2 # via networkx
editdistance==0.5.3 # via -r tools/accuracy_checker/requirements.in
fast-ctc-decode==0.2.5 # via -r tools/accuracy_checker/requirements.in
imageio==2.9.0 # via scikit-image
joblib==0.14.1 # via scikit-learn
kiwisolver==1.1.0 # via matplotlib
matplotlib==3.0.3 # via scikit-image
networkx==2.4 # via scikit-image
nibabel==3.0.2 # via -r tools/accuracy_checker/requirements.in
numpy==1.17.5 # via -r tools/accuracy_checker/requirements-core.in, imageio, matplotlib, nibabel, pywavelets, scikit-learn, scipy
pillow==7.2.0 # via -r tools/accuracy_checker/requirements.in, imageio, scikit-image
py-cpuinfo==4.0.0 # via -r tools/accuracy_checker/requirements.in
joblib==0.17.0 # via nltk, scikit-learn
kiwisolver==1.2.0 # via matplotlib
matplotlib==3.3.2 # via scikit-image
networkx==2.5 # via scikit-image
nibabel==3.1.1 # via -r tools/accuracy_checker/requirements.in
nltk==3.5 # via -r tools/accuracy_checker/requirements.in
numpy==1.17.5 # via -r tools/accuracy_checker/requirements-core.in, imageio, matplotlib, nibabel, parasail, pywavelets, scikit-image, scikit-learn, scipy, tifffile
packaging==20.4 # via nibabel
parasail==1.2 # via -r tools/accuracy_checker/requirements.in
pillow==8.0.0 # via -r tools/accuracy_checker/requirements-core.in, imageio, matplotlib, scikit-image
py-cpuinfo==7.0.0 # via -r tools/accuracy_checker/requirements.in
pydicom==2.0.0 # via -r tools/accuracy_checker/requirements.in
pyparsing==2.4.7 # via matplotlib
pyparsing==2.4.7 # via matplotlib, packaging
pypi-kenlm==0.1.20190403 # via -r tools/accuracy_checker/requirements.in
python-dateutil==2.8.1 # via matplotlib
pywavelets==1.1.1 # via scikit-image
pyyaml==5.3.1 # via -r tools/accuracy_checker/requirements-core.in
scikit-image==0.15.0 # via -r tools/accuracy_checker/requirements.in
scikit-learn==0.22.2.post1 # via -r tools/accuracy_checker/requirements.in
scipy==1.4.1 # via -r tools/accuracy_checker/requirements.in, scikit-image, scikit-learn
regex==2020.10.15 # via nltk
scikit-image==0.17.2 # via -r tools/accuracy_checker/requirements.in
scikit-learn==0.23.2 # via -r tools/accuracy_checker/requirements.in
scipy==1.5.2 # via -r tools/accuracy_checker/requirements.in, scikit-image, scikit-learn
sentencepiece==0.1.91 # via -r tools/accuracy_checker/requirements.in
shapely==1.7.0 # via -r tools/accuracy_checker/requirements.in
six==1.15.0 # via python-dateutil
tokenizers==0.8.0 # via -r tools/accuracy_checker/requirements.in
tqdm==4.47.0 # via -r tools/accuracy_checker/requirements.in

# The following packages are considered to be unsafe in a requirements file:
# setuptools
shapely==1.7.1 # via -r tools/accuracy_checker/requirements.in
six==1.15.0 # via packaging, python-dateutil
threadpoolctl==2.1.0 # via scikit-learn
tifffile==2020.9.3 # via scikit-image
tokenizers==0.9.1 # via -r tools/accuracy_checker/requirements.in
tqdm==4.50.2 # via -r tools/accuracy_checker/requirements.in, nltk
wheel==0.35.1 # via parasail
52 changes: 26 additions & 26 deletions ci/requirements-conversion.txt
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
# use update-requirements.py to update this file

absl-py==0.9.0 # via tensorboard, tensorflow
absl-py==0.10.0 # via tensorboard, tensorflow
astunparse==1.6.3 # via tensorflow
cachetools==4.1.1 # via google-auth
certifi==2020.6.20 # via requests
chardet==3.0.4 # via requests
decorator==4.4.2 # via networkx
defusedxml==0.6.0 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements.txt
future==0.18.2 # via -r tools/downloader/requirements-caffe2.in
defusedxml==0.6.0 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_caffe.txt, -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_mxnet.txt, -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_onnx.txt, -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_tf2.txt
future==0.18.2 # via -r tools/downloader/requirements-caffe2.in, torch
gast==0.3.3 # via tensorflow
google-auth-oauthlib==0.4.1 # via tensorboard
google-auth==1.18.0 # via google-auth-oauthlib, tensorboard
google-auth==1.22.1 # via google-auth-oauthlib, tensorboard
google-pasta==0.2.0 # via tensorflow
graphviz==0.8.4 # via mxnet
grpcio==1.30.0 # via tensorboard, tensorflow
grpcio==1.32.0 # via tensorboard, tensorflow
h5py==2.10.0 # via tensorflow
idna==2.10 # via requests
importlib-metadata==1.7.0 # via markdown
importlib-metadata==2.0.0 # via markdown
keras-preprocessing==1.1.2 # via tensorflow
markdown==3.2.2 # via tensorboard
mxnet==1.5.1 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements.txt
networkx==2.4 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements.txt
numpy==1.18.5 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements.txt, h5py, keras-preprocessing, mxnet, onnx, opt-einsum, scipy, tensorboard, tensorflow, torch, torchvision
markdown==3.3.1 # via tensorboard
mxnet==1.5.1 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_mxnet.txt
networkx==2.5 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_caffe.txt, -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_mxnet.txt, -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_onnx.txt, -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_tf2.txt
numpy==1.18.5 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_caffe.txt, -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_mxnet.txt, -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_onnx.txt, -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_tf2.txt, h5py, keras-preprocessing, mxnet, onnx, opt-einsum, scipy, tensorboard, tensorflow, torch, torchvision
oauthlib==3.1.0 # via requests-oauthlib
onnx==1.7.0 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements.txt, -r tools/downloader/requirements-caffe2.in, -r tools/downloader/requirements-pytorch.in
opt-einsum==3.2.1 # via tensorflow
pillow==7.2.0 # via torchvision
protobuf==3.12.2 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements.txt, onnx, tensorboard, tensorflow
onnx==1.7.0 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_onnx.txt, -r tools/downloader/requirements-caffe2.in, -r tools/downloader/requirements-pytorch.in
opt-einsum==3.3.0 # via tensorflow
pillow==8.0.0 # via torchvision
protobuf==3.13.0 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_caffe.txt, onnx, tensorboard, tensorflow
pyasn1-modules==0.2.8 # via google-auth
pyasn1==0.4.8 # via pyasn1-modules, rsa
requests-oauthlib==1.3.0 # via google-auth-oauthlib
requests==2.24.0 # via mxnet, requests-oauthlib, tensorboard
rsa==4.6 # via google-auth
scipy==1.4.1 # via -r tools/downloader/requirements-pytorch.in, tensorflow
six==1.15.0 # via absl-py, astunparse, google-auth, google-pasta, grpcio, h5py, keras-preprocessing, onnx, protobuf, tensorboard, tensorflow, test-generator, torchvision
scipy==1.5.2 # via -r tools/downloader/requirements-pytorch.in
six==1.15.0 # via absl-py, astunparse, google-auth, google-pasta, grpcio, h5py, keras-preprocessing, onnx, protobuf, tensorboard, tensorflow, test-generator
tensorboard-plugin-wit==1.7.0 # via tensorboard
tensorboard==2.2.2 # via tensorflow
tensorflow-estimator==2.2.0 # via tensorflow
tensorflow==2.2.0 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements.txt
tensorboard==2.3.0 # via tensorflow
tensorflow-estimator==2.3.0 # via tensorflow
tensorflow==2.3.1 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_tf2.txt
termcolor==1.1.0 # via tensorflow
test-generator==0.1.1 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements.txt
torch==1.4.0 # via -r tools/downloader/requirements-caffe2.in, -r tools/downloader/requirements-pytorch.in, torchvision
torchvision==0.5.0 # via -r tools/downloader/requirements-pytorch.in
typing-extensions==3.7.4.2 # via onnx
urllib3==1.25.9 # via requests
test-generator==0.1.1 # via -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_caffe.txt, -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_mxnet.txt, -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_onnx.txt, -r ${INTEL_OPENVINO_DIR}/deployment_tools/model_optimizer/requirements_tf2.txt
torch==1.6.0 # via -r tools/downloader/requirements-caffe2.in, -r tools/downloader/requirements-pytorch.in, torchvision
torchvision==0.7.0 # via -r tools/downloader/requirements-pytorch.in
typing-extensions==3.7.4.3 # via onnx
urllib3==1.25.10 # via requests
werkzeug==1.0.1 # via tensorboard
wheel==0.34.2 # via astunparse, tensorboard, tensorflow
wheel==0.35.1 # via astunparse, tensorboard, tensorflow
wrapt==1.12.1 # via tensorflow
zipp==1.2.0 # via importlib-metadata
zipp==3.3.0 # via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
Loading

0 comments on commit f16daec

Please sign in to comment.