Skip to content

Commit

Permalink
Merge Back Hot-Fix into develop (#3682)
Browse files Browse the repository at this point in the history
* [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>
  • Loading branch information
5 people authored Jun 26, 2024
1 parent adb08a4 commit 4827829
Show file tree
Hide file tree
Showing 20 changed files with 945 additions and 627 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See help here: https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners

# These owners will be the default owners for everything in the repo.
* @samet-akcay @harimkang @vinnamkim @jaegukhyun @eugene123tw @kprokofi @chuneuny-emily @sovrasov @sungchul2 @GalyaZalesskaya @negvet @goodsong81 @yunchu @wonjuleee @eunwoosh
* @samet-akcay @harimkang @vinnamkim @eugene123tw @kprokofi @chuneuny-emily @sovrasov @sungchul2 @GalyaZalesskaya @negvet @goodsong81 @yunchu @wonjuleee @eunwoosh
42 changes: 12 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,23 +80,13 @@ If you want to make changes to the library, then a local installation is recomme
Installing the library with pip is the easiest way to get started with otx.

```bash
pip install otx
pip install otx[base]
```

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:
Alternatively, for zsh users:

```bash
# Get help for the installation arguments
otx install -h

# Install the full package
otx install

# Install with verbose output
otx install -v

# Install with docs option only.
otx install --option docs
pip install 'otx[base]'
```

</details>
Expand All @@ -117,23 +107,7 @@ conda activate otx_env
# Clone the repository and install in editable mode
git clone https://github.com/openvinotoolkit/training_extensions.git
cd training_extensions
pip install -e .
```

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:

```bash
# Get help for the installation arguments
otx install -h

# Install the full package
otx install

# Install with verbose output
otx install -v

# Install with docs option only.
otx install --option docs
pip install -e .[base] # for zsh: pip install -e '.[base]'
```

</details>
Expand All @@ -152,6 +126,10 @@ otx --help

# Print help messages from the train subcommand
otx train --help

# Print help messages for more details
otx train --help -v # Print required parameters
otx train --help -vv # Print all configurable parameters
```

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).
Expand Down Expand Up @@ -190,6 +168,10 @@ In addition to the examples above, please refer to the documentation for tutoria

## Updates

### v2.1.0 (2Q24)

TBD

### v2.0.0 (1Q24)

### New features
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ ci_publish = [
]

ci_benchmark = [
"pandas==2.2.2",
"pandas<2.2", # To avoid conflict with nncf==2.9.0
"matplotlib==3.8.4",
"nbconvert==7.16.3",
"ipython==8.23.0",
Expand Down Expand Up @@ -318,7 +318,6 @@ exclude = [
"src/otx/algo/**/mmdeploy/",

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

# Ruff complains it but don't know how to fix since it literally showed no useful logs.
Expand Down
2 changes: 1 addition & 1 deletion src/otx/algo/classification/backbones/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"""Backbone modules for OTX custom model."""

from .efficientnet import OTXEfficientNet
from .timm import TimmBackbone
from .mobilenet_v3 import OTXMobileNetV3
from .timm import TimmBackbone
from .vision_transformer import VisionTransformer

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

0 comments on commit 4827829

Please sign in to comment.