mirror of
https://github.com/pjreddie/darknet.git
synced 2023-08-10 21:13:14 +03:00
Merge branch 'master' into dev/cenit/include
This commit is contained in:
@ -32,7 +32,6 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define NFRAMES 3
|
||||
#define SECRET_NUM -1234
|
||||
|
||||
#ifdef GPU
|
||||
@ -136,6 +135,7 @@ typedef enum {
|
||||
RNN,
|
||||
GRU,
|
||||
LSTM,
|
||||
CONV_LSTM,
|
||||
CRNN,
|
||||
BATCHNORM,
|
||||
NETWORK,
|
||||
@ -208,8 +208,10 @@ struct layer {
|
||||
int index;
|
||||
int binary;
|
||||
int xnor;
|
||||
int peephole;
|
||||
int use_bin_output;
|
||||
int steps;
|
||||
int state_constrain;
|
||||
int hidden;
|
||||
int truth;
|
||||
float smooth;
|
||||
@ -354,6 +356,7 @@ struct layer {
|
||||
float *z_cpu;
|
||||
float *r_cpu;
|
||||
float *h_cpu;
|
||||
float *stored_h_cpu;
|
||||
float * prev_state_cpu;
|
||||
|
||||
float *temp_cpu;
|
||||
@ -369,6 +372,7 @@ struct layer {
|
||||
float *g_cpu;
|
||||
float *o_cpu;
|
||||
float *c_cpu;
|
||||
float *stored_c_cpu;
|
||||
float *dc_cpu;
|
||||
|
||||
float *binary_input;
|
||||
@ -407,10 +411,13 @@ struct layer {
|
||||
struct layer *uh;
|
||||
struct layer *uo;
|
||||
struct layer *wo;
|
||||
struct layer *vo;
|
||||
struct layer *uf;
|
||||
struct layer *wf;
|
||||
struct layer *vf;
|
||||
struct layer *ui;
|
||||
struct layer *wi;
|
||||
struct layer *vi;
|
||||
struct layer *ug;
|
||||
struct layer *wg;
|
||||
|
||||
@ -424,6 +431,7 @@ struct layer {
|
||||
float *z_gpu;
|
||||
float *r_gpu;
|
||||
float *h_gpu;
|
||||
float *stored_h_gpu;
|
||||
|
||||
float *temp_gpu;
|
||||
float *temp2_gpu;
|
||||
@ -432,12 +440,16 @@ struct layer {
|
||||
float *dh_gpu;
|
||||
float *hh_gpu;
|
||||
float *prev_cell_gpu;
|
||||
float *prev_state_gpu;
|
||||
float *last_prev_state_gpu;
|
||||
float *last_prev_cell_gpu;
|
||||
float *cell_gpu;
|
||||
float *f_gpu;
|
||||
float *i_gpu;
|
||||
float *g_gpu;
|
||||
float *o_gpu;
|
||||
float *c_gpu;
|
||||
float *stored_c_gpu;
|
||||
float *dc_gpu;
|
||||
|
||||
// adam
|
||||
@ -451,7 +463,6 @@ struct layer {
|
||||
float * combine_gpu;
|
||||
float * combine_delta_gpu;
|
||||
|
||||
float * prev_state_gpu;
|
||||
float * forgot_state_gpu;
|
||||
float * forgot_delta_gpu;
|
||||
float * state_gpu;
|
||||
@ -541,6 +552,7 @@ typedef struct network {
|
||||
float learning_rate_min;
|
||||
float learning_rate_max;
|
||||
int batches_per_cycle;
|
||||
int batches_cycle_mult;
|
||||
float momentum;
|
||||
float decay;
|
||||
float gamma;
|
||||
@ -549,6 +561,7 @@ typedef struct network {
|
||||
int time_steps;
|
||||
int step;
|
||||
int max_batches;
|
||||
float *seq_scales;
|
||||
float *scales;
|
||||
int *steps;
|
||||
int num_steps;
|
||||
@ -571,6 +584,7 @@ typedef struct network {
|
||||
float min_ratio;
|
||||
int center;
|
||||
int flip; // horizontal flip 50% probability augmentaiont for classifier training (default = 1)
|
||||
int blur;
|
||||
float angle;
|
||||
float aspect;
|
||||
float exposure;
|
||||
@ -579,6 +593,9 @@ typedef struct network {
|
||||
int random;
|
||||
int track;
|
||||
int augment_speed;
|
||||
int sequential_subdivisions;
|
||||
int init_sequential_subdivisions;
|
||||
int current_subdivision;
|
||||
int try_fix_nan;
|
||||
|
||||
int gpu_index;
|
||||
@ -713,6 +730,7 @@ typedef struct load_args {
|
||||
int show_imgs;
|
||||
float jitter;
|
||||
int flip;
|
||||
int blur;
|
||||
float angle;
|
||||
float aspect;
|
||||
float saturation;
|
||||
@ -778,7 +796,7 @@ LIB_API float *network_predict_image(network *net, image im);
|
||||
LIB_API float validate_detector_map(char *datacfg, char *cfgfile, char *weightfile, float thresh_calc_avg_iou, const float iou_thresh, const int map_points, network *existing_net);
|
||||
LIB_API void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, int ngpus, int clear, int dont_show, int calc_map, int mjpeg_port, int show_imgs);
|
||||
LIB_API void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filename, float thresh,
|
||||
float hier_thresh, int dont_show, int ext_output, int save_labels, char *outfile);
|
||||
float hier_thresh, int dont_show, int ext_output, int save_labels, char *outfile, int letter_box);
|
||||
LIB_API int network_width(network *net);
|
||||
LIB_API int network_height(network *net);
|
||||
LIB_API void optimize_picture(network *net, image orig, int max_layer, float scale, float rate, float thresh, int norm);
|
||||
|
Reference in New Issue
Block a user