Skip to content

Commit

Permalink
More MO clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
ilya-lavrenov committed Dec 31, 2024
1 parent 9ee5e51 commit e5066fb
Show file tree
Hide file tree
Showing 49 changed files with 42 additions and 3,815 deletions.
15 changes: 0 additions & 15 deletions .github/components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ IR_FE:

ONNX_FE:
revalidate:
- MO
- OVC
- ONNX_RT
build:
Expand All @@ -119,15 +118,13 @@ ONNX_FE:

PDPD_FE:
revalidate:
- MO
- OVC
build:
- CPU
- Python_API

TF_FE:
revalidate:
- MO
- OVC
build:
- CPU
Expand All @@ -136,15 +133,13 @@ TF_FE:

TFL_FE:
revalidate:
- MO
- OVC
build:
- CPU
- Python_API

PyTorch_FE:
revalidate:
- MO
- OVC
build:
- CPU
Expand All @@ -153,7 +148,6 @@ PyTorch_FE:

JAX_FE:
revalidate:
- MO
- OVC
build:
- CPU
Expand All @@ -171,7 +165,6 @@ C_API:
Python_API:
revalidate:
- samples
- MO
- OVC
- tools
- TF_FE
Expand Down Expand Up @@ -228,14 +221,6 @@ OVC:
- Python_API
- TOKENIZERS # TF_FE tests depends on tokenizers build

MO:
revalidate:
- PyTorch_FE
- TF_FE
build:
- Python_API
- TOKENIZERS # TF_FE tests depends on tokenizers build

tools:
build:
- CPU
Expand Down
1 change: 0 additions & 1 deletion .github/github_org_control/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"openvino-tf-frontend-maintainers": "category: TF FE",
"openvino-onnx-frontend-maintainers": "category: ONNX FE",
"openvino-ie-tests-maintainers": "category: IE Tests",
"openvino-mo-maintainers": "category: MO",
"openvino-ovc-maintainers": "category: OVC",
"openvino-ngraph-maintainers": "category: Core",
"openvino-scripts-maintainers": "category: build",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/job_python_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ jobs:
--ignore=${INSTALL_TEST_DIR}/onnx/test_python/test_zoo_models.py
- name: OVC unit tests
if: fromJSON(inputs.affected-components).MO.test
if: fromJSON(inputs.affected-components).OVC.test
run: python3 -m pytest -s ${INSTALL_TEST_DIR}/ovc/unit_tests --junitxml=${INSTALL_TEST_DIR}/TEST-OpenVinoConversion.xml

- name: OVC Python API Tests
if: fromJSON(inputs.affected-components).MO.test
if: fromJSON(inputs.affected-components).OVC.test
run: |
# Import 'test_utils' installed in '<package_test>/tests/python/openvino'
export PYTHONPATH=${INSTALL_TEST_DIR}/python
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows_vs2019_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ jobs:
--ignore=${{ env.INSTALL_TEST_DIR }}/onnx/test_python/test_zoo_models.py
- name: OVC Python API Tests
if: fromJSON(needs.smart_ci.outputs.affected_components).MO.test
if: fromJSON(needs.smart_ci.outputs.affected_components).OVC.test
shell: cmd
run: |
:: Used for 'test_utils' installed in '<test_package>\python\openvino\test_utils'
Expand All @@ -377,7 +377,7 @@ jobs:
python3 -m pytest ${{ env.LAYER_TESTS_INSTALL_DIR }}/py_frontend_tests --junitxml=${{ env.INSTALL_TEST_DIR }}/TEST-test_py_fontend.xml
- name: OVC unit tests
if: fromJSON(needs.smart_ci.outputs.affected_components).MO.test
if: fromJSON(needs.smart_ci.outputs.affected_components).OVC.test
shell: cmd
run: python3 -m pytest -s ${{ env.INSTALL_TEST_DIR }}/ovc/unit_tests --junitxml=${{ env.INSTALL_TEST_DIR }}/TEST-OpenVinoConversion.xml

Expand Down
1 change: 0 additions & 1 deletion cmake/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

