Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop branch into master #3518

Merged
merged 30 commits into from
Jun 8, 2021
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
bb13123
update ci-testing.yml (#3322)
SkalskiP May 27, 2021
3fea068
update ci-testing.yml (#3322)
SkalskiP May 27, 2021
b78e30d
Merge remote-tracking branch 'origin/develop' into develop
SkalskiP May 28, 2021
ba6f3f9
Enable direct `--weights URL` definition (#3373)
glenn-jocher May 28, 2021
57f773b
Update tutorial.ipynb (#3368)
pizzaz93 May 29, 2021
21a9607
`cv2.imread(img, -1)` for IMREAD_UNCHANGED (#3379)
tudoulei May 29, 2021
4b52e19
COCO evolution fix (#3388)
glenn-jocher May 29, 2021
d833ab3
Create `is_pip()` function (#3391)
glenn-jocher May 30, 2021
fdbe527
Revert "`cv2.imread(img, -1)` for IMREAD_UNCHANGED (#3379)" (#3395)
glenn-jocher May 31, 2021
3cb9ad4
Update FLOPs description (#3422)
chocosaj Jun 3, 2021
f8651c3
Parse URL authentication (#3424)
glenn-jocher Jun 3, 2021
af2bc3a
Add FLOPs title to table (#3453)
glenn-jocher Jun 4, 2021
4aa2959
Suppress jit trace warning + graph once (#3454)
glenn-jocher Jun 4, 2021
8e3b4a0
Update MixUp augmentation `alpha=beta=32.0` (#3455)
glenn-jocher Jun 4, 2021
d40481a
Add `timeout()` class (#3460)
glenn-jocher Jun 4, 2021
c37f072
Faster HSV augmentation (#3462)
developer0hye Jun 4, 2021
563ea94
Add `check_git_status()` 5 second timeout (#3464)
glenn-jocher Jun 4, 2021
317f2cc
Improved `check_requirements()` offline-handling (#3466)
glenn-jocher Jun 4, 2021
044daaf
Add `output_names` argument for ONNX export with dynamic axes (#3456)
SamSamhuns Jun 4, 2021
b31229a
Revert FP16 `test.py` and `detect.py` inference to FP32 default (#3423)
PresageBoat Jun 4, 2021
739451d
Add additional links/resources to stale.yml message (#3467)
glenn-jocher Jun 4, 2021
3597d28
Update stale.yml HUB URL (#3468)
glenn-jocher Jun 4, 2021
cf4f95b
Stale `github.actor` bug fix (#3483)
glenn-jocher Jun 6, 2021
a1c3572
Explicit `model.eval()` call `if opt.train=False` (#3475)
developer0hye Jun 6, 2021
90b7895
check_requirements() exclude `opencv-python` (#3495)
glenn-jocher Jun 7, 2021
8d1ddc9
Earlier `assert` for cpu and half option (#3508)
developer0hye Jun 7, 2021
eede7dc
Update tutorial.ipynb (#3510)
glenn-jocher Jun 7, 2021
d986145
Reduce test.py results spacing (#3511)
glenn-jocher Jun 7, 2021
abb2a96
Update README.md (#3512)
glenn-jocher Jun 7, 2021
c058a61
Update greetings.yml
glenn-jocher Jun 8, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
check_requirements() exclude opencv-python (#3495)
Fix for 3rd party or contrib versions of installed OpenCV as in #3494.
  • Loading branch information
glenn-jocher committed Jun 7, 2021
commit 90b7895d652c3bd3d361b2d6e9aee900fd67f5f7
3 changes: 2 additions & 1 deletion hubconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ def _create(name, pretrained=True, channels=3, classes=80, autoshape=True, verbo
from utils.google_utils import attempt_download
from utils.torch_utils import select_device

check_requirements(Path(__file__).parent / 'requirements.txt', exclude=('tensorboard', 'pycocotools', 'thop'))
check_requirements(requirements=Path(__file__).parent / 'requirements.txt',
exclude=('tensorboard', 'pycocotools', 'thop', 'opencv-python'))
set_logging(verbose=verbose)

fname = Path(name).with_suffix('.pt') # checkpoint filename
Expand Down