mirror of https://github.com/AlexeyAB/darknet.git
Merge branch 'master' of github.com:AlexeyAB/darknet
This commit is contained in:
commit
c61771e1f1
|
@ -0,0 +1,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
./darknet detector test ./cfg/coco.data ./cfg/yolov4.cfg ./yolov4.weights data/dog.jpg -i 0 -thresh 0.25
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -985,6 +985,7 @@ LIB_API network *load_network(char *cfg, char *weights, int clear);
|
||||||
LIB_API network *load_network_custom(char *cfg, char *weights, int clear, int batch);
|
LIB_API network *load_network_custom(char *cfg, char *weights, int clear, int batch);
|
||||||
LIB_API network *load_network(char *cfg, char *weights, int clear);
|
LIB_API network *load_network(char *cfg, char *weights, int clear);
|
||||||
LIB_API void free_network(network net);
|
LIB_API void free_network(network net);
|
||||||
|
LIB_API void free_network_ptr(network* net);
|
||||||
|
|
||||||
// network.c
|
// network.c
|
||||||
LIB_API load_args get_base_args(network *net);
|
LIB_API load_args get_base_args(network *net);
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
#rm test_dnn_out.avi
|
||||||
|
|
||||||
|
./darknet detector demo ./cfg/coco.data ./cfg/yolov4.cfg ./yolov4.weights rtsp://admin:admin12345@192.168.0.228:554 -i 0 -thresh 0.25
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -289,7 +289,7 @@ void normalize_cpu(float *x, float *mean, float *variance, int batch, int filter
|
||||||
for(f = 0; f < filters; ++f){
|
for(f = 0; f < filters; ++f){
|
||||||
for(i = 0; i < spatial; ++i){
|
for(i = 0; i < spatial; ++i){
|
||||||
int index = b*filters*spatial + f*spatial + i;
|
int index = b*filters*spatial + f*spatial + i;
|
||||||
x[index] = (x[index] - mean[f])/(sqrt(variance[f] + .000001f));
|
x[index] = (x[index] - mean[f])/(sqrt(variance[f] + .00001f));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1164,6 +1164,11 @@ float network_accuracy_multi(network net, data d, int n)
|
||||||
return acc;
|
return acc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void free_network_ptr(network* net)
|
||||||
|
{
|
||||||
|
free_network(*net);
|
||||||
|
}
|
||||||
|
|
||||||
void free_network(network net)
|
void free_network(network net)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
./darknet detector demo ./cfg/coco.data ./cfg/yolov4.cfg ./yolov4.weights test50.mp4 -i 0 -thresh 0.25
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue