Remove GPU stubs for all layers with device-unified Forward() and Backward().

Rob Hess · jeffdonahue · commit 72e4c21e2a75 · 2014-08-12T13:39:26.000-07:00
diff --git a/src/caffe/layers/conv_layer.cpp b/src/caffe/layers/conv_layer.cpp
@@ -221,10 +221,6 @@ void ConvolutionLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,
   }
 }
 
-#ifdef CPU_ONLY
-STUB_GPU(ConvolutionLayer);
-#endif
-
 INSTANTIATE_CLASS(ConvolutionLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/eltwise_layer.cpp b/src/caffe/layers/eltwise_layer.cpp
@@ -93,10 +93,6 @@ void EltwiseLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,
   }
 }
 
-#ifdef CPU_ONLY
-STUB_GPU(EltwiseLayer);
-#endif
-
 INSTANTIATE_CLASS(EltwiseLayer);
 
 
diff --git a/src/caffe/layers/euclidean_loss_layer.cpp b/src/caffe/layers/euclidean_loss_layer.cpp
@@ -48,10 +48,6 @@ void EuclideanLossLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,
   }
 }
 
-#ifdef CPU_ONLY
-STUB_GPU(EuclideanLossLayer);
-#endif
-
 INSTANTIATE_CLASS(EuclideanLossLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/flatten_layer.cpp b/src/caffe/layers/flatten_layer.cpp
@@ -30,10 +30,6 @@ void FlattenLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,
   (*bottom)[0]->ShareDiff(*top[0]);
 }
 
-#ifdef CPU_ONLY
-STUB_GPU(FlattenLayer);
-#endif
-
 INSTANTIATE_CLASS(FlattenLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp
@@ -113,10 +113,6 @@ Dtype HDF5DataLayer<Dtype>::Forward(const vector<Blob<Dtype>*>& bottom,
   return Dtype(0.);
 }
 
-#ifdef CPU_ONLY
-STUB_GPU_FORWARD(HDF5DataLayer, Forward);
-#endif
-
 INSTANTIATE_CLASS(HDF5DataLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/hdf5_output_layer.cpp b/src/caffe/layers/hdf5_output_layer.cpp
@@ -62,10 +62,6 @@ Dtype HDF5OutputLayer<Dtype>::Forward(const vector<Blob<Dtype>*>& bottom,
   return Dtype(0.);
 }
 
-#ifdef CPU_ONLY
-STUB_GPU(HDF5OutputLayer);
-#endif
-
 INSTANTIATE_CLASS(HDF5OutputLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/im2col_layer.cpp b/src/caffe/layers/im2col_layer.cpp
@@ -81,10 +81,6 @@ void Im2colLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,
   }
 }
 
-#ifdef CPU_ONLY
-STUB_GPU(Im2colLayer);
-#endif
-
 INSTANTIATE_CLASS(Im2colLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/image_data_layer.cpp b/src/caffe/layers/image_data_layer.cpp
@@ -265,10 +265,6 @@ Dtype ImageDataLayer<Dtype>::Forward(const vector<Blob<Dtype>*>& bottom,
   return Dtype(0.);
 }
 
-#ifdef CPU_ONLY
-STUB_GPU_FORWARD(ImageDataLayer, Forward);
-#endif
-
 INSTANTIATE_CLASS(ImageDataLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/inner_product_layer.cpp b/src/caffe/layers/inner_product_layer.cpp
@@ -94,10 +94,6 @@ void InnerProductLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,
   }
 }
 
-#ifdef CPU_ONLY
-STUB_GPU(InnerProductLayer);
-#endif
-
 INSTANTIATE_CLASS(InnerProductLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/power_layer.cpp b/src/caffe/layers/power_layer.cpp
@@ -94,10 +94,6 @@ void PowerLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,
   }
 }
 
-#ifdef CPU_ONLY
-STUB_GPU(PowerLayer);
-#endif
-
 INSTANTIATE_CLASS(PowerLayer);
 
 
diff --git a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp
@@ -63,10 +63,6 @@ void SigmoidCrossEntropyLossLayer<Dtype>::Backward(
   }
 }
 
-#ifdef CPU_ONLY
-STUB_GPU(SigmoidCrossEntropyLossLayer);
-#endif
-
 INSTANTIATE_CLASS(SigmoidCrossEntropyLossLayer);
 
 
diff --git a/src/caffe/layers/softmax_loss_layer.cpp b/src/caffe/layers/softmax_loss_layer.cpp
@@ -75,11 +75,6 @@ void SoftmaxWithLossLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,
   }
 }
 
-
-#ifdef CPU_ONLY
-STUB_GPU(SoftmaxWithLossLayer);
-#endif
-
 INSTANTIATE_CLASS(SoftmaxWithLossLayer);
 
 
diff --git a/src/caffe/layers/split_layer.cpp b/src/caffe/layers/split_layer.cpp
@@ -46,11 +46,6 @@ void SplitLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,
   }
 }
 
