Skip to content

Commit 7862ab4

Browse files
ielizieliz
authored
Merge branch 'openvinotoolkit:master' into master
2 parents e41a440 + 06a8066 commit 7862ab4

File tree

489 files changed

+6441
-3243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

489 files changed

+6441
-3243
lines changed

‎.github/labeler.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.github/workflows/labeler.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Downloadable files. Each file is described by:
8686

8787
* `name` - sets a file name after downloading
8888
* `size` - sets a file size
89-
* `sha384` - sets a file hash sum
89+
* `checksum` - sets a file hash sum
9090
* `source` - sets a direct link to a file *OR* describes a file access parameters
9191

9292
> **TIP**: You can obtain a hash sum using the `sha384sum <file_name>` command on Linux\*.
@@ -155,7 +155,7 @@ task_type: classification
155155
files:
156156
- name: tf-densenet121.tar.gz
157157
size: 30597420
158-
sha384: dcd6d36f6b07e0843ee35b1dce2c587204c8816d6ba25b7e1dbf2dc25fe2b51f49a2b9327579ce07904575f9325be8b6
158+
checksum: dcd6d36f6b07e0843ee35b1dce2c587204c8816d6ba25b7e1dbf2dc25fe2b51f49a2b9327579ce07904575f9325be8b6
159159
source:
160160
$type: google_drive
161161
id: 0B_fUSpodN0t0eW1sVk1aeWREaDA

‎ci/check-basics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def complain(message):
5151

5252
print('running miscellaneous checks...', flush=True)
5353

