Commit Graph

244 Commits

Author SHA1 Message Date
Eugeny Volosenkov
439e3b26aa Model Optimizer incorrectly convert per-channel Quantize/Dequantize operatros to FakeQuantize (#8321)
* add q_dq_resolver

* prepare FQ for offline transfornations

* fix quantize_dequantize_linear_resolver.py

* fix tools/mo/openvino/tools/mo/middle/dequantize_linear_resolver.py

* enable compress_quantized_weights.py

* fix sub case

* delete force_clean_up

* add isolated attribute

* add test for quantize_dequantize_linear_resolver

* fix comments

* apply comments

* aplying comments

* applying comments

* applying comments

* Replace q_dq_resolver using pattern

* clean imports

* fix imports

* fix pattern

* delete refernce to unit tests
2022-01-25 15:35:43 +03:00
Anton Chetverikov
88903ee7ae Remove incorrect layout changing (#9764) 2022-01-25 14:10:06 +03:00
Anton Pankratov
f45991bd64 OV 2.0 c++ configuration API (#9870)
* New configuration API

* Review fix

* review coments

* fixed device name map

* fixed header

* code stile

* fixed optimization capabilities

* flatten properties

* dox fix

* doc

* merge conflicts

* fixed merge conflicts

* Fixed subobject linkage warning

* foramt fix

* Fixed unity test build

* Merge conflict fixes

* Fixed variadic
2022-01-25 12:43:56 +03:00
Alexey Lebedev
fe5c16ba6a [tools] Allow to use node name in command line parameters in python benchmark app (#9874)
* support node names in model specific parameters

* allow to use node name in -i parameter
2022-01-25 11:16:56 +03:00
Pavel Esir
41d4fcdf25 [MO] Add reverse_infer (input rank deducing) for set of operations (#8928)
* grouped convolution resolver fix

* add reverse_infer for Transpose, Elementwise, Identity and some fixes to successfully OOB convert MXNet models

* add reverse_infer for BatchNorms, dynamic groups fix, multi_box_prior.py fix

* add reverse infer for trivial cases

* input rank setting for image detection ops

* reverse_infer for Gather, AttributedGather add todo comment for Parameter

* reverse infer for LSTM, swapaxis; fixes and unit-tests for Elementwise, Gather, Transpose; also generalized Parameter reverse_infer; fixed DetectionOutput and partial reverse_infer

* clarified comment for LSTM reverse_infer

* detalized Elementwise reverse_infer, added several more unit-tests, Split reverse_infer fix, IteratorGetNext_ext.py fix

* generalized group convolution resolver

* specified in_ports explicitly

* clarified Split, Concat, Parameter, other minor typos

* relaxed compatibility check for elementwise; simplified scalar extracting for convolution.py and gather.py, fixed replacer order for ConvolutionNormalizer.py

* added routine set_input_shapes for image detection ops

* fixed typos to pass locally E2E, slightly changed LSTM reverse_infer

* VariadicSplit reverse_infer bugfix

* IteratorGetNextCut.py added check if port is connected

* explicitly specified in_port, added asserts, improved Split reverse infer

* sorted imports

* reverse_infer for ONNX and MXNet LSTM, GRU, RNN operations

* replaced Error raising with red warning

* added missing return for defined input shapes, fixed getting num groups for tf conv

* added mandatory attributes; fixed failing unit-tests, fixed typo with scalar group in ConvolutionNormalizer

* removed priorbox reverse_infer; Parameter reverse_infer corrected to use the only one existing out_port

* fixed clarify_partial_shape_test
2022-01-25 10:14:41 +03:00
Anastasia Popova
d27bbb4bdd Preserve inputs and outputs order for TensorFlow 2 and MXNet models (#9683)
* Preserve outputs order TF.

* Preserve of input/output indices for MxNet.

* Small fix.

* Added check.

* Small fix.

* Corrected Keras model importing.

* Fixed Keras model loading.

* Small correction.

* Corrected model loading.

* Small fix.

* Comment corrected.

* Removed unnecessary import.
2022-01-25 10:13:05 +03:00
Anastasia Popova
ce533fc287 Preserve input/output order for ONNX. (#9352)
* Preserving of input/output indices for ONNX.

* Fixed checks.

* Fixed for case of multiple outputs of node before Result.

* Added test for multiple tensor names before Result.

* Multiple tensor names before Result  fix.

* Added order alignment for user input/output.

* Extended for case of input names in Parameter tensor list.

* Fixed unit tests.

* Corrected help.

* Small correction.

* Code refactoring.

* Temporarily reverted refactor.

* Fixed wrong changes.

* Fixed wrong changes.

* Returned reverted refactoring.

* Removed inputs_list from serializing.
2022-01-24 15:50:28 +03:00
Mikhail Kozlov
40b4356537 Default IO precision for vpux and myriad (#9845) 2022-01-24 13:03:22 +03:00
Svetlana Dolinina
b9293dc424 changed Exit op infer function implementation: re-write in new API to avoid unmasking of shapes (#9664) 2022-01-24 12:12:02 +03:00
Alexander Zhogov
6c2d1e923c Revert "OV2.0 c++ configuration API (#9829)" (#9860)
This reverts commit 50da8c4aed.
2022-01-24 11:29:09 +03:00
Liubov Talamanova
b738983c1f [POT] Change version.txt location (#9715)
* Change POT version.txt location

* Update version

* Added version.txt to wheel

* Fix install requires
2022-01-24 11:22:12 +03:00
Nikita Malinin
5fe10299ab [POT] Small references update (#9831)
* Update golds and tolerance

* Disable mtcnn at sanity
2022-01-23 12:27:30 +03:00
Sergey Lyubimtsev
dbae4fef18 Update install guides for PyPI (#9760)
* update copyright

* Inference Engine -> OpenVINO™ Runtime

* Update package names

Update link to release notes
Update link to Inference Engine guide
Add note about plugins supported on macOS

* update names in headers

* trademarks

* beautify wording
2022-01-21 19:31:08 +03:00
Anton Pankratov
50da8c4aed OV2.0 c++ configuration API (#9829)
* New configuration API

* Review fix

* review coments

* fixed device name map

* fixed header

* code stile

* fixed optimization capabilities

* flatten properties

* dox fix

* doc

* merge conflicts

* fixed merge conflicts

* Fixed subobject linkage warning

* foramt fix
2022-01-21 18:44:41 +03:00
Mateusz Bencer
82cc7165e7 Fall back to legacy path if input freezing feature is used (#9668) 2022-01-21 16:46:59 +03:00
Alexander Zhogov
79ff926b6d Revert "OpenVINO runtime Configuration API (#7750)" (#9828)
This reverts commit 400e9ad916.
2022-01-21 13:30:39 +03:00
Anton Pankratov
400e9ad916 OpenVINO runtime Configuration API (#7750)
* New configuration API

* Review fix

* review coments

* fixed device name map

* fixed header

* code stile

* fixed optimization capabilities

* flatten properties

* dox fix

* doc

* merge conflicts

* fixed merge conflicts
2022-01-21 10:32:57 +03:00
Mateusz Bencer
70ccd0e91f Handle special cases during fallback (#9651) 2022-01-20 23:34:24 +01:00
Anton Chetverikov
ff6a9a1179 [MO] Fix normalize_outputs MaxPool function condition (#9613)
* Fix condition to correct handling MaxPool1 with only 1 output port

* Update check condition

* Add unit tests

* Sort imports

* Add comment
2022-01-20 19:52:42 +03:00
Nikita Malinin
ed634bd18e [POT] Tests & References update (#9694)
* Enable disabled tests

* Update references

* Update references

* Update passes.py for FP16 graph

* Update precision for nightly mobilenet

* Update references

* Update refs and disable model

* Update nightly refs

* Update nightly

* Revert mbv2 sanity gold
2022-01-20 16:23:00 +03:00
Ilya Lavrenov
8f3d030d79 Removed ov::runtime namespace (#9781)
* Removed ov::runtime namespace

* clang-format

* Fixes

* template reference

* Fixes
2022-01-20 16:17:57 +03:00
Maxim Vafin
32b1c509d5 Fix data type of inserted constants for means and scales (#9741) 2022-01-19 11:09:22 +03:00
Alexey Suhov
a79830cb55 Update year to 2022 in copyright notice (#9755) 2022-01-19 01:07:49 +03:00
Mateusz Bencer
0843555ff0 switch onnx to default path for MO (#9661) 2022-01-18 16:01:10 +01:00
Indira Salyahova
0082c7a286 [POT] set shape in FBC if undefined dimension in model (#9532)
* fix: set shape in fbc if undefined dimension in model

* Update tools/pot/openvino/tools/pot/algorithms/quantization/fast_bias_correction/algorithm.py

Co-authored-by: Liubov Talamanova  <piccione-mail@yandex.ru>

* Apply suggestions from code review

Co-authored-by: Liubov Talamanova  <piccione-mail@yandex.ru>

* update shape in bc id dynamic shape

Co-authored-by: Liubov Talamanova  <piccione-mail@yandex.ru>
2022-01-18 17:48:30 +03:00
Tomasz Dołbniak
456a5c65e3 Friendly names setting in ONNX FE (#9682) 2022-01-18 17:46:23 +03:00
Mateusz Bencer
5fe228bc14 Intorduce json model analysis feature on the new path (#9618) 2022-01-18 11:18:19 +01:00
Svetlana Dolinina
71b7c7000a Changed permutes mechanics for Kaldi (#5744)
* changed permutes

* fixed permutes

* fixed kernel

* fix transpose after convolution

* fix for convnet

* insert transposes for all convolutions and poolings

* refactor transformations;
added unit tests;
removed old transformations for addinf permutes/reshapes

* fixed constant types

* fixes after merge

* fixed bug for rm_cnn4a: added correct time_dim for the first convolution

* added fix for timeheightconvolution: in this case we have correct time set in convolution kernel already

* minor review fixes: renamed transformation and file

* rename in test

* rename in test

* sort imports + couplt changes in comments

* review fixes: refactoring

* replaced recursive implementation by nx.topological_sort;
fixed comments

* minor fixes: comment + preserving node names
2022-01-18 12:10:51 +03:00
Anton Chetverikov
919ada63ad Update undefined dimensions parcing im parameter extender (#9699) 2022-01-18 12:02:30 +03:00
Yegor Kruglov
9b129b7c1a [MO] Support MXNet Operations: batch_dot, LayerNorm, div_sqrt_dim (#7641)
* Add new operation support

* Update range_like replacer

* Move layer normalizer to middle

* Update bom file

* Update bom

* removed ArangeLike op

* updated bom

* added tests

* Updated docs

* comments relolving

* resolve documentation merge conflict

* arange_like op

* Revert "arange_like op"

This reverts commit a30f5bbb48.

* fixes in div_sqrt_dim

* comments resolving

* updated tests

* added batch_dot and layer_norm descriptions

* updated batch_dot comment

* updated comment

* move extractors to mxnet folder

* added replacer for batch_dot

* Revert "added replacer for batch_dot"

This reverts commit 8c0e52f7dc.

* return fully connected normalization

* fix typo

* updated fully connected normalization for mxnet

* changed assert message

* fixed gamma and beta shape incompatibility problem

* fixed imports, updated unittest

* resolve comments

Co-authored-by: iimironov <iliya.mironov@intel.com>
2022-01-18 11:12:30 +03:00
Gleb Kazantaev
72942471de Added MO root directory search to simplify MO execution process (#9681)
* Added MO root directory search to simplify MO execution process

* Update sys.path

* Simplify implementation
2022-01-18 01:58:22 +03:00
Svetlana Dolinina
0ed3da0e86 add warning about order if both mean and scale set (#9284)
* add warning about order if both mean and scale set

* Update tools/mo/openvino/tools/mo/main.py

Co-authored-by: Anastasia Popova <anastasia.popova@intel.com>

* removed warning, added phrase in documentation

* fixed merge

* added phrase about order of ,mean and scale in MO help

* duplicate MO help phrase in doc

* Update docs/MO_DG/prepare_model/convert_model/Converting_Model.md

Co-authored-by: Anastasiya Ageeva <anastasiya.ageeva@intel.com>

* Update docs/MO_DG/prepare_model/convert_model/Converting_Model.md

Co-authored-by: Anastasiya Ageeva <anastasiya.ageeva@intel.com>

* Update docs/MO_DG/prepare_model/convert_model/Converting_Model.md

Co-authored-by: Anastasiya Ageeva <anastasiya.ageeva@intel.com>

* Update tools/mo/openvino/tools/mo/utils/cli_parser.py

Co-authored-by: Anastasiya Ageeva <anastasiya.ageeva@intel.com>

* Update tools/mo/openvino/tools/mo/utils/cli_parser.py

Co-authored-by: Anastasiya Ageeva <anastasiya.ageeva@intel.com>

* remove tabs

* fix in order of reverse, mean, scale

Co-authored-by: Anastasia Popova <anastasia.popova@intel.com>
Co-authored-by: Anastasiya Ageeva <anastasiya.ageeva@intel.com>
2022-01-17 12:12:06 +03:00
Anastasia Kuporosova
8f12b72f46 [Python API] Rename offline_transformations in the new api (#9634)
* [Python API] Rename offline_transformations in the new api

* remove comments

* one more place to rename

* fix mo building

* fix after merge

* fix for pot import
2022-01-17 11:57:00 +03:00
Daria Mityagina
c1e2e0344b [ICV] Add flag to prevent IE from booting MX VPU (#9447)
An additional option whose purpose is to prevent the booting of the MX VPU when we want to generate some blobfile.
2022-01-14 17:15:51 +03:00
Tomasz Dołbniak
8b1514d49e Set additional tensor names only if necessary (#9652) 2022-01-14 12:44:50 +01:00
Anton Dudchenko
eb299f819e [IE][VPU] Rename and move VPU plugin to src/plugins (#9110)
* [IE][VPU] Rename and move VPU plugin to src/plugins

* Update some dependencies

* Change .md

* Update some dependencies

* Update some dependencies (again)

* I'll rename this one

* Remove ENABLE_MYRIAD arg

* Update XLink.cmake

* Update thirdparty CMakeList

* Minor fixes
2022-01-14 14:02:08 +03:00
Sergey Lyubimtsev
0ff88458f9 fix PyPI upload error: Invalid value for classifiers. Error: Classifier 'OSI Approved :: Apache Software License' is not a valid classifier. (#9656) 2022-01-14 13:09:12 +03:00
Anton Chetverikov
f4b0d40cd0 [MO] Skip rt_info in old graph comparator (#9638)
* Skip rt_info while graph comparing

* Remove incorrect comparing for rt_info
2022-01-14 12:49:12 +03:00
Nadezhda Ageeva
12ab842970 [GNA] Deprecate GNA_LIB_N_THREADS and SINGLE_THREAD parameters + sample update (#9637)
* Deprecate GNA_LIB_N_THREADS and SINGLE_THREAD parameters

* Remove deprecated options from sample

* Fix speech sample test

* Adds doxy deprecated comment
2022-01-14 12:20:36 +03:00
Mateusz Tabaka
508af22c66 Add CompressQuantizeWeights transformation (#7538)
* Add CompressQuantizeWeights transformation

It's based on model-optimizer/extensions/back/compress_quantized_weights.py

* handle dequantization subgraph after quantization

* fix scale shift calculation

* remove TRANSFORMATIONS_API from CompressQuantizeWeights

* ZeroPointOptimizer

* add CompressQuantizeWeights pass to to ApplyMOCTransformations

* add comment

* fix code style

* cleanup

* ambiguous copy_runtime_info

* ambigous call

* fix case when zero_point is close to zero

* fix cf test case

* move files

* update tests

* add tests for evaluate_subgraph

* Address review comments

* make params static
2022-01-13 23:38:39 +01:00
Maksim Proshin
ec0dd6051a [POT] Minor correction about OpenSource (#9625)
* Update README.md

* Update README.md
2022-01-13 20:10:34 +03:00
Liubov Talamanova
cde61f2411 [POT] Fix bug with git (#9604)
* [POT] Fix bug with git

* Add UNKNOWN_VERSION constant
2022-01-13 19:56:18 +03:00
Nikita Malinin
0166cb8f5c [POT] New IE API integration (#9004)
* Initial commit for integration

* Apply latest updates

* Update ie_engine for multi input models

* Update reference, pylint fixed, method replacement

* Change for AC 2.0 support

* Update aac_engine with raw data processing

* Update for pylint

* Update model utils

* Disable pylint check

* Update ac_engine with the processing

* Using tensor names instead of friendly names

* Tensor names for all statistics

* BiasCorrection with tensor names

* Remove debug info usage

* Fix for sequential stats

* Fix for the scalar stats

* Update with comments

* Update tests & builder

* Update tests

(cherry picked from commit 5022ce4a4fac230ac11db68f14cd58971fe9b2a2)

* Executable_model -> compiled_model

(cherry picked from commit 0d447ff4917f764df76d9c0c0068277e5e090f3b)

* Update with PartialShapes for reshape

* Update async mode

* Update refs

* Update BC Parameter dtype

* Update simplified with inferqueue

* Disable ssd512 nightly

* BC renaming

* Revert OMZ commit

* Update references

* Update BC algo with the parameter selection

* Update AC config filter

* Pylint fixes

* Update async data

* Update pylint for ie_engine

* Update ie_engine

* Revert refs changes

(cherry picked from commit 4d3530216b3d79c33c3437a7dfcc1140693320c8)

* Update OMZ submodule
2022-01-13 19:21:37 +03:00
Roman Kazantsev
a53a4da3a2 [MO, Frontends] Implement ChangePlaceholderType as Offline Transformation (#8245)
* [Common FrontEnd] Implement ChangePlaceholderType transformation with OldApiMap

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Add ChangePlaceholderType pass into frontend normalize

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Add a comment about the transformation

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Fix build issue

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Apply code review comments: remove ngraph namespace rountine, etc.

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Remove use of extra Node object in set_old_api_map call

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Create separate pass for legacy nGraph transformations for MO with new frontend

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Fix build for ieFuncTests

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Fix build issue with namespace conflicts

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Revert "Fix build issue with namespace conflicts"

This reverts commit 50a189f4e5.

* Move legacy transformations to ngraph namespace

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Fix build issue with unresolved MOCLegacyTransformation

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Adjust code to new OldApiMap API

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Resolve merge conflicts

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Fix build issue

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Do not set legacy type for parameter in case user defined type

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>
2022-01-13 15:29:51 +03:00
Mateusz Bencer
080477aa9c MO fallback to old path if some features are not supported yet (#9034) 2022-01-13 09:39:14 +01:00
Vladimir Dudnik
28fb55dffe [IE Samples][OV2.0] final clean up of old API headers (#9494)
* final clean up of old API headers, compile_tool separated from samples

* make cpplint happy
2022-01-13 11:12:20 +03:00
Indira Salyahova
c597bc8928 [POT] requirements install telemetry library (#9605)
* Update telemetry.py

* Update setup.py

* Update test_telemetry.py

* Update telemetry.py
2022-01-13 03:30:58 +03:00
Eugeny Volosenkov
00da13b058 Support TF ScatterND and CenterNet (#9257)
* add ScatterND for tf

* Fix ApplyPermutation

* fix description of TFScatterNDDecomposition

* fix permutation

* fix package_POM

* fix pom file

* fix BOM file

* fix bom file

* Added layer tests for TF ScatterND

* fix comments

* fix bom file

* Add additional tests

* Add additional tests

* Added ConvertLike to ScatterND decomposition
2022-01-12 23:15:45 +03:00
Alexey Lebedev
0a85417896 [tools] some fixes for python benchmark (#9584)
* rename inference_engine to OpenVINO

* correct exception for batch

* check all inputs to find batch dimension before throwing exception

* correct warning about batch

* avoid set_shape in static case

* refactoring latency output

* message about benchmarking mode

* use new precision naming

* use pass manager instead offline_transformations
2022-01-12 17:22:58 +03:00
Maxim Vafin
9fb9e19efa Fix output layout of tf yolo models converted with transformations config (#9583) 2022-01-12 16:25:35 +03:00