-
-#ifdef CPU_ONLY
-STUB_GPU(SplitLayer);
-#endif
-
 INSTANTIATE_CLASS(SplitLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/window_data_layer.cpp b/src/caffe/layers/window_data_layer.cpp
@@ -439,10 +439,6 @@ Dtype WindowDataLayer<Dtype>::Forward(const vector<Blob<Dtype>*>& bottom,
   return Dtype(0.);
 }
 
-#ifdef CPU_ONLY
-STUB_GPU_FORWARD(WindowDataLayer, Forward);
-#endif
-
 INSTANTIATE_CLASS(WindowDataLayer);
 
 }  // namespace caffe

Original file line number	Diff line number	Diff line change
`@@ -221,10 +221,6 @@ void ConvolutionLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`
`224`		`-#ifdef CPU_ONLY`
`225`		`-STUB_GPU(ConvolutionLayer);`
`226`		`-#endif`
`227`		`-`
`228`	`224`	`INSTANTIATE_CLASS(ConvolutionLayer);`
`229`	`225`
`230`	`226`	`} // namespace caffe`
Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,6 @@ void EltwiseLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`-#ifdef CPU_ONLY`
`97`		`-STUB_GPU(EltwiseLayer);`
`98`		`-#endif`
`99`		`-`
`100`	`96`	`INSTANTIATE_CLASS(EltwiseLayer);`
`101`	`97`
`102`	`98`
Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,6 @@ void EuclideanLossLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-#ifdef CPU_ONLY`
`52`		`-STUB_GPU(EuclideanLossLayer);`
`53`		`-#endif`
`54`		`-`
`55`	`51`	`INSTANTIATE_CLASS(EuclideanLossLayer);`
`56`	`52`
`57`	`53`	`} // namespace caffe`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,6 @@ void FlattenLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,`
`30`	`30`	`(bottom)[0]->ShareDiff(top[0]);`
`31`	`31`	`}`
`32`	`32`
`33`		`-#ifdef CPU_ONLY`
`34`		`-STUB_GPU(FlattenLayer);`
`35`		`-#endif`
`36`		`-`
`37`	`33`	`INSTANTIATE_CLASS(FlattenLayer);`
`38`	`34`
`39`	`35`	`} // namespace caffe`
Original file line number	Diff line number	Diff line change
`@@ -113,10 +113,6 @@ Dtype HDF5DataLayer<Dtype>::Forward(const vector<Blob<Dtype>*>& bottom,`
`113`	`113`	`return Dtype(0.);`
`114`	`114`	`}`
`115`	`115`
`116`		`-#ifdef CPU_ONLY`
`117`		`-STUB_GPU_FORWARD(HDF5DataLayer, Forward);`
`118`		`-#endif`
`119`		`-`
`120`	`116`	`INSTANTIATE_CLASS(HDF5DataLayer);`
`121`	`117`
`122`	`118`	`} // namespace caffe`
Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,6 @@ Dtype HDF5OutputLayer<Dtype>::Forward(const vector<Blob<Dtype>*>& bottom,`
`62`	`62`	`return Dtype(0.);`
`63`	`63`	`}`
`64`	`64`
`65`		`-#ifdef CPU_ONLY`
`66`		`-STUB_GPU(HDF5OutputLayer);`
`67`		`-#endif`
`68`		`-`
`69`	`65`	`INSTANTIATE_CLASS(HDF5OutputLayer);`
`70`	`66`
`71`	`67`	`} // namespace caffe`
Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,6 @@ void Im2colLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`84`		`-#ifdef CPU_ONLY`
`85`		`-STUB_GPU(Im2colLayer);`
`86`		`-#endif`
`87`		`-`
`88`	`84`	`INSTANTIATE_CLASS(Im2colLayer);`
`89`	`85`
`90`	`86`	`} // namespace caffe`
Original file line number	Diff line number	Diff line change
`@@ -265,10 +265,6 @@ Dtype ImageDataLayer<Dtype>::Forward(const vector<Blob<Dtype>*>& bottom,`
`265`	`265`	`return Dtype(0.);`
`266`	`266`	`}`
`267`	`267`
`268`		`-#ifdef CPU_ONLY`
`269`		`-STUB_GPU_FORWARD(ImageDataLayer, Forward);`
`270`		`-#endif`
`271`		`-`
`272`	`268`	`INSTANTIATE_CLASS(ImageDataLayer);`
`273`	`269`
`274`	`270`	`} // namespace caffe`
Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,6 @@ void InnerProductLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`-#ifdef CPU_ONLY`
`98`		`-STUB_GPU(InnerProductLayer);`
`99`		`-#endif`
`100`		`-`
`101`	`97`	`INSTANTIATE_CLASS(InnerProductLayer);`
`102`	`98`
`103`	`99`	`} // namespace caffe`
Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,6 @@ void PowerLayer<Dtype>::Backward(const vector<Blob<Dtype>*>& top,`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`-#ifdef CPU_ONLY`
`98`		`-STUB_GPU(PowerLayer);`
`99`		`-#endif`
`100`		`-`
`101`	`97`	`INSTANTIATE_CLASS(PowerLayer);`
`102`	`98`
`103`	`99`