Skip to content

Commit 4827829

Browse files
harimkangyunchukprokofieugene123tweunwoosh
authored
Merge Back Hot-Fix into develop (#3682)
* [hotfix] Update for fix workflow issues (#3668) * Update README & CODEOWNERS (#3659) * Update Engine's docstring & CLI --help outputs (#3658) Update Engine's CLI docstring & HelpFormatter * Fix unit test for semantic segmentation to run it without mmseg (#3670) fix test to run wo mm * Enable ruff & ruff-format into otx/algo/classification/backbones (#3667) * Enable ruff in otx.algo.classification.backbones * Fix unit-test * Fix docstring * Disable integration test in pr-merge workflow (#3677) * Add TV MaskRCNN Tile Recipe (#3655) * add tv maskrcnn recipe * add unit test * add tile size * fix bug * Align integration test to exportable code interface update for release branch (#3676) * align integration test to exportable code update * add error message * align vp expected output name * Refactor exporter for anomaly task and fix a bug with exportable code (#3672) * refactor exporter * remove *to * reply comments * resolve problem with local temp file * Fix NNCF MaskRCNN-Eff accuracy drop (#3680) * fix nncf maskrcnn eff accuracy drop * update ignored scope * fix typo * Update pandas version constraint (#3679) --------- Co-authored-by: Yunchu Lee <yunchu.lee@intel.com> Co-authored-by: Prokofiev Kirill <kirill.prokofiev@intel.com> Co-authored-by: Eugene Liu <eugene.liu@intel.com> Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>
1 parent adb08a4 commit 4827829

File tree

20 files changed

+945
-627
lines changed

20 files changed

+945
-627
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# See help here: https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
22

33
# These owners will be the default owners for everything in the repo.
4-
* @samet-akcay @harimkang @vinnamkim @jaegukhyun @eugene123tw @kprokofi @chuneuny-emily @sovrasov @sungchul2 @GalyaZalesskaya @negvet @goodsong81 @yunchu @wonjuleee @eunwoosh
4+
* @samet-akcay @harimkang @vinnamkim @eugene123tw @kprokofi @chuneuny-emily @sovrasov @sungchul2 @GalyaZalesskaya @negvet @goodsong81 @yunchu @wonjuleee @eunwoosh

README.md

+12-30
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,13 @@ If you want to make changes to the library, then a local installation is recomme
8080
Installing the library with pip is the easiest way to get started with otx.
8181

8282
```bash
83-
pip install otx
83+
pip install otx[base]
8484
```
8585

86-
This will install OTX CLI. OTX requires torch and lightning by default to provide training. To use the full pipeline, you need the commands below:
86+
Alternatively, for zsh users:
8787

8888
```bash
89-
# Get help for the installation arguments
90-
otx install -h
91-
92-
# Install the full package
93-
otx install
94-
95-
# Install with verbose output
96-
otx install -v
97-
98-
# Install with docs option only.
99-
otx install --option docs
89+
pip install 'otx[base]'
10090
```
10191

10292
</details>
@@ -117,23 +107,7 @@ conda activate otx_env
117107
# Clone the repository and install in editable mode
118108
git clone https://github.com/openvinotoolkit/training_extensions.git
119109
cd training_extensions
120-
pip install -e .
121-
```
122-
123-
This will install OTX CLI. OTX requires torch and lightning by default to provide training. To use the full pipeline, you need the commands below:
124-
125-
```bash
126-
# Get help for the installation arguments
127-
otx install -h
128-
129-
# Install the full package
130-
otx install
131-
132-
# Install with verbose output
133-
otx install -v
134-
135-
# Install with docs option only.
136-
otx install --option docs
110+
pip install -e .[base] # for zsh: pip install -e '.[base]'
137111
```
138112

139113
</details>
@@ -152,6 +126,10 @@ otx --help
152126

153127
# Print help messages from the train subcommand
154128
otx train --help
129+
130+
# Print help messages for more details
131+
otx train --help -v # Print required parameters
132+
otx train --help -vv # Print all configurable parameters
155133
```
156134

157135
You can find details with examples in the [CLI Guide](https://openvinotoolkit.github.io/training_extensions/latest/guide/get_started/cli_commands.html). and [API Quick-Guide](https://openvinotoolkit.github.io/training_extensions/latest/guide/get_started/api_tutorial.html).
@@ -190,6 +168,10 @@ In addition to the examples above, please refer to the documentation for tutoria
190168

191169
## Updates
192170

171+
### v2.1.0 (2Q24)
172+
173+
TBD
174+
193175
### v2.0.0 (1Q24)
194176

195177
### New features

pyproject.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ ci_publish = [
123123
]
124124

125125
ci_benchmark = [
126-
"pandas==2.2.2",
126+
"pandas<2.2", # To avoid conflict with nncf==2.9.0
127127
"matplotlib==3.8.4",
128128
"nbconvert==7.16.3",
129129
"ipython==8.23.0",
@@ -318,7 +318,6 @@ exclude = [
318318
"src/otx/algo/**/mmdeploy/",
319319

320320
# it will be cleaned up later
321-
"src/otx/algo/classification/backbones/*",
322321
"for_developers/helpers.py",
323322

324323
# Ruff complains it but don't know how to fix since it literally showed no useful logs.

src/otx/algo/classification/backbones/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"""Backbone modules for OTX custom model."""
55

66
from .efficientnet import OTXEfficientNet
7-
from .timm import TimmBackbone
87
from .mobilenet_v3 import OTXMobileNetV3
8+
from .timm import TimmBackbone
99
from .vision_transformer import VisionTransformer
1010

1111
__all__ = ["OTXEfficientNet", "TimmBackbone", "OTXMobileNetV3", "VisionTransformer"]

0 commit comments

Comments
 (0)