From cdd1cb0e8c4fda3671714bb5ad6ba1825cff16d1 Mon Sep 17 00:00:00 2001 From: Puneet Kohli <punkohl@gmail.com> Date: Sun, 06 May 2018 21:45:26 +0000 Subject: [PATCH] Change matplotlib backend to 'agg' when 'show_plot' is false. This allows the script to be run from command line without any errors (for ex, on a remote machine) --- src/convolutional_layer.h | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h index 3d52b22..6d1e517 100644 --- a/src/convolutional_layer.h +++ b/src/convolutional_layer.h @@ -19,17 +19,21 @@ void add_bias_gpu(float *output, float *biases, int batch, int n, int size); void backward_bias_gpu(float *bias_updates, float *delta, int batch, int n, int size); +#ifdef CUDNN +void cudnn_convolutional_setup(layer *l, int cudnn_preference); +void cuda_convert_f32_to_f16(float* input_f32, size_t size, float *output_f16); +#endif #endif -convolutional_layer make_convolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, int pad, ACTIVATION activation, int batch_normalization, int binary, int xnor); +convolutional_layer make_convolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, int padding, ACTIVATION activation, int batch_normalize, int binary, int xnor, int adam); void denormalize_convolutional_layer(convolutional_layer l); void resize_convolutional_layer(convolutional_layer *layer, int w, int h); void forward_convolutional_layer(const convolutional_layer layer, network_state state); void update_convolutional_layer(convolutional_layer layer, int batch, float learning_rate, float momentum, float decay); -image *visualize_convolutional_layer(convolutional_layer layer, char *window, image *prev_filters); -void binarize_filters(float *filters, int n, int size, float *binary); +image *visualize_convolutional_layer(convolutional_layer layer, char *window, image *prev_weights); +void binarize_weights(float *weights, int n, int size, float *binary); void swap_binary(convolutional_layer *l); -void binarize_filters2(float *filters, int n, int size, char *binary, float *scales); +void binarize_weights2(float *weights, int n, int size, char *binary, float *scales); void backward_convolutional_layer(convolutional_layer layer, network_state state); @@ -38,12 +42,12 @@ image get_convolutional_image(convolutional_layer layer); image get_convolutional_delta(convolutional_layer layer); -image get_convolutional_filter(convolutional_layer layer, int i); +image get_convolutional_weight(convolutional_layer layer, int i); int convolutional_out_height(convolutional_layer layer); int convolutional_out_width(convolutional_layer layer); -void rescale_filters(convolutional_layer l, float scale, float trans); -void rgbgr_filters(convolutional_layer l); +void rescale_weights(convolutional_layer l, float scale, float trans); +void rgbgr_weights(convolutional_layer l); #endif -- Gitblit v1.10.0