cmake_policy(SET CMP0054 NEW)

# TODO: fix it, outside of source dir MO cannot find TBB dependency
ov_set_temp_directory(TEMP "${CMAKE_SOURCE_DIR}")

## Intel OMP package
Expand Down
4 changes: 2 additions & 2 deletions docs/dev/ci/github_actions/adding_tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ An example step from [`job_python_unit_tests.yml`](./../../../../.github/workflo
steps:
...
- name: OVC unit tests
if: fromJSON(inputs.affected-components).MO.test
if: fromJSON(inputs.affected-components).OVC.test
run: python3 -m pytest -s ${INSTALL_TEST_DIR}/ovc/unit_tests --junitxml=${INSTALL_TEST_DIR}/TEST-OpenVinoConversion.xml
...
```
The step includes:
* a `name`: `OVC unit tests`.
* an `if` condition: `fromJSON(inputs.affected-components).MO.test`
* an `if` condition: `fromJSON(inputs.affected-components).OVC.test`
* This step is executed only if the condition is `true`.
* This is a part of the Smart CI system implemented for the OpenVINO workflow. Read the [Smart CI Overview](./smart_ci.md) to learn about the system and its usage.
* a `run` section with commands to be executed.
Expand Down
8 changes: 4 additions & 4 deletions docs/dev/ci/github_actions/smart_ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ files inside src/frontends/tensorflow:
changed_component_names: {'TF_FE'} # TF_FE is an alias we chose for TensorFlow Frontend component
affected_components={
"TF_FE": {"test": true, "build": true},
"MO": {"test": true, "build": true},
"OVC": {"test": true, "build": true},
"CPU": {"build": true},
"Python_API": {"build": true},
...
Expand Down Expand Up @@ -115,7 +115,7 @@ This file describes the relationships between components, for example:
```yaml
PyTorch_FE: # Component name
revalidate: # Defines the list of components to revalidate (build + test) if the component above was changed
- MO # This component depends on PyTorch_FE and requires full revalidation
- OVC # This component depends on PyTorch_FE and requires full revalidation
build: # Defines the list of components to build if the PyTorch_FE was changed (test runs for them are skipped)
- CPU # This component and the component below must be built if PyTorch_FE was changed
- Python_API
Expand All @@ -124,8 +124,8 @@ For the example above, the following pipeline will be executed on changes applie
* Build for PyTorch_FE
* Tests for PyTorch_FE
* Build for MO
* Tests for MO
* Build for OVC
* Tests for OVC
* Build for CPU
* Build for Python_API
Expand Down
190 changes: 0 additions & 190 deletions docs/dev/pypi_publish/pypi-openvino-dev.md

This file was deleted.

18 changes: 0 additions & 18 deletions scripts/utils/create_package.py

This file was deleted.

3 changes: 0 additions & 3 deletions src/bindings/python/docs/requirements_management.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ If a package version differs between `requirements.txt` files, it can't be unifi
- Exclude this package from `constraints.txt` and keep its version in `requirements.txt`
- Exclude this `requirements.txt` file from the constraints system

#### 3. Lack of support in distutils
`distutils` is a package used for building Python wheels. It does not offer support for constraints files, so custom requirement parsers had to be added. A parser example can be found [here](https://github.com/openvinotoolkit/openvino/blob/master/tools/mo/setup.py) - functions `read_constraints()` and `read_requirements()`.

## Implementation in OpenVINO
The implementation in OpenVINO is a subject to change. At the time of writing, there are three `constraints.txt` files with the following requirement coverage:

Expand Down
1 change: 0 additions & 1 deletion src/bindings/python/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ skip_install=True
deps =
-rrequirements.txt
-rrequirements_test.txt
-r /openvino/tools/mo/requirements.txt # for torchvision -> OV preprocess converter
-r /openvino/src/frontends/onnx/tests/requirements.txt
setenv =
OV_BACKEND = {env:OV_BACKEND:"CPU"}
Expand Down
Loading

0 comments on commit e5066fb

Please sign in to comment.