Move device.hpp up out of util/.

Author: Rob Hess

include/caffe/util/device.hpp renamed to include/caffe/device.hpp

@@ -7,8 +7,8 @@
 #include "caffe/blob.hpp"
 #include "caffe/common.hpp"
 #include "caffe/proto/caffe.pb.h"
+#include "caffe/device.hpp"
 #include "caffe/util/device_alternate.hpp"
-#include "caffe/util/device.hpp"
 
 namespace caffe {
 

include/caffe/layer.hpp

@@ -1,7 +1,7 @@
 #include <vector>
 
+#include "caffe/device.hpp"
 #include "caffe/layer.hpp"
-#include "caffe/util/device.hpp"
 #include "caffe/vision_layers.hpp"
 
 namespace caffe {

src/caffe/layers/concat_layer.cpp

@@ -5,14 +5,10 @@
 #include <vector>
 
 #include "caffe/common.hpp"
+#include "caffe/device.hpp"
 #include "caffe/layer.hpp"
 #include "caffe/net.hpp"
-<<<<<<< HEAD
 #include "caffe/proto/caffe.pb.h"
-=======
-#include "caffe/util/io.hpp"
-#include "caffe/util/device.hpp"
->>>>>>> Incorporate additional abstractions from 1605431.
 #include "caffe/util/insert_splits.hpp"
 #include "caffe/util/io.hpp"
 #include "caffe/util/math_functions.hpp"

src/caffe/net.cpp

@@ -8,7 +8,7 @@
 #include "caffe/proto/caffe.pb.h"
 #include "caffe/solver.hpp"
 #include "caffe/util/io.hpp"
-#include "caffe/util/device.hpp"
+#include "caffe/device.hpp"
 #include "caffe/util/math_functions.hpp"
 #include "caffe/util/upgrade_proto.hpp"
 

src/caffe/solver.cpp

@@ -1,7 +1,7 @@
 // Copyright 2014 BVLC and contributors.
 
 #include "caffe/common.hpp"
-#include "caffe/util/device.hpp"
+#include "caffe/device.hpp"
 
 namespace caffe {
 template<typename Dtype>

src/caffe/util/cpu_device.cpp

@@ -1,7 +1,7 @@
 // Copyright 2014 BVLC and contributors.
 
 #include "caffe/common.hpp"
-#include "caffe/util/device.hpp"
+#include "caffe/device.hpp"
 
 namespace caffe {
 

src/caffe/util/device.cpp

@@ -1,7 +1,7 @@
 // Copyright 2014 BVLC and contributors.
 
 #include "caffe/common.hpp"
-#include "caffe/util/device.hpp"
+#include "caffe/device.hpp"
 
 namespace caffe {
 template<typename Dtype>