diff options
| author | Sergey Karayev <sergeykarayev@gmail.com> | 2014-03-17 14:05:32 -0700 |
|---|---|---|
| committer | Sergey Karayev <sergeykarayev@gmail.com> | 2014-03-17 14:05:32 -0700 |
| commit | f7160844e238885f3c1263e71f35e66309ce9974 (patch) | |
| tree | d55ef0ee350813a40b239e8b2d7c3825c740b3ef /src | |
| parent | 5669f61927ed8131f223e1b4db823a00eb74896a (diff) | |
| download | caffeonacl-f7160844e238885f3c1263e71f35e66309ce9974.tar.gz caffeonacl-f7160844e238885f3c1263e71f35e66309ce9974.tar.bz2 caffeonacl-f7160844e238885f3c1263e71f35e66309ce9974.zip | |
Making HDF5 blob data non-mutable for copy (minor)
Diffstat (limited to 'src')
| -rw-r--r-- | src/caffe/layers/hdf5_data_layer.cpp | 8 | ||||
| -rw-r--r-- | src/caffe/layers/hdf5_data_layer.cu | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp index 5b568a8d..98873cb1 100644 --- a/src/caffe/layers/hdf5_data_layer.cpp +++ b/src/caffe/layers/hdf5_data_layer.cpp @@ -6,6 +6,8 @@ Contributors: TODO: - load file in a separate thread ("prefetch") - can be smarter about the memcpy call instead of doing it row-by-row + :: use util functions caffe_copy, and Blob->offset() + :: don't forget to update hdf5_daa_layer.cu accordingly */ #include <stdint.h> #include <string> @@ -110,11 +112,11 @@ void HDF5DataLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, } memcpy(&(*top)[0]->mutable_cpu_data()[i * data_count], - &data_blob_.mutable_cpu_data()[current_row_ * data_count], - sizeof(Dtype) * data_count); + &data_blob_.cpu_data()[current_row_ * data_count], + sizeof(Dtype) * data_count); memcpy(&(*top)[1]->mutable_cpu_data()[i * label_data_count], - &label_blob_.mutable_cpu_data()[current_row_ * label_data_count], + &label_blob_.cpu_data()[current_row_ * label_data_count], sizeof(Dtype) * label_data_count); } } diff --git a/src/caffe/layers/hdf5_data_layer.cu b/src/caffe/layers/hdf5_data_layer.cu index f1a64344..bed7f35a 100644 --- a/src/caffe/layers/hdf5_data_layer.cu +++ b/src/caffe/layers/hdf5_data_layer.cu @@ -43,13 +43,13 @@ void HDF5DataLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom, CUDA_CHECK(cudaMemcpy( &(*top)[0]->mutable_gpu_data()[i * data_count], - &data_blob_.mutable_cpu_data()[current_row_ * data_count], + &data_blob_.cpu_data()[current_row_ * data_count], sizeof(Dtype) * data_count, cudaMemcpyHostToDevice)); CUDA_CHECK(cudaMemcpy( &(*top)[1]->mutable_gpu_data()[i * label_data_count], - &label_blob_.mutable_cpu_data()[current_row_ * label_data_count], + &label_blob_.cpu_data()[current_row_ * label_data_count], sizeof(Dtype) * label_data_count, cudaMemcpyHostToDevice)); } |