54-
if subprocess.run(['git', '--no-pager', 'diff', '--check', empty_tree_hash, '--'],
54+
if subprocess.run(['git', '--no-pager', 'diff', '--check', empty_tree_hash, '--', ':(exclude)data/dataset_classes/gnhk.txt'],
5555
cwd=OMZ_ROOT).returncode != 0:
5656
all_passed = False
5757

‎ci/dependencies.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
openvino_linux: '2021.4.689'
2-
openvino_windows: '2021.4.689'
1+
openvino_linux: '2021.4.752'
2+
openvino_windows: '2021.4.752'

‎ci/lib/omzdocs.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ def _get_all_ast_nodes(ast_nodes):
2222
for node in ast_nodes:
2323
yield node
2424
if 'children' in node:
25-
# workaround for https://github.com/lepture/mistune/issues/269
26-
if isinstance(node['children'], str):
27-
yield {'type': 'text', 'text': node['children']}
28-
else:
29-
yield from _get_all_ast_nodes(node['children'])
25+
yield from _get_all_ast_nodes(node['children'])
3026

3127
def _get_text_from_ast(ast_nodes):
3228
def get_text_from_node(node):

‎ci/requirements-check-basics.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ importlib-metadata==4.8.1
1919
# stevedore
2020
mccabe==0.6.1
2121
# via flake8
22-
mistune==2.0.0a6
22+
mistune==2.0.0
2323
# via -r ci/requirements-documentation.in
2424
pathspec==0.9.0
2525
# via yamllint

‎ci/requirements-documentation.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
mistune==2.0.0a6
1+
mistune~=2.0
22
pyyaml

‎ci/requirements-openvino-dev.in

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
PyYAML (>=5.4.1)
2+
addict (>=2.4.0)
3+
defusedxml (>=0.7.1)
4+
defusedxml (>=0.7.1) ; extra == 'caffe'
5+
defusedxml (>=0.7.1) ; extra == 'kaldi'
6+
defusedxml (>=0.7.1) ; extra == 'mxnet'
7+
defusedxml (>=0.7.1) ; extra == 'onnx'
8+
defusedxml (>=0.7.1) ; extra == 'tensorflow'
9+
defusedxml (>=0.7.1) ; extra == 'tensorflow2'
10+
editdistance (>=0.5.3)
11+
fast-ctc-decode (>=0.2.5)
12+
future (>=0.18.2) ; extra == 'caffe2'
13+
hyperopt (~=0.1.2)
14+
jstyleson (~=0.0.2)
15+
mxnet (~=1.2.0) ; (sys_platform == "win32") and extra == 'mxnet'
16+
mxnet (~=1.7.0.post2) ; (sys_platform != "win32") and extra == 'mxnet'
17+
networkx (~=2.5)
18+
networkx (~=2.5) ; extra == 'caffe'
19+
networkx (~=2.5) ; extra == 'kaldi'
20+
networkx (~=2.5) ; extra == 'mxnet'
21+
networkx (~=2.5) ; extra == 'onnx'
22+
networkx (~=2.5) ; extra == 'tensorflow'
23+
networkx (~=2.5) ; extra == 'tensorflow2'
24+
nibabel (>=3.2.1)
25+
nltk (>=3.5)
26+
numpy (<1.19,>=1.16.6) ; extra == 'tensorflow'
27+
numpy (<1.20,>=1.16.6)
28+
numpy (<1.20,>=1.16.6) ; extra == 'caffe'
29+
numpy (<1.20,>=1.16.6) ; extra == 'kaldi'
30+
numpy (<1.20,>=1.16.6) ; extra == 'mxnet'
31+
numpy (<1.20,>=1.16.6) ; extra == 'onnx'
32+
numpy (<1.20,>=1.16.6) ; extra == 'tensorflow2'
33+
onnx (>=1.8.1) ; extra == 'caffe2'
34+
onnx (>=1.8.1) ; extra == 'onnx'
35+
onnx (>=1.8.1) ; extra == 'pytorch'
36+
opencv-python (==4.5.*)
37+
openvino (==2021.4.2)
38+
pandas (~=1.1.5)
39+
parasail (>=1.2.4)
40+
pillow (>=8.1.2)
41+
progress (>=1.5)
42+
protobuf (>=3.15.6) ; extra == 'caffe'
43+
py-cpuinfo (>=7.0.0)
44+
pydicom (>=2.1.2)
45+
pyyaml (>=5.4.1)
46+
rawpy (>=0.16.0)
47+
requests (>=2.25.1)
48+
requests (>=2.25.1) ; extra == 'caffe'
49+
requests (>=2.25.1) ; extra == 'kaldi'
50+
requests (>=2.25.1) ; extra == 'mxnet'
51+
requests (>=2.25.1) ; extra == 'onnx'
52+
requests (>=2.25.1) ; extra == 'tensorflow'
53+
requests (>=2.25.1) ; extra == 'tensorflow2'
54+
scikit-image (>=0.17.2)
55+
scikit-learn (>=0.24.1)
56+
scipy (~=1.5.4)
57+
scipy (~=1.5.4) ; extra == 'pytorch'
58+
sentencepiece (>=0.1.95)
59+
shapely (>=1.7.1)
60+
tensorflow (~=1.15.5) ; extra == 'tensorflow'
61+
tensorflow (~=2.4.1) ; extra == 'tensorflow2'
62+
texttable (~=1.6.3)
63+
tokenizers (>=0.10.1)
64+
torch (==1.8.1) ; extra == 'caffe2'
65+
torch (==1.8.1) ; extra == 'pytorch'
66+
torchvision (==0.9.1) ; extra == 'pytorch'
67+
tqdm (>=4.54.1)
68+
urllib3 (>=1.26.4) ; extra == 'mxnet'
69+
yacs (>=0.1.8) ; extra == 'pytorch'
70+
yamlloader (>=0.5)

‎ci/requirements-openvino-dev.txt

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
# use update-requirements.py to update this file
2+
3+
addict==2.4.0
4+
# via -r ci/requirements-openvino-dev.in
5+
certifi==2021.10.8
6+
# via requests
7+
charset-normalizer==2.0.8
8+
# via requests
9+
click==8.0.3
10+
# via nltk
11+
colorama==0.4.4
12+
# via
13+
# click
14+
# tqdm
15+
cycler==0.11.0
16+
# via matplotlib
17+
decorator==4.4.2
18+
# via networkx
19+
defusedxml==0.7.1
20+
# via -r ci/requirements-openvino-dev.in
21+
editdistance==0.6.0
22+
# via -r ci/requirements-openvino-dev.in
23+
fast-ctc-decode==0.3.0
24+
# via -r ci/requirements-openvino-dev.in
25+
future==0.18.2
26+
# via hyperopt
27+
hyperopt==0.1.2
28+
# via -r ci/requirements-openvino-dev.in
29+
idna==3.3
30+
# via requests
31+
imageio==2.13.1
32+
# via scikit-image
33+
importlib-metadata==4.8.2
34+
# via click
35+
joblib==1.1.0
36+
# via
37+
# nltk
38+
# scikit-learn
39+
jstyleson==0.0.2
40+
# via -r ci/requirements-openvino-dev.in
41+
kiwisolver==1.3.1
42+
# via matplotlib
43+
matplotlib==3.3.4
44+
# via scikit-image
45+
networkx==2.5.1
46+
# via
47+
# -r ci/requirements-openvino-dev.in
48+
# hyperopt
49+
# scikit-image
50+
nibabel==3.2.1
51+
# via -r ci/requirements-openvino-dev.in
52+
nltk==3.6.5
53+
# via -r ci/requirements-openvino-dev.in
54+
numpy==1.19.5
55+
# via
56+
# -r ci/requirements-openvino-dev.in
57+
# hyperopt
58+
# imageio
59+
# matplotlib
60+
# nibabel
61+
# opencv-python
62+
# openvino
63+
# pandas
64+
# parasail
65+
# pywavelets
66+
# rawpy
67+
# scikit-image
68+
# scikit-learn
69+
# scipy
70+
# tifffile
71+
opencv-python==4.5.4.60
72+
# via -r ci/requirements-openvino-dev.in
73+
openvino==2021.4.2
74+
# via -r ci/requirements-openvino-dev.in
75+
packaging==21.3
76+
# via nibabel
77+
pandas==1.1.5
78+
# via -r ci/requirements-openvino-dev.in
79+
parasail==1.2.4
80+
# via -r ci/requirements-openvino-dev.in
81+
pillow==8.4.0
82+
# via
83+
# -r ci/requirements-openvino-dev.in
84+
# imageio
85+
# matplotlib
86+
# scikit-image
87+
progress==1.6
88+
# via -r ci/requirements-openvino-dev.in
89+
py-cpuinfo==8.0.0
90+
# via -r ci/requirements-openvino-dev.in
91+
pydicom==2.2.2
92+
# via -r ci/requirements-openvino-dev.in
93+
pymongo==4.0
94+
# via hyperopt
95+
pyparsing==3.0.6
96+
# via
97+
# matplotlib
98+
# packaging
99+
python-dateutil==2.8.2
100+
# via
101+
# matplotlib
102+
# pandas
103+
pytz==2021.3
104+
# via pandas
105+
pywavelets==1.1.1
106+
# via scikit-image
107+
pyyaml==6.0
108+
# via
109+
# -r ci/requirements-openvino-dev.in
110+
# yamlloader
111+
rawpy==0.16.0
112+
# via -r ci/requirements-openvino-dev.in
113+
regex==2021.11.10
114+
# via nltk
115+
requests==2.26.0
116+
# via -r ci/requirements-openvino-dev.in
117+
scikit-image==0.17.2
118+
# via -r ci/requirements-openvino-dev.in
119+
scikit-learn==0.24.2
120+
# via -r ci/requirements-openvino-dev.in
121+
scipy==1.5.4
122+
# via
123+
# -r ci/requirements-openvino-dev.in
124+
# hyperopt
125+
# scikit-image
126+
# scikit-learn
127+
sentencepiece==0.1.96
128+
# via -r ci/requirements-openvino-dev.in
129+
shapely==1.8.0
130+
# via -r ci/requirements-openvino-dev.in
131+
six==1.16.0
132+
# via
133+
# hyperopt
134+
# python-dateutil
135+
texttable==1.6.4
136+
# via -r ci/requirements-openvino-dev.in
137+
threadpoolctl==3.0.0
138+
# via scikit-learn
139+
tifffile==2020.9.3
140+
# via scikit-image
141+
tokenizers==0.10.3
142+
# via -r ci/requirements-openvino-dev.in
143+
tqdm==4.62.3
144+
# via
145+
# -r ci/requirements-openvino-dev.in
146+
# hyperopt
147+
# nltk
148+
typing-extensions==4.0.1
149+
# via importlib-metadata
150+
urllib3==1.26.7
151+
# via requests
152+
yamlloader==1.1.0
153+
# via -r ci/requirements-openvino-dev.in
154+
zipp==3.6.0
155+
# via importlib-metadata

0 commit comments

Comments
 (0)