From b659d93a4a7444fc7b2b8346f1b03cb1bb462ed7 Mon Sep 17 00:00:00 2001 From: AlexeyAB Date: Wed, 28 Mar 2018 23:23:37 +0300 Subject: [PATCH] Changed cmd and sh files. Added new cfg files for old Yolo v2. --- build/darknet/x64/cfg/yolov2-tiny-voc.cfg | 138 ++++++++++ build/darknet/x64/cfg/yolov2-tiny.cfg | 139 ++++++++++ build/darknet/x64/cfg/yolov2-voc.cfg | 258 ++++++++++++++++++ build/darknet/x64/cfg/yolov2.cfg | 258 ++++++++++++++++++ build/darknet/x64/darknet_coco.cmd | 2 +- build/darknet/x64/darknet_demo_coco.cmd | 2 +- .../darknet/x64/darknet_demo_mjpeg_stream.cmd | 2 +- build/darknet/x64/darknet_demo_store.cmd | 2 +- build/darknet/x64/darknet_demo_voc.cmd | 2 +- build/darknet/x64/darknet_demo_voc_param.cmd | 2 +- build/darknet/x64/darknet_demo_voc_tiny.cmd | 2 +- build/darknet/x64/darknet_many_images.cmd | 2 +- build/darknet/x64/darknet_net_cam_coco.cmd | 2 +- build/darknet/x64/darknet_net_cam_voc.cmd | 2 +- build/darknet/x64/darknet_tiny_v2.cmd | 7 + build/darknet/x64/darknet_voc.cmd | 4 +- build/darknet/x64/darknet_voc_tiny_v2.cmd | 6 + build/darknet/x64/darknet_web_cam_voc.cmd | 2 +- cfg/yolov2-tiny-voc.cfg | 138 ++++++++++ cfg/yolov2-tiny.cfg | 139 ++++++++++ cfg/yolov2-voc.cfg | 258 ++++++++++++++++++ cfg/yolov2.cfg | 258 ++++++++++++++++++ image_voc.sh | 6 - mjpeg_stream.sh | 2 +- net_cam_voc.sh | 6 - src/layer.h | 1 + src/parser.c | 1 + src/region_layer.c | 3 +- src/region_layer.h | 3 +- video_voc.sh | 6 - 30 files changed, 1618 insertions(+), 35 deletions(-) create mode 100644 build/darknet/x64/cfg/yolov2-tiny-voc.cfg create mode 100644 build/darknet/x64/cfg/yolov2-tiny.cfg create mode 100644 build/darknet/x64/cfg/yolov2-voc.cfg create mode 100644 build/darknet/x64/cfg/yolov2.cfg create mode 100644 build/darknet/x64/darknet_tiny_v2.cmd create mode 100644 build/darknet/x64/darknet_voc_tiny_v2.cmd create mode 100644 cfg/yolov2-tiny-voc.cfg create mode 100644 cfg/yolov2-tiny.cfg create mode 100644 cfg/yolov2-voc.cfg create mode 100644 cfg/yolov2.cfg delete mode 100644 image_voc.sh delete mode 100644 net_cam_voc.sh delete mode 100644 video_voc.sh diff --git a/build/darknet/x64/cfg/yolov2-tiny-voc.cfg b/build/darknet/x64/cfg/yolov2-tiny-voc.cfg new file mode 100644 index 00000000000..c4c127cdd35 --- /dev/null +++ b/build/darknet/x64/cfg/yolov2-tiny-voc.cfg @@ -0,0 +1,138 @@ +[net] +# Testing +batch=1 +subdivisions=1 +# Training +# batch=64 +# subdivisions=2 +width=416 +height=416 +channels=3 +momentum=0.9 +decay=0.0005 +angle=0 +saturation = 1.5 +exposure = 1.5 +hue=.1 + +learning_rate=0.001 +max_batches = 40200 +policy=steps +steps=-1,100,20000,30000 +scales=.1,10,.1,.1 + +[convolutional] +batch_normalize=1 +filters=16 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=32 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=64 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=128 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=256 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=1 + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + +########### + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[convolutional] +size=1 +stride=1 +pad=1 +filters=125 +activation=linear + +[region] +anchors = 1.08,1.19, 3.42,4.41, 6.63,11.38, 9.42,5.11, 16.62,10.52 +bias_match=1 +classes=20 +coords=4 +num=5 +softmax=1 +jitter=.2 +rescore=1 + +object_scale=5 +noobject_scale=1 +class_scale=1 +coord_scale=1 + +absolute=1 +thresh = .6 +random=1 diff --git a/build/darknet/x64/cfg/yolov2-tiny.cfg b/build/darknet/x64/cfg/yolov2-tiny.cfg new file mode 100644 index 00000000000..81d0ac45d6d --- /dev/null +++ b/build/darknet/x64/cfg/yolov2-tiny.cfg @@ -0,0 +1,139 @@ +[net] +# Testing +batch=1 +subdivisions=1 +# Training +# batch=64 +# subdivisions=2 +width=416 +height=416 +channels=3 +momentum=0.9 +decay=0.0005 +angle=0 +saturation = 1.5 +exposure = 1.5 +hue=.1 + +learning_rate=0.001 +burn_in=1000 +max_batches = 500200 +policy=steps +steps=400000,450000 +scales=.1,.1 + +[convolutional] +batch_normalize=1 +filters=16 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=32 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=64 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=128 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=256 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=1 + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + +########### + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=512 +activation=leaky + +[convolutional] +size=1 +stride=1 +pad=1 +filters=425 +activation=linear + +[region] +anchors = 0.57273, 0.677385, 1.87446, 2.06253, 3.33843, 5.47434, 7.88282, 3.52778, 9.77052, 9.16828 +bias_match=1 +classes=80 +coords=4 +num=5 +softmax=1 +jitter=.2 +rescore=0 + +object_scale=5 +noobject_scale=1 +class_scale=1 +coord_scale=1 + +absolute=1 +thresh = .6 +random=1 diff --git a/build/darknet/x64/cfg/yolov2-voc.cfg b/build/darknet/x64/cfg/yolov2-voc.cfg new file mode 100644 index 00000000000..dbf2de281c1 --- /dev/null +++ b/build/darknet/x64/cfg/yolov2-voc.cfg @@ -0,0 +1,258 @@ +[net] +# Testing +batch=1 +subdivisions=1 +# Training +# batch=64 +# subdivisions=8 +height=416 +width=416 +channels=3 +momentum=0.9 +decay=0.0005 +angle=0 +saturation = 1.5 +exposure = 1.5 +hue=.1 + +learning_rate=0.001 +burn_in=1000 +max_batches = 80200 +policy=steps +steps=40000,60000 +scales=.1,.1 + +[convolutional] +batch_normalize=1 +filters=32 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=64 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=128 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=64 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=128 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=256 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=128 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=256 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=256 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=256 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + + +####### + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[route] +layers=-9 + +[convolutional] +batch_normalize=1 +size=1 +stride=1 +pad=1 +filters=64 +activation=leaky + +[reorg] +stride=2 + +[route] +layers=-1,-4 + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[convolutional] +size=1 +stride=1 +pad=1 +filters=125 +activation=linear + + +[region] +anchors = 1.3221, 1.73145, 3.19275, 4.00944, 5.05587, 8.09892, 9.47112, 4.84053, 11.2364, 10.0071 +bias_match=1 +classes=20 +coords=4 +num=5 +softmax=1 +jitter=.3 +rescore=1 + +object_scale=5 +noobject_scale=1 +class_scale=1 +coord_scale=1 + +absolute=1 +thresh = .6 +random=1 diff --git a/build/darknet/x64/cfg/yolov2.cfg b/build/darknet/x64/cfg/yolov2.cfg new file mode 100644 index 00000000000..2a0cd98fbd0 --- /dev/null +++ b/build/darknet/x64/cfg/yolov2.cfg @@ -0,0 +1,258 @@ +[net] +# Testing +batch=1 +subdivisions=1 +# Training +# batch=64 +# subdivisions=8 +width=416 +height=416 +channels=3 +momentum=0.9 +decay=0.0005 +angle=0 +saturation = 1.5 +exposure = 1.5 +hue=.1 + +learning_rate=0.001 +burn_in=1000 +max_batches = 500200 +policy=steps +steps=400000,450000 +scales=.1,.1 + +[convolutional] +batch_normalize=1 +filters=32 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=64 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=128 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=64 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=128 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=256 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=128 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=256 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=256 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=256 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + + +####### + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[route] +layers=-9 + +[convolutional] +batch_normalize=1 +size=1 +stride=1 +pad=1 +filters=64 +activation=leaky + +[reorg] +stride=2 + +[route] +layers=-1,-4 + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[convolutional] +size=1 +stride=1 +pad=1 +filters=425 +activation=linear + + +[region] +anchors = 0.57273, 0.677385, 1.87446, 2.06253, 3.33843, 5.47434, 7.88282, 3.52778, 9.77052, 9.16828 +bias_match=1 +classes=80 +coords=4 +num=5 +softmax=1 +jitter=.3 +rescore=1 + +object_scale=5 +noobject_scale=1 +class_scale=1 +coord_scale=1 + +absolute=1 +thresh = .6 +random=1 diff --git a/build/darknet/x64/darknet_coco.cmd b/build/darknet/x64/darknet_coco.cmd index b29b6069265..4500fc3d3c4 100644 --- a/build/darknet/x64/darknet_coco.cmd +++ b/build/darknet/x64/darknet_coco.cmd @@ -1,6 +1,6 @@ -darknet.exe detector test data/coco.data yolo.cfg yolo.weights -i 0 -thresh 0.25 +darknet.exe detector test data/coco.data cfg/yolov2.cfg yolov2.weights -i 0 -thresh 0.25 pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_demo_coco.cmd b/build/darknet/x64/darknet_demo_coco.cmd index d00f21ff259..6a9b2bb1729 100644 --- a/build/darknet/x64/darknet_demo_coco.cmd +++ b/build/darknet/x64/darknet_demo_coco.cmd @@ -1,6 +1,6 @@ -darknet.exe detector demo data/coco.data yolo.cfg yolo.weights test.mp4 -i 0 -out_filename res.avi +darknet.exe detector demo data/coco.data cfg/yolov2.cfg yolov2.weights test.mp4 -i 0 -out_filename res.avi pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_demo_mjpeg_stream.cmd b/build/darknet/x64/darknet_demo_mjpeg_stream.cmd index 43148da97bc..a2c5f89188b 100644 --- a/build/darknet/x64/darknet_demo_mjpeg_stream.cmd +++ b/build/darknet/x64/darknet_demo_mjpeg_stream.cmd @@ -1,7 +1,7 @@ rem Run this file and then open URL in Chrome/Firefox: rem http://localhost:8090 rem Or open: http://ip-address:8090 -darknet.exe detector demo data/voc.data yolo-voc.cfg yolo-voc.weights test.mp4 -i 0 -http_port 8090 -dont_show +darknet.exe detector demo data/voc.data cfg/yolov2-voc.cfg yolo-voc.weights test.mp4 -i 0 -http_port 8090 -dont_show pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_demo_store.cmd b/build/darknet/x64/darknet_demo_store.cmd index 4f9e0c212ee..8c3cd5bc219 100644 --- a/build/darknet/x64/darknet_demo_store.cmd +++ b/build/darknet/x64/darknet_demo_store.cmd @@ -1,4 +1,4 @@ -darknet.exe detector demo data/voc.data yolo-voc.cfg yolo-voc.weights test.mp4 -i 0 -out_filename res.avi +darknet.exe detector demo data/voc.data cfg/yolov2-voc.cfg yolo-voc.weights test.mp4 -i 0 -out_filename res.avi pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_demo_voc.cmd b/build/darknet/x64/darknet_demo_voc.cmd index cea032c1d0a..7a9b56bf430 100644 --- a/build/darknet/x64/darknet_demo_voc.cmd +++ b/build/darknet/x64/darknet_demo_voc.cmd @@ -1,4 +1,4 @@ -darknet.exe detector demo data/voc.data yolo-voc.cfg yolo-voc.weights test.mp4 -i 0 +darknet.exe detector demo data/voc.data cfg/yolov2-voc.cfg yolo-voc.weights test.mp4 -i 0 pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_demo_voc_param.cmd b/build/darknet/x64/darknet_demo_voc_param.cmd index 20a1d3903e4..7f684ce26d6 100644 --- a/build/darknet/x64/darknet_demo_voc_param.cmd +++ b/build/darknet/x64/darknet_demo_voc_param.cmd @@ -1,6 +1,6 @@ -darknet.exe detector demo data/voc.data yolo-voc.cfg yolo-voc.weights %1 -i 0 +darknet.exe detector demo data/voc.data cfg/yolov2-voc.cfg yolo-voc.weights %1 -i 0 pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_demo_voc_tiny.cmd b/build/darknet/x64/darknet_demo_voc_tiny.cmd index 2ea2cbfa611..19bbe0c7004 100644 --- a/build/darknet/x64/darknet_demo_voc_tiny.cmd +++ b/build/darknet/x64/darknet_demo_voc_tiny.cmd @@ -1,6 +1,6 @@ -darknet.exe detector demo data/voc.data tiny-yolo-voc.cfg tiny-yolo-voc.weights test.mp4 -i 0 +darknet.exe detector demo data/voc.data cfg/yolov2-tiny-voc.cfg yolov2-tiny-voc.weights test.mp4 -i 0 pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_many_images.cmd b/build/darknet/x64/darknet_many_images.cmd index 23cc21ffda4..5f4658e482c 100644 --- a/build/darknet/x64/darknet_many_images.cmd +++ b/build/darknet/x64/darknet_many_images.cmd @@ -1,4 +1,4 @@ -darknet.exe detector test data/voc.data yolo-voc.cfg yolo-voc.weights -dont_show < data/train.txt > result.txt +darknet.exe detector test data/voc.data cfg/yolov2-voc.cfg yolo-voc.weights -dont_show < data/train.txt > result.txt pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_net_cam_coco.cmd b/build/darknet/x64/darknet_net_cam_coco.cmd index fe2b35103d7..414bff067ac 100644 --- a/build/darknet/x64/darknet_net_cam_coco.cmd +++ b/build/darknet/x64/darknet_net_cam_coco.cmd @@ -5,7 +5,7 @@ # # Replace the address below, on shown in the phone application -darknet.exe detector demo data/coco.data yolo.cfg yolo.weights http://192.168.0.80:8080/video?dummy=param.mjpg -i 0 +darknet.exe detector demo data/coco.data cfg/yolov2.cfg yolov2.weights http://192.168.0.80:8080/video?dummy=param.mjpg -i 0 pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_net_cam_voc.cmd b/build/darknet/x64/darknet_net_cam_voc.cmd index 2311d009d86..2a0a3ae4bee 100644 --- a/build/darknet/x64/darknet_net_cam_voc.cmd +++ b/build/darknet/x64/darknet_net_cam_voc.cmd @@ -5,7 +5,7 @@ # # Replace the address below, on shown in the phone application -darknet.exe detector demo data/voc.data yolo-voc.cfg yolo-voc.weights http://192.168.0.80:8080/video?dummy=param.mjpg -i 0 +darknet.exe detector demo data/voc.data cfg/yolov2-voc.cfg yolo-voc.weights http://192.168.0.80:8080/video?dummy=param.mjpg -i 0 pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_tiny_v2.cmd b/build/darknet/x64/darknet_tiny_v2.cmd new file mode 100644 index 00000000000..621ebf639ad --- /dev/null +++ b/build/darknet/x64/darknet_tiny_v2.cmd @@ -0,0 +1,7 @@ + +darknet.exe detector test data/coco.data cfg/yolov2-tiny.cfg yolov2-tiny.weights -i 0 dog.jpg -thresh 0.51 + + + + +pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_voc.cmd b/build/darknet/x64/darknet_voc.cmd index 3021cd06021..abc5002200d 100644 --- a/build/darknet/x64/darknet_voc.cmd +++ b/build/darknet/x64/darknet_voc.cmd @@ -1,8 +1,8 @@ -rem darknet.exe detector test data/voc.data yolo-voc.cfg yolo-voc.weights 009460.jpg +rem darknet.exe detector test data/voc.data cfg/yolov2-voc.cfg yolo-voc.weights 009460.jpg -darknet.exe detector test data/voc.data yolo-voc.cfg yolo-voc.weights -i 0 -thresh 0.24 dog.jpg +darknet.exe detector test data/voc.data cfg/yolov2-voc.cfg yolo-voc.weights -i 0 -thresh 0.24 dog.jpg pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_voc_tiny_v2.cmd b/build/darknet/x64/darknet_voc_tiny_v2.cmd new file mode 100644 index 00000000000..490fd9ff3bf --- /dev/null +++ b/build/darknet/x64/darknet_voc_tiny_v2.cmd @@ -0,0 +1,6 @@ + +darknet.exe detector test data/voc.data cfg/yolov2-tiny-voc.cfg yolov2-tiny-voc.weights -i 0 dog.jpg + + + +pause \ No newline at end of file diff --git a/build/darknet/x64/darknet_web_cam_voc.cmd b/build/darknet/x64/darknet_web_cam_voc.cmd index 57046ced11c..7bed610b14d 100644 --- a/build/darknet/x64/darknet_web_cam_voc.cmd +++ b/build/darknet/x64/darknet_web_cam_voc.cmd @@ -1,6 +1,6 @@ # play video from Web-Camera number 0 -darknet.exe detector demo data/voc.data yolo-voc.cfg yolo-voc.weights -c 0 +darknet.exe detector demo data/voc.data cfg/yolov2-voc.cfg yolo-voc.weights -c 0 pause \ No newline at end of file diff --git a/cfg/yolov2-tiny-voc.cfg b/cfg/yolov2-tiny-voc.cfg new file mode 100644 index 00000000000..c4c127cdd35 --- /dev/null +++ b/cfg/yolov2-tiny-voc.cfg @@ -0,0 +1,138 @@ +[net] +# Testing +batch=1 +subdivisions=1 +# Training +# batch=64 +# subdivisions=2 +width=416 +height=416 +channels=3 +momentum=0.9 +decay=0.0005 +angle=0 +saturation = 1.5 +exposure = 1.5 +hue=.1 + +learning_rate=0.001 +max_batches = 40200 +policy=steps +steps=-1,100,20000,30000 +scales=.1,10,.1,.1 + +[convolutional] +batch_normalize=1 +filters=16 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=32 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=64 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=128 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=256 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=1 + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + +########### + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[convolutional] +size=1 +stride=1 +pad=1 +filters=125 +activation=linear + +[region] +anchors = 1.08,1.19, 3.42,4.41, 6.63,11.38, 9.42,5.11, 16.62,10.52 +bias_match=1 +classes=20 +coords=4 +num=5 +softmax=1 +jitter=.2 +rescore=1 + +object_scale=5 +noobject_scale=1 +class_scale=1 +coord_scale=1 + +absolute=1 +thresh = .6 +random=1 diff --git a/cfg/yolov2-tiny.cfg b/cfg/yolov2-tiny.cfg new file mode 100644 index 00000000000..81d0ac45d6d --- /dev/null +++ b/cfg/yolov2-tiny.cfg @@ -0,0 +1,139 @@ +[net] +# Testing +batch=1 +subdivisions=1 +# Training +# batch=64 +# subdivisions=2 +width=416 +height=416 +channels=3 +momentum=0.9 +decay=0.0005 +angle=0 +saturation = 1.5 +exposure = 1.5 +hue=.1 + +learning_rate=0.001 +burn_in=1000 +max_batches = 500200 +policy=steps +steps=400000,450000 +scales=.1,.1 + +[convolutional] +batch_normalize=1 +filters=16 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=32 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=64 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=128 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=256 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=1 + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + +########### + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=512 +activation=leaky + +[convolutional] +size=1 +stride=1 +pad=1 +filters=425 +activation=linear + +[region] +anchors = 0.57273, 0.677385, 1.87446, 2.06253, 3.33843, 5.47434, 7.88282, 3.52778, 9.77052, 9.16828 +bias_match=1 +classes=80 +coords=4 +num=5 +softmax=1 +jitter=.2 +rescore=0 + +object_scale=5 +noobject_scale=1 +class_scale=1 +coord_scale=1 + +absolute=1 +thresh = .6 +random=1 diff --git a/cfg/yolov2-voc.cfg b/cfg/yolov2-voc.cfg new file mode 100644 index 00000000000..dbf2de281c1 --- /dev/null +++ b/cfg/yolov2-voc.cfg @@ -0,0 +1,258 @@ +[net] +# Testing +batch=1 +subdivisions=1 +# Training +# batch=64 +# subdivisions=8 +height=416 +width=416 +channels=3 +momentum=0.9 +decay=0.0005 +angle=0 +saturation = 1.5 +exposure = 1.5 +hue=.1 + +learning_rate=0.001 +burn_in=1000 +max_batches = 80200 +policy=steps +steps=40000,60000 +scales=.1,.1 + +[convolutional] +batch_normalize=1 +filters=32 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=64 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=128 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=64 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=128 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=256 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=128 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=256 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=256 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=256 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + + +####### + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[route] +layers=-9 + +[convolutional] +batch_normalize=1 +size=1 +stride=1 +pad=1 +filters=64 +activation=leaky + +[reorg] +stride=2 + +[route] +layers=-1,-4 + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[convolutional] +size=1 +stride=1 +pad=1 +filters=125 +activation=linear + + +[region] +anchors = 1.3221, 1.73145, 3.19275, 4.00944, 5.05587, 8.09892, 9.47112, 4.84053, 11.2364, 10.0071 +bias_match=1 +classes=20 +coords=4 +num=5 +softmax=1 +jitter=.3 +rescore=1 + +object_scale=5 +noobject_scale=1 +class_scale=1 +coord_scale=1 + +absolute=1 +thresh = .6 +random=1 diff --git a/cfg/yolov2.cfg b/cfg/yolov2.cfg new file mode 100644 index 00000000000..2a0cd98fbd0 --- /dev/null +++ b/cfg/yolov2.cfg @@ -0,0 +1,258 @@ +[net] +# Testing +batch=1 +subdivisions=1 +# Training +# batch=64 +# subdivisions=8 +width=416 +height=416 +channels=3 +momentum=0.9 +decay=0.0005 +angle=0 +saturation = 1.5 +exposure = 1.5 +hue=.1 + +learning_rate=0.001 +burn_in=1000 +max_batches = 500200 +policy=steps +steps=400000,450000 +scales=.1,.1 + +[convolutional] +batch_normalize=1 +filters=32 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=64 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=128 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=64 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=128 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=256 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=128 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=256 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=256 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=256 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=3 +stride=1 +pad=1 +activation=leaky + +[maxpool] +size=2 +stride=2 + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=512 +size=1 +stride=1 +pad=1 +activation=leaky + +[convolutional] +batch_normalize=1 +filters=1024 +size=3 +stride=1 +pad=1 +activation=leaky + + +####### + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[route] +layers=-9 + +[convolutional] +batch_normalize=1 +size=1 +stride=1 +pad=1 +filters=64 +activation=leaky + +[reorg] +stride=2 + +[route] +layers=-1,-4 + +[convolutional] +batch_normalize=1 +size=3 +stride=1 +pad=1 +filters=1024 +activation=leaky + +[convolutional] +size=1 +stride=1 +pad=1 +filters=425 +activation=linear + + +[region] +anchors = 0.57273, 0.677385, 1.87446, 2.06253, 3.33843, 5.47434, 7.88282, 3.52778, 9.77052, 9.16828 +bias_match=1 +classes=80 +coords=4 +num=5 +softmax=1 +jitter=.3 +rescore=1 + +object_scale=5 +noobject_scale=1 +class_scale=1 +coord_scale=1 + +absolute=1 +thresh = .6 +random=1 diff --git a/image_voc.sh b/image_voc.sh deleted file mode 100644 index 1ef017d6308..00000000000 --- a/image_voc.sh +++ /dev/null @@ -1,6 +0,0 @@ - - -./darknet detector test ./cfg/voc.data ./cfg/yolo-voc.cfg ./yolo-voc.weights data/dog.jpg -i 0 -thresh 0.2 - - - diff --git a/mjpeg_stream.sh b/mjpeg_stream.sh index e3e9746a2a7..ff21ddf49b2 100644 --- a/mjpeg_stream.sh +++ b/mjpeg_stream.sh @@ -1,7 +1,7 @@ rem Run this file and then open URL in Chrome/Firefox: rem http://localhost:8090 rem Or open: http://ip-address:8090 -./darknet detector demo ./cfg/voc.data ./cfg/yolo-voc.cfg ./yolo-voc.weights test50.mp4 -i 0 -thresh 0.2 -http_port 8090 +./darknet detector demo ./cfg/coco.data ./cfg/yolov3.cfg ./yolov3.weights test50.mp4 -i 0 -thresh 0.25 -http_port 8090 diff --git a/net_cam_voc.sh b/net_cam_voc.sh deleted file mode 100644 index 196b371bc0b..00000000000 --- a/net_cam_voc.sh +++ /dev/null @@ -1,6 +0,0 @@ -#rm test_dnn_out.avi - -./darknet detector demo ./cfg/voc.data ./cfg/yolo-voc.cfg ./yolo-voc.weights rtsp://admin:admin12345@192.168.0.228:554 -i 0 -thresh 0.24 - - - diff --git a/src/layer.h b/src/layer.h index 5291df90052..91b893a4558 100644 --- a/src/layer.h +++ b/src/layer.h @@ -135,6 +135,7 @@ struct layer{ float coord_scale; float object_scale; float noobject_scale; + float mask_scale; float class_scale; int bias_match; int random; diff --git a/src/parser.c b/src/parser.c index a37ef1c3a75..fd3d69139d5 100644 --- a/src/parser.c +++ b/src/parser.c @@ -326,6 +326,7 @@ layer parse_region(list *options, size_params params) l.coord_scale = option_find_float(options, "coord_scale", 1); l.object_scale = option_find_float(options, "object_scale", 1); l.noobject_scale = option_find_float(options, "noobject_scale", 1); + l.mask_scale = option_find_float(options, "mask_scale", 1); l.class_scale = option_find_float(options, "class_scale", 1); l.bias_match = option_find_int_quiet(options, "bias_match",0); diff --git a/src/region_layer.c b/src/region_layer.c index 5e464029333..445e1bbaf0e 100644 --- a/src/region_layer.c +++ b/src/region_layer.c @@ -493,7 +493,7 @@ void correct_region_boxes(detection *dets, int n, int w, int h, int netw, int ne } } -/* + void get_region_detections(layer l, int w, int h, int netw, int neth, float thresh, int *map, float tree_thresh, int relative, detection *dets) { int i, j, n, z; @@ -570,4 +570,3 @@ void get_region_detections(layer l, int w, int h, int netw, int neth, float thre } correct_region_boxes(dets, l.w*l.h*l.n, w, h, netw, neth, relative); } -*/ \ No newline at end of file diff --git a/src/region_layer.h b/src/region_layer.h index c35d173d8ae..16af6d6e6b1 100644 --- a/src/region_layer.h +++ b/src/region_layer.h @@ -11,7 +11,8 @@ void forward_region_layer(const region_layer l, network_state state); void backward_region_layer(const region_layer l, network_state state); void get_region_boxes(layer l, int w, int h, float thresh, float **probs, box *boxes, int only_objectness, int *map); void resize_region_layer(layer *l, int w, int h); -//void get_region_detections(layer l, int w, int h, int netw, int neth, float thresh, int *map, float tree_thresh, int relative, detection *dets); +void get_region_detections(layer l, int w, int h, int netw, int neth, float thresh, int *map, float tree_thresh, int relative, detection *dets); +void correct_region_boxes(detection *dets, int n, int w, int h, int netw, int neth, int relative); #ifdef GPU void forward_region_layer_gpu(const region_layer l, network_state state); diff --git a/video_voc.sh b/video_voc.sh deleted file mode 100644 index 99112ca016f..00000000000 --- a/video_voc.sh +++ /dev/null @@ -1,6 +0,0 @@ - - -./darknet detector demo ./cfg/voc.data ./cfg/yolo-voc.cfg ./yolo-voc.weights test50.mp4 -i 0 -thresh 0.2 - - -