Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions testdata/dnn/download_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -899,14 +899,14 @@ def get_confirm_token(response): # in case of large files
filename='efficientdet-d0.pb'),
Model(
name='YOLOv4', # https://github.com/opencv/opencv/issues/17148
downloader=GDrive('1cewMfusmPjYWbrnuJRuKhPMwRe_b9PaT'),
url="https://github.com/AlexeyAB/darknet/releases/download/yolov4/yolov4.weights",
sha='0143deb6c46fcc7f74dd35bf3c14edc3784e99ee',
filename='yolov4.weights'),
Model(
name='YOLOv4-tiny', # https://github.com/opencv/opencv/issues/17148
url='https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v4_pre/yolov4-tiny.weights',
sha='d110379b7b86899226b591ad4affc7115f707157',
filename='yolov4-tiny.weights'),
name='YOLOv4-tiny-2020-12', # https://github.com/opencv/opencv/issues/17148
url='https://github.com/AlexeyAB/darknet/releases/download/yolov4/yolov4-tiny.weights',
sha='451caaab22fb9831aa1a5ee9b5ba74a35ffa5dcb',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't override files created by this script (there is 3.4 branch which expects old sha / and tested with old file only).
It should be a new file (with date suffix -YYYY-MM). Also we need to update tests.

There are 2 links on the release page for yolov4-tiny.weights:

But both with the same content (sha1:451caaab22fb9831aa1a5ee9b5ba74a35ffa5dcb).

BTW, I have a copy of old file with download date 2020-07-03 (sha1:d110379b7b86899226b591ad4affc7115f707157).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've replaced old record with a new one and updated all tests.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to dates on this page suffix should be -2020-12 (15 Dec 2020): https://github.com/AlexeyAB/darknet/releases

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

darknet_yolo_v4_pre -> yolov4 in URL?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.
Also changed yolov4 URL from Google Drive to GitHub release, the file has same SHA1.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yolov4-tiny-2022-12.cfg -> 2020-12 too

filename='yolov4-tiny-2020-12.weights'),
Model(
name='YOLOv4x-mish', # https://github.com/opencv/opencv/issues/18975
url='https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v4_pre/yolov4x-mish.weights',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,20 @@ hue=.1

learning_rate=0.00261
burn_in=1000
max_batches = 500200

max_batches = 2000200
policy=steps
steps=400000,450000
steps=1600000,1800000
scales=.1,.1


#weights_reject_freq=1001
#ema_alpha=0.9998
#equidistant_point=1000
#num_sigmas_reject_badlabels=3
#badlabels_rejection_percentage=0.2


[convolutional]
batch_normalize=1
filters=32
Expand Down Expand Up @@ -230,6 +239,8 @@ random=0
resize=1.5
nms_kind=greedynms
beta_nms=0.6
#new_coords=1
#scale_x_y = 2.0

[route]
layers = -4
Expand Down Expand Up @@ -279,3 +290,5 @@ random=0
resize=1.5
nms_kind=greedynms
beta_nms=0.6
#new_coords=1
#scale_x_y = 2.0
5 changes: 3 additions & 2 deletions testdata/dnn/yolov4-tiny.cfg.readme
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[Origin](https://github.com/AlexeyAB/darknet/blob/3af6781de273fa01f4a535c8e40c5056e809e22f/cfg/yolov4-tiny.cfg)
[License](https://github.com/AlexeyAB/darknet/blob/3af6781de273fa01f4a535c8e40c5056e809e22f/LICENSE)
[Origin](https://github.com/AlexeyAB/darknet/blob/0faed3e60e52f742bbef43b83f6be51dd30f373e/cfg/yolov4-tiny.cfg)
[License](https://github.com/AlexeyAB/darknet/blob/a298f94255a20a3198d80ea512755d9e5dddbf02/LICENSE)
[Weights](https://github.com/AlexeyAB/darknet/releases/download/yolov4/yolov4-tiny.weights)