Commit Graph

19 Commits

Author SHA1 Message Date
dependabot[bot]
266764171f Update networkx requirement from <=2.8.8 to <3.1.0 in /tools/mo (#15293) 2023-06-01 14:11:05 +02:00
Przemyslaw Wysocki
923b6f297c [PyOV] Move environment markers to requirements.txt files (#17113)
* WIP

* WIP

* Debug

* WIP

* Expand function to other setup.pies

* Revert mxnet

* Update docstring'

* restore defusedxml

* Update tools/mo/requirements.txt

Co-authored-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Code review

---------

Co-authored-by: Roman Kazantsev <roman.kazantsev@intel.com>
2023-04-25 13:25:21 +00:00
Przemyslaw Wysocki
591c3e61c5 [PyOV] Simplify requirement files (#15343)
* Partial progress

* Finish v1

* Cleanup

* Remove useless files

* Fix path to pdpd

* Fix onnx path

* Minor change

* Rework MO

* Minor change

* Remove some costraints

* Add MO constraints

* Update gitignore for MO

* Minor change

* Apply tech sync discussion

* Cleanup

* CR comment

* Debug ONNX FE

* simplify ONNX FE

* Update cmake

* Hardcode ONNX requirement

* Add dependency resolver to cmake

* Add constraints for openvino/tests

* Add missing pytest-html

* Fix -c path

* Revert debug changes to path

* Add cmake to copy constraints.txt

* Update dependabot

* Remove slash

* Remove cmake

* Debug prints

* Minor changes

* Move reqs check to separate file

* Add requirements parser to benchmark_tool

* Fix smoke tests constraints

* Minor fixes

* Minor change

* My fixes were apparently wrong

* Debug - self.executable_path

* Debug - add singledispatch to tests and tools

* Debug - print IE_APP_PATHs

* Revert "Debug - print IE_APP_PATHs"

This reverts commit 67ccb6d3f5.

* Revert "Debug - add singledispatch to tests and tools"

This reverts commit 3b945931e2.

* Revert "Debug - self.executable_path"

This reverts commit 3aa724eff6.

* update dependabot

* update dependabot

* Skip benchmark_app tests

* Use CMAKE_CURRENT_BINARY_DIR in cmake

* Remove debug prints

* minor change

---------

Signed-off-by: p-wysocki <przemyslaw.wysocki@intel.com>
2023-03-29 14:27:27 +04:00
Roman Kazantsev
87d777c192 [MO][Install] Clean up setup (#15011)
Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>
2023-01-10 00:13:15 +04:00
Roman Kazantsev
80f0ffbb49 [Tools][MO] Clean up requirements for default installation (#14992)
* [Tools][MO] Clean up requirements for default installation

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

* Update azure config files with extras

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>
2023-01-09 15:05:37 +04:00
Roman Kazantsev
0be53a66d2 [MO][TF FE] Top-up TensorFlow Version in requirements files (#14842)
Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>
2022-12-28 16:31:25 +04:00
Roman Kazantsev
5f06431aec [Install] Remove upper bound for NumPy for default installation and update upper bounds for extras (#13985)
* [Python API][Tools] Top up upper bound version for dependencies: NumPy, TensorFlow, NetworkX

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

* Remove upper-bound for TensorFlow and NumPy

* Revert "Remove upper-bound for TensorFlow and NumPy"

This reverts commit 662085df2e.

* Remove upper-bound for NumPy for default installation

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>
2022-11-30 09:53:06 +04:00
Andrei Kochin
0246eb7917 [Req] upgrade mxnet to 1.9.1 (#14120)
* [Req] upgrade mxnet to 1.9.1

Signed-off-by: andrei.kochin <andrei.kochin@intel.com>

* [Req] upgrade relax mxnet dependancy

Signed-off-by: andrei.kochin <andrei.kochin@intel.com>

* specify upper bound

Signed-off-by: andrei.kochin <andrei.kochin@intel.com>

Signed-off-by: andrei.kochin <andrei.kochin@intel.com>
2022-11-27 22:26:09 +04:00
Przemyslaw Wysocki
1cc499429a [PyOV] Upgrade ONNX to 1.12.0 (#12847)
* Refactor tests for onnx1.12

* Fix ONNX compatibility and numpy warnings

* Upgrade ONNX to 1.12 in cpp

* Skip unsupported ops

* Revert "Fix ONNX compatibility and numpy warnings"

This reverts commit cd8a0e6b8e.

* Small changes

* Remove unnecessary changes

* Bump Python version in github workflows

* Fix flake error

* Another flake error

* Even more flake errors

* Xfail more tests

* Fix mypy errors

* Change onnx version in tests

* Bump ONNX in MO

* Fix onnx utils in comp

* Minor changes

* Import pathlib

* Add xfails to compatibility tests

* Skip segfaulting tests

* Fix onnx nametuple

* Fix flake

* Try to fix py3.6 onnx

* Fix model importer and reqs

* Add __test__

* Bump OMZ commit

* checkout omz

* Revert omz

* Bump omz

* Bump omz

* Revert omz

* Bump omz

* Change pychecks python version

* Add LayerNorm to expanded ONNX functions

* Apply clang

* Move LayerNorm tests to skip_segfault

* Refactoring

* Minor changes

* Minor changes

* Relax MO reqs
2022-11-03 22:56:57 +04:00
Artur Kulikowski
2b2e04d974 MO uses the same version of protobuf like other packages (#12713)
* MO uses the same version of protobuf like other packages

* Restrict Protobuf to version >=3.18.1 and lower than 4.0.0
2022-08-25 13:09:03 +02:00
Roman Kazantsev
e0cef714d2 [MO, POT] Top up upper bounds for TensorFlow and NumPy modules in all requirement files (#12191)
* [MO] Relax MO upper-bound requirements for TensorFlow and NumPy

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

* Just debug numpy version

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

* Pin upper-bounds for NumPy and TensorFlow modules in all reqs files

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

* Update submodule dependency for open_model_zoo

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

* Install numpy module first

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

* Update NumPy version in POT setup.py

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

* Extend telemetry tests with a set of possible solutions for events

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

* Fix build issue

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

* Update NumPy module version for layer tests

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>
2022-08-03 16:18:41 +04:00
Tomasz Jankowski
bf2bd624b6 Limit ONNX version (#11949)
OV does not currently support opset 17 introduced in onnx 1.12 release.
2022-06-22 22:26:47 +02:00
Mateusz Tabaka
3a202c2775 Don't install networkx with version 2.8.1 (#11718)
With new networkx release (2.8.1) some of MO tests started to fail
with following error:
```
def __setstate__(self, state):
    self._graph = G = state["_graph"]
    self._adjdict = G._pred if hasattr(G, "pred") else G._adj
    AttributeError: 'Graph' object has no attribute '_adj'
```

Seems like regression that was introduced in
f50fc70b8c
2022-05-24 14:07:36 +02:00
Andrei Kochin
4b29eed013 Update MO requirements to allow TF1.15 if already installed (#10673)
* Update MO requirements to allow TF1.15 if already installed

* Removing pyhton version check as redundant

* Updating requirements.txt as well
2022-02-28 18:55:44 +03:00
Roman Kazantsev
20266dd0c3 [MO] Upgrade TensorFlow version dependency due to SNYK hits (#10487)
* [MO] Upgrade TensorFlow version dependency due to SNYK hits

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

* Still use 2.5.0 TensorFlow for Python 3.6 and older

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>
2022-02-18 12:29:58 +03:00
Pavel Esir
121d59aa80 [MO] move importlib-metadata into setup.py (#10319)
* handle 'and' marker in requirements

* Revert "handle 'and' marker in requirements"

This reverts commit 952bb949ca.

* moved importlib-metadata from requirements.txt into setup.py
2022-02-15 15:01:27 +03:00
Anastasia Popova
1a8506f205 Updated requirements for MO with telemetry. (#9431)
* Updated requirements for MO and POT with telemetry.

* Added mock telemetry common class for unit tests.

* Used mock telemetry in preprocessing unit tests.

* Small correction.
2022-01-11 19:54:49 +03:00
Anton Chetverikov
adce58d126 [MO] Add check for Python version to NetworkX dependency (#9226)
* Add check for python version to networkx dependency

* Update condition, task CVS-72806

* Update check to not break old Python versions support

* Update POT NetworkX dependency

* Allign requirements list format with setuptools documentation
2021-12-29 16:26:40 +03:00
Pavel Esir
980904c9ec [MO] Align MO namespaces (#7708)
* Moved and merged mo/ and extensions/ into openvino/tools/mo

* edited imports

* edited docs to use mo script from entry_point

* edited MO transformations list loading and setup.py

* changed full path -> 'mo' entry point in docs (leftovers)

* corrected package_BOM

* updated resolving --transformation_config in cli_parser.py

* pkgutil-style __init__.py, added summarize_graph into entry points

* updated DOCs for the new --transformations_config

* fix select

* updated install instructions, fixed setup.py for windows and python_version < 3.8

* fixed typo in requirements.txt

* resolved conflicts

* removed creating custom __init__.py from setup.py

* corrected folder with caffe proto

* corrected loading user defined extensions

* fix openvino.tools.mo import in serialize.py

* corrected layer tests for new namespace

* fix in get_testdata.py

* moved model-optimizer into tools/

* renamed import in POT

* corrected mo.yml

* correct CMakeLists.txt for the newest tools/mo

* corrected find_ie_version.py

* docs and openvino-dev setup.py update for the newest tools/mo

* miscellaneous leftovers and fixes

* corrected CI files, pybind11_add_module in CMakeLists.txt and use of tools/mo path instead of tools/model_optimizer

* add_subdirectory pybind11 for tools/mo

* POT path fix

* updated setupvars.sh setupvars.bat

* Revert "updated setupvars.sh setupvars.bat"

This reverts commit c011142340.

* removed model-optimizer env variables from setupvars

* updated CMakeLists.txt to pack MO properly with tests component

* corrected left imports, corrected loading requirements for layer tests

* mo doc typo correction

* minor corrections in docs; removed summarize_graph from entry_points

* get_started_windows.md, MonoDepth_how_to.md corrections, mo path corrections
2021-12-08 08:53:53 +03:00