diff options
| author | Kai Li <kaili_kloud@163.com> | 2014-03-23 20:30:52 +0800 |
|---|---|---|
| committer | Kai Li <kaili_kloud@163.com> | 2014-03-23 20:30:52 +0800 |
| commit | 2b28b2090d9e47b47ee083a5e46467761cb8941c (patch) | |
| tree | 2848bd25bee92c8a137b031f9a3bbe138a33b432 /src/caffe/layers/hdf5_output_layer.cpp | |
| parent | dd9e05bff4ca382b13afe3a2a8faf87fb5932480 (diff) | |
| download | caffeonacl-2b28b2090d9e47b47ee083a5e46467761cb8941c.tar.gz caffeonacl-2b28b2090d9e47b47ee083a5e46467761cb8941c.tar.bz2 caffeonacl-2b28b2090d9e47b47ee083a5e46467761cb8941c.zip | |
Rebase and change the HDF5OutputLayer::Forward/Backward signatures
Diffstat (limited to 'src/caffe/layers/hdf5_output_layer.cpp')
| -rw-r--r-- | src/caffe/layers/hdf5_output_layer.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/caffe/layers/hdf5_output_layer.cpp b/src/caffe/layers/hdf5_output_layer.cpp index 3bf8dc2b..419c6c83 100644 --- a/src/caffe/layers/hdf5_output_layer.cpp +++ b/src/caffe/layers/hdf5_output_layer.cpp @@ -54,7 +54,7 @@ void HDF5OutputLayer<Dtype>::SetUp(const vector<Blob<Dtype>*>& bottom, } template <typename Dtype> -void HDF5OutputLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, +Dtype HDF5OutputLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, vector<Blob<Dtype>*>* top) { CHECK_GE(bottom.size(), 2); CHECK_EQ(bottom[0]->num(), bottom[1]->num()); @@ -74,10 +74,11 @@ void HDF5OutputLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, sizeof(Dtype) * label_datum_dim); } SaveBlobs(); + return Dtype(0.); } template <typename Dtype> -void HDF5OutputLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom, +Dtype HDF5OutputLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom, vector<Blob<Dtype>*>* top) { CHECK_GE(bottom.size(), 2); CHECK_EQ(bottom[0]->num(), bottom[1]->num()); @@ -97,18 +98,19 @@ void HDF5OutputLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom, sizeof(Dtype) * label_datum_dim, cudaMemcpyDeviceToHost)); } SaveBlobs(); + return Dtype(0.); } template <typename Dtype> -Dtype HDF5OutputLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top, +void HDF5OutputLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top, const bool propagate_down, vector<Blob<Dtype>*>* bottom) { - return Dtype(0.); + return; } template <typename Dtype> -Dtype HDF5OutputLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top, +void HDF5OutputLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top, const bool propagate_down, vector<Blob<Dtype>*>* bottom) { - return Dtype(0.); + return; } INSTANTIATE_CLASS(HDF5OutputLayer); |