Improves more optional module imports

[mattpopovich]

Builds on #366 to remove more ImportErrors. Not sure if you wanted these done as well so I made it into an additional PR.

There are a few ImportErrors remaining, it wasn't clear to me if I should remove those as well or keep them. I'll leave that to you to decide.

[CLAassistant]

All committers have signed the CLA.

[zhiqwang]

Hi @mattpopovich , this also looks GREAT to me, but let's merge #366 first!

[mattpopovich]

Agreed. Let me know if you have any thoughts/suggestions on how to fix that circular reference... I didn't look into it too closely yet.

[zhiqwang]

Let me know if you have any thoughts/suggestions on how to fix that circular reference... I didn't look into it too closely yet.

Hi @mattpopovich , that's my bad, I mistakenly put the following two functions in the current position, and these two dependencies will cause the circular reference calls. I think it should be better to move load_from_ultralytics() into "yolort/models/_utils.py" and move contains_any_tensor into "yolort/utils/__init__.py" to solve this problem entirely.

https://github.com/zhiqwang/yolov5-rt-stack/blob/9a27b916da21a0143eb5497ee7ec6dced69f2358/yolort/utils/update_module_state.py#L40

https://github.com/zhiqwang/yolov5-rt-stack/blob/9a27b916da21a0143eb5497ee7ec6dced69f2358/yolort/data/_helper.py#L52

I'll submit a PR to resolve this issue.

[zhiqwang]

Hi @mattpopovich ,

After #369 is merged, I guess the circular import error will be resolved, I rebase manually this branch to the main, let's test these on the CI again.

Because of my manual rebase, the code now has some conflicts with your branch, please use the following command to synchronize with the current branch:

git pull --rebase origin improve-more-imports

[codecov]

Codecov Report

Merging #367 (37a1fc2) into main (bf05b4b) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #367   +/-   ##
=======================================
  Coverage   98.58%   98.58%           
=======================================
  Files          11       11           
  Lines         778      778           
=======================================
  Hits          767      767           
  Misses         11       11           

Flag	Coverage Δ
unittests	98.58% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bf05b4b...37a1fc2. Read the comment docs.

[zhiqwang]

Hi @mattpopovich , the overall looks great to me, I only add some comments about where to place the decorator, let me know if you have more concerns here.

And after #366 is merged, I only cherry-pick one commit from your commits history (the others have been merged to the main branch), and now you should use following command to synchronize with the current branch:

git pull --rebase origin improve-more-imports

[mattpopovich]

@zhiqwang your requested changes have been made, CI looks good 👍

[zhiqwang]

Thanks @mattpopovich again, this looks great to me!