summaryrefslogtreecommitdiff
path: root/src/caffe/layers/data_layer.cpp
diff options
context:
space:
mode:
authorKai Li <kaili_kloud@163.com>2014-08-28 17:32:46 +0800
committerKai Li <kaili_kloud@163.com>2014-09-03 13:25:21 +0800
commit5af0d240cd22adb60bb6fd7eadd3249a46369faf (patch)
treed146038aafba78248d7184f8c6b14af1d27085ef /src/caffe/layers/data_layer.cpp
parentb794cf9433233ec002dc454fa40286bbd3f4ecfe (diff)
downloadcaffeonacl-5af0d240cd22adb60bb6fd7eadd3249a46369faf.tar.gz
caffeonacl-5af0d240cd22adb60bb6fd7eadd3249a46369faf.tar.bz2
caffeonacl-5af0d240cd22adb60bb6fd7eadd3249a46369faf.zip
The BasePrefetchingDataLayer shouldn't join the thread
Diffstat (limited to 'src/caffe/layers/data_layer.cpp')
-rw-r--r--src/caffe/layers/data_layer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/caffe/layers/data_layer.cpp b/src/caffe/layers/data_layer.cpp
index fbf2d91c..b57ca587 100644
--- a/src/caffe/layers/data_layer.cpp
+++ b/src/caffe/layers/data_layer.cpp
@@ -79,6 +79,7 @@ void DataLayer<Dtype>::InternalThreadEntry() {
template <typename Dtype>
DataLayer<Dtype>::~DataLayer<Dtype>() {
+ this->JoinPrefetchThread();
// clean up the database resources
switch (this->layer_param_.data_param().backend()) {
case DataParameter_DB_LEVELDB: