Skip to content

Commit

Permalink
The return value of WaitForInternalThreadToExit has reversed
Browse files Browse the repository at this point in the history
  • Loading branch information
kloudkl committed Aug 28, 2014
1 parent 425f69f commit f2a291c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/caffe/layers/data_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ void DataLayer<Dtype>::CreatePrefetchThread() {

template <typename Dtype>
void DataLayer<Dtype>::JoinPrefetchThread() {
CHECK(!WaitForInternalThreadToExit()) << "Thread joining failed";
CHECK(WaitForInternalThreadToExit()) << "Thread joining failed";
}

template <typename Dtype>
Expand Down
2 changes: 1 addition & 1 deletion src/caffe/layers/image_data_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ void ImageDataLayer<Dtype>::ShuffleImages() {

template <typename Dtype>
void ImageDataLayer<Dtype>::JoinPrefetchThread() {
CHECK(!WaitForInternalThreadToExit()) << "Thread joining failed";
CHECK(WaitForInternalThreadToExit()) << "Thread joining failed";
}

template <typename Dtype>
Expand Down
2 changes: 1 addition & 1 deletion src/caffe/layers/window_data_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ void WindowDataLayer<Dtype>::CreatePrefetchThread() {

template <typename Dtype>
void WindowDataLayer<Dtype>::JoinPrefetchThread() {
CHECK(!WaitForInternalThreadToExit()) << "Thread joining failed.";
CHECK(WaitForInternalThreadToExit()) << "Thread joining failed.";
}

template <typename Dtype>
Expand Down

0 comments on commit f2a291c

Please sign in to comment.