Skip to content

Commit

Permalink
Upgrade OpenVINO (openvinotoolkit#1196)
Browse files Browse the repository at this point in the history
<!-- Contributing guide:
https://github.com/openvinotoolkit/datumaro/blob/develop/CONTRIBUTING.md
-->

### Summary

<!--
Resolves openvinotoolkit#111 and openvinotoolkit#222.
Depends on openvinotoolkit#1000 (for series of dependent commits).

This PR introduces this capability to make the project better in this
and that.

- Added this feature
- Removed that feature
- Fixed the problem openvinotoolkit#1234
-->

### How to test
<!-- Describe the testing procedure for reviewers, if changes are
not fully covered by unit tests or manual testing can be complicated.
-->

### Checklist
<!-- Put an 'x' in all the boxes that apply -->
- [ ] I have added unit tests to cover my changes.​
- [ ] I have added integration tests to cover my changes.​
- [ ] I have added the description of my changes into
[CHANGELOG](https://github.com/openvinotoolkit/datumaro/blob/develop/CHANGELOG.md).​
- [ ] I have updated the
[documentation](https://github.com/openvinotoolkit/datumaro/tree/develop/docs)
accordingly

### License

- [ ] I submit _my code changes_ under the same [MIT
License](https://github.com/openvinotoolkit/datumaro/blob/develop/LICENSE)
that covers the project.
  Feel free to contact the maintainers if that's a concern.
- [ ] I have updated the license header for each file (see an example
below).

```python
# Copyright (C) 2023 Intel Corporation
#
# SPDX-License-Identifier: MIT
```

---------

Co-authored-by: Yunchu Lee <yunchu.lee@intel.com>
  • Loading branch information
sovrasov and yunchu authored Dec 8, 2023
1 parent f1c92ff commit 3782380
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ jobs:
python -m pip install tox
- name: Unit testing
run: |
tox -e tests-py${{ matrix.tox-env-py }}-${{ matrix.tox-env-os }} --develop -- tests/unit --cov --cov-report=xml
tox -vvv -e tests-py${{ matrix.tox-env-py }}-${{ matrix.tox-env-os }} --develop -- tests/unit --cov --cov-report=xml
- name: Integration testing
run: |
tox -e tests-py${{ matrix.tox-env-py }}-${{ matrix.tox-env-os }} -- tests/integration
tox -vvv -e tests-py${{ matrix.tox-env-py }}-${{ matrix.tox-env-os }} -- tests/integration
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion requirements-core.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ requests
pandas>=1.1.5

# OpenVINO
openvino==2023.1.0
openvino>=2023.2.0
tokenizers

# Encryption
Expand Down
2 changes: 1 addition & 1 deletion requirements-default.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ dvc==3.30.1 # fix version to avoid some import issues
fsspec <= 2022.11.0; python_version < '3.8' # https://github.com/openvinotoolkit/datumaro/actions/runs/4003215621/jobs/6871114851#step:5:1647
GitPython>=3.1.18,!=3.1.25 # https://github.com/openvinotoolkit/datumaro/issues/612
openvino-telemetry>=2022.1.0
openvino-dev==2023.1.0
openvino-dev>=2023.2.0
13 changes: 13 additions & 0 deletions tests/unit/test_prune.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import platform
from collections import Counter
from functools import partial

Expand Down Expand Up @@ -93,6 +94,9 @@ def test_prune_random(self, fxt_dataset, test_dir):
result_subsets = [item.subset for item in result]
assert Counter(result_subsets) == {"test": 1, "train": 1}

@pytest.mark.skipif(
platform.system() == "Darwin", reason="Issue#1219:hanging while ov model read"
)
@mark_requirement(Requirements.DATUM_GENERAL_REQ)
def test_prune_clustered_random(self, fxt_dataset, test_dir):
"""
Expand All @@ -119,6 +123,9 @@ def test_prune_clustered_random(self, fxt_dataset, test_dir):
result_subsets = [item.subset for item in result]
assert Counter(result_subsets) == {"test": 1, "train": 1}

@pytest.mark.skipif(
platform.system() == "Darwin", reason="Issue#1219:hanging while ov model read"
)
@mark_requirement(Requirements.DATUM_GENERAL_REQ)
def test_prune_centroid(self, fxt_dataset, test_dir):
"""
Expand Down Expand Up @@ -199,6 +206,9 @@ def test_prune_query_clust_txt_hash(self, fxt_dataset, test_dir):
result_subsets = [item.subset for item in result]
assert Counter(result_subsets) == {"test": 1, "train": 1}

@pytest.mark.skipif(
platform.system() == "Darwin", reason="Issue#1219:hanging while ov model read"
)
@mark_requirement(Requirements.DATUM_GENERAL_REQ)
def test_prune_entropy(self, fxt_dataset, test_dir):
"""
Expand All @@ -225,6 +235,9 @@ def test_prune_entropy(self, fxt_dataset, test_dir):
result_subsets = [item.subset for item in result]
assert Counter(result_subsets) == {"test": 1, "train": 1}

@pytest.mark.skipif(
platform.system() == "Darwin", reason="Issue#1219:hanging while ov model read"
)
@mark_requirement(Requirements.DATUM_GENERAL_REQ)
def test_prune_ndr(self, fxt_dataset, test_dir):
"""
Expand Down

0 comments on commit 3782380

Please sign in to comment.