Feat/inference #82
Merged
Feat/inference #82
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
enhancement
JSabadin
requested review from
klemen1999,
kozlov721 and
tersekmatija
and removed request for
tersekmatija
kozlov721
requested review from
tersekmatija and
conorsim
and removed request for
a team
kozlov721
approved these changes
Sep 26, 2024
luxonis_train/core/core.py
Outdated
| @@ -17,7 +18,7 @@ | |||
| from luxonis_ml.nn_archive.config import CONFIG_VERSION | |||
| from luxonis_ml.utils import LuxonisFileSystem, reset_logging, setup_logging | |||
| from typeguard import typechecked | |||
|
|
|||
| from luxonis_ml.data import LabelType | |||
There was a problem hiding this comment.
Use luxonis_train.enums.TaskType instead. (see #78)
luxonis_train/core/core.py
Outdated
| @@ -419,6 +420,7 @@ def infer( | |||
| self, | |||
| view: Literal["train", "val", "test"] = "val", | |||
| save_dir: str | Path | None = None, | |||
| img_path: Optional[str] = None | |||
There was a problem hiding this comment.
Instead of Optional[str], you should use str | None (Optional is deprecated in python 3.10)
luxonis_train/core/core.py
Outdated
| else: | ||
| self._process_dataset_images(view, save_dir) | ||
|
|
||
| def _process_single_image(self, img_path: Path, view: str, save_dir: Optional[str | Path]) -> None: |
There was a problem hiding this comment.
It might be better to move these methods to luxonis_train.core.utils.infer_utils
luxonis_train/__main__.py
Outdated
| @@ -50,6 +50,11 @@ class _ViewType(str, Enum): | |||
| typer.Option(help="Where to save the inference results."), | |||
| ] | |||
|
|
|||
| ImgPathType = Annotated[ | |||
| Optional[str], | |||
luxonis_train/core/core.py
Outdated
| for inputs, labels in self.pytorch_loaders[view]: | ||
| images = get_unnormalized_images(self.cfg, inputs) | ||
| outputs = self.lightning_module.forward( | ||
| inputs, labels, images=images, compute_visualizations=True | ||
| ) | ||
| render_visualizations(outputs.visualizations, save_dir) | ||
|
|
||
| def _prepare_labels(self, view: str, img_shape: tuple) -> tuple: |
There was a problem hiding this comment.
_create_dummy_labels might be a better name
klemen1999
approved these changes
Sep 26, 2024
Codecov ReportAttention: Patch coverage is
✅ All tests successful. No failed tests found.
Additional details and impacted files@@ Coverage Diff @@
## dev #82 +/- ##
======================================
Coverage ? 96.21%
======================================
Files ? 139
Lines ? 6148
Branches ? 0
======================================
Hits ? 5915
Misses ? 233
Partials ? 0 ☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Inference Functionality Updates
Refactored the
infer()method with the following helper methods:_process_single_image: Handles inference for a single image file._process_directory_images: Handles inference for image files in a directory._process_dataset_images: Handles inference on dataset images._prepare_labels: Prepares labels for various tasks.The
infer()method now supports: