OrgLion-ML
/
darknet
mirror of https://github.com/AlexeyAB/darknet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Validate and recall always with batch=1

This commit is contained in:
AlexeyAB 2017-10-31 22:10:31 +03:00
parent 28d56b3d56
commit accf3a59c8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/detector.c
View File

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

2
src/parser.c
View File

@ -1033,11 +1033,13 @@ void load_weights_upto(network *net, char *filename, int cutoff)
fread(&minor, sizeof(int), 1, fp); fread(&minor, sizeof(int), 1, fp);
fread(&revision, sizeof(int), 1, fp); fread(&revision, sizeof(int), 1, fp);
if ((major * 10 + minor) >= 2) { if ((major * 10 + minor) >= 2) {
printf("\n seen 64 \n");
uint64_t iseen = 0; uint64_t iseen = 0;
fread(&iseen, sizeof(uint64_t), 1, fp); fread(&iseen, sizeof(uint64_t), 1, fp);
*net->seen = iseen; *net->seen = iseen;
} }
else { else {
printf("\n seen 32 \n");
fread(net->seen, sizeof(int), 1, fp); fread(net->seen, sizeof(int), 1, fp);
} }
int transpose = (major > 1000) || (minor > 1000); int transpose = (major > 1000) || (minor > 1000);