Merge pull request #752 from Yangqing/sweep

reapply namespace change

diff --cc include/caffe/net.hpp
Simple merge

diff --cc src/caffe/layers/accuracy_layer.cpp
index 58ea6ae,95439b9..7c91311
--- 1/src/caffe/layers/accuracy_layer.cpp
--- 2/src/caffe/layers/accuracy_layer.cpp
+++ b/src/caffe/layers/accuracy_layer.cpp
@@@ -10,10 -10,9 +10,8 @@@
  #include "caffe/util/math_functions.hpp"
  #include "caffe/util/io.hpp"
  
 -
  namespace caffe {
  
- using std::max;
- 
  template <typename Dtype>
  void AccuracyLayer<Dtype>::SetUp(
    const vector<Blob<Dtype>*>& bottom, vector<Blob<Dtype>*>* top) {

diff --cc src/caffe/layers/dropout_layer.cu
Simple merge

diff --cc src/caffe/layers/image_data_layer.cpp
Simple merge

diff --cc src/caffe/layers/image_data_layer.cu
Simple merge

diff --cc src/caffe/layers/pooling_layer.cpp
Simple merge

diff --cc src/caffe/layers/pooling_layer.cu
Simple merge

diff --cc src/caffe/layers/window_data_layer.cpp
Simple merge

diff --cc src/caffe/layers/window_data_layer.cu
Simple merge

diff --cc src/caffe/net.cpp
Simple merge