|
|
|
@ -258,7 +258,7 @@ void validate_detector(char *datacfg, char *cfgfile, char *weightfile) |
|
|
|
|
int *map = 0; |
|
|
|
|
if (mapf) map = read_map(mapf); |
|
|
|
|
|
|
|
|
|
network net = parse_network_cfg(cfgfile); |
|
|
|
|
network net = parse_network_cfg_custom(cfgfile, 1); |
|
|
|
|
if(weightfile){ |
|
|
|
|
load_weights(&net, weightfile); |
|
|
|
|
} |
|
|
|
@ -375,7 +375,7 @@ void validate_detector(char *datacfg, char *cfgfile, char *weightfile) |
|
|
|
|
|
|
|
|
|
void validate_detector_recall(char *datacfg, char *cfgfile, char *weightfile) |
|
|
|
|
{ |
|
|
|
|
network net = parse_network_cfg(cfgfile); |
|
|
|
|
network net = parse_network_cfg_custom(cfgfile, 1); |
|
|
|
|
if(weightfile){ |
|
|
|
|
load_weights(&net, weightfile); |
|
|
|
|
} |
|
|
|
@ -552,6 +552,7 @@ void run_detector(int argc, char **argv) |
|
|
|
|
char *datacfg = argv[3]; |
|
|
|
|
char *cfg = argv[4]; |
|
|
|
|
char *weights = (argc > 5) ? argv[5] : 0; |
|
|
|
|
if (weights[strlen(weights) - 1] == 0x0d) weights[strlen(weights) - 1] = 0; |
|
|
|
|
char *filename = (argc > 6) ? argv[6]: 0; |
|
|
|
|
if(0==strcmp(argv[2], "test")) test_detector(datacfg, cfg, weights, filename, thresh); |
|
|
|
|
else if(0==strcmp(argv[2], "train")) train_detector(datacfg, cfg, weights, gpus, ngpus, clear); |
|
|
|
|