mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'yolov3' of https://github.com/danielgordon10/darknet into yolov3

Browse Source
This commit is contained in:
Daniel Gordon 2018-03-15 18:15:21 -07:00
commit 2e251da027
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,6 @@
GPU=1 GPU=1
CUDNN=1 CUDNN=1
OPENCV=1 OPENCV=0
OPENMP=1 OPENMP=1
DEBUG=0 DEBUG=0

4
examples/detector.c
View File

@ -624,6 +624,7 @@ void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filenam
void censor_detector(char *datacfg, char *cfgfile, char *weightfile, int cam_index, const char *filename, int class, float thresh, int skip) void censor_detector(char *datacfg, char *cfgfile, char *weightfile, int cam_index, const char *filename, int class, float thresh, int skip)
{ {
#ifdef OPENCV
image **alphabet = load_alphabet(); image **alphabet = load_alphabet();
char *base = basecfg(cfgfile); char *base = basecfg(cfgfile);
network *net = load_network(cfgfile, weightfile, 0); network *net = load_network(cfgfile, weightfile, 0);
@ -702,10 +703,12 @@ void censor_detector(char *datacfg, char *cfgfile, char *weightfile, int cam_ind
free_image(in); free_image(in);
} }
} }
#endif
} }
void extract_detector(char *datacfg, char *cfgfile, char *weightfile, int cam_index, const char *filename, int class, float thresh, int skip) void extract_detector(char *datacfg, char *cfgfile, char *weightfile, int cam_index, const char *filename, int class, float thresh, int skip)
{ {
#ifdef OPENCV
image **alphabet = load_alphabet(); image **alphabet = load_alphabet();
char *base = basecfg(cfgfile); char *base = basecfg(cfgfile);
network *net = load_network(cfgfile, weightfile, 0); network *net = load_network(cfgfile, weightfile, 0);
@ -790,6 +793,7 @@ void extract_detector(char *datacfg, char *cfgfile, char *weightfile, int cam_in
free_image(in); free_image(in);
} }
} }
#endif
} }
/* /*

1
examples/super.c
View File

@ -94,7 +94,6 @@ void test_super(char *cfgfile, char *weightfile, char *filename)
printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time)); printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time));
save_image(out, "out"); save_image(out, "out");
show_image(out, "out"); show_image(out, "out");
cvWaitKey(0);
free_image(im); free_image(im);
if (filename) break; if (filename) break;