diff options
| author | Jonathan L Long <jonlong@cs.berkeley.edu> | 2014-06-30 23:11:11 -0700 |
|---|---|---|
| committer | Jonathan L Long <jonlong@cs.berkeley.edu> | 2014-07-19 18:31:32 -0700 |
| commit | 00ecb24ce011b7c06416cb2a6279526856df8a8f (patch) | |
| tree | dcef7efbcc794f73d2b2dfdee54d2b751bfed380 /src/caffe/layers/conv_layer.cu | |
| parent | 61bd7ea32470684201b0a8a9d3edea14edb302f2 (diff) | |
| download | caffeonacl-00ecb24ce011b7c06416cb2a6279526856df8a8f.tar.gz caffeonacl-00ecb24ce011b7c06416cb2a6279526856df8a8f.tar.bz2 caffeonacl-00ecb24ce011b7c06416cb2a6279526856df8a8f.zip | |
use Blob directly instead of shared_ptr for ConvolutionLayer::bias_multiplier_
This will make layer reshaping easier and more uniform, and is
consistent with col_buffer_.
Diffstat (limited to 'src/caffe/layers/conv_layer.cu')
| -rw-r--r-- | src/caffe/layers/conv_layer.cu | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/caffe/layers/conv_layer.cu b/src/caffe/layers/conv_layer.cu index 0b6e912b..d328fbde 100644 --- a/src/caffe/layers/conv_layer.cu +++ b/src/caffe/layers/conv_layer.cu @@ -35,7 +35,7 @@ Dtype ConvolutionLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom, if (bias_term_) { caffe_gpu_gemm<Dtype>(CblasNoTrans, CblasNoTrans, num_output_, N_, 1, (Dtype)1., this->blobs_[1]->gpu_data(), - bias_multiplier_->gpu_data(), + bias_multiplier_.gpu_data(), (Dtype)1., top_data + (*top)[i]->offset(n)); } } @@ -69,7 +69,7 @@ void ConvolutionLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top, for (int n = 0; n < num_; ++n) { caffe_gpu_gemv<Dtype>(CblasNoTrans, num_output_, N_, 1., top_diff + top[0]->offset(n), - bias_multiplier_->gpu_data(), 1., + bias_multiplier_.gpu_data(), 1., bias_diff); } } |