flownet2 patch: fix all the errors in CPU-Only mode build. All runtests pass.

vera121 · vera121 · commit bfc8ee75516e · 2018-04-22T23:30:57.000-04:00
diff --git a/include/caffe/layers/black_augmentation_layer.hpp b/include/caffe/layers/black_augmentation_layer.hpp
@@ -37,9 +37,9 @@ class BlackAugmentationLayer : public Layer<Dtype> {
   virtual void Forward_gpu(const vector<Blob<Dtype>*>& bottom,
       const vector<Blob<Dtype>*>& top);
   virtual void Backward_cpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom) { LOG(FATAL) << "BlackAugmentation cannot do backward"; }
+      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom);
   virtual void Backward_gpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom) { LOG(FATAL) << "BlackAugmentation cannot do backward"; }
+      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom);
 };
 
 
diff --git a/include/caffe/layers/data_augmentation_layer.hpp b/include/caffe/layers/data_augmentation_layer.hpp
@@ -36,9 +36,9 @@ class DataAugmentationLayer : public AugmentationLayerBase<Dtype>, public Layer<
                              const vector<Blob<Dtype>*>& top);
 
     virtual void Backward_cpu(const vector<Blob<Dtype>*>& top,
-                              const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)  { for(int i=0; i<propagate_down.size(); i++) if(propagate_down[i]) LOG(FATAL) << "DataAugmentationLayer cannot do backward."; return; }
+                              const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom);
     virtual void Backward_gpu(const vector<Blob<Dtype>*>& top,
-                              const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)  { for(int i=0; i<propagate_down.size(); i++) if(propagate_down[i]) LOG(FATAL) << "DataAugmentationLayer cannot do backward."; return; }
+                              const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom);
               
     
     virtual inline bool DoesUseCustomCopyBlobs() const { return true; }
diff --git a/include/caffe/layers/flo_writer_layer.hpp b/include/caffe/layers/flo_writer_layer.hpp
@@ -33,9 +33,8 @@ class FLOWriterLayer : public Layer<Dtype> {
       const vector<Blob<Dtype>*>& top);
 
   virtual void Backward_cpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom) {}
-  virtual void Backward_gpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom) {}
+      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom);
+
 };
 
 }  // namespace caffe
diff --git a/include/caffe/layers/float_reader_layer.hpp b/include/caffe/layers/float_reader_layer.hpp
@@ -33,9 +33,7 @@ class FloatReaderLayer : public Layer<Dtype> {
       const vector<Blob<Dtype>*>& top);
 
   virtual void Backward_cpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)  { LOG(FATAL) << "FloatReaderLayer cannot do backward."; return; }
-  virtual void Backward_gpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)  { LOG(FATAL) << "FloatReaderLayer cannot do backward."; return; }
+      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom);
 };
 
 }  // namespace caffe
diff --git a/include/caffe/layers/float_writer_layer.hpp b/include/caffe/layers/float_writer_layer.hpp
@@ -33,9 +33,7 @@ class FloatWriterLayer : public Layer<Dtype> {
       const vector<Blob<Dtype>*>& top);
 
   virtual void Backward_cpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom) {}
-  virtual void Backward_gpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom) {}
+      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom);
 };
 
 }  // namespace caffe
diff --git a/include/caffe/layers/flow_augmentation_layer.hpp b/include/caffe/layers/flow_augmentation_layer.hpp
@@ -37,9 +37,9 @@ class FlowAugmentationLayer : public AugmentationLayerBase<Dtype>, public Layer<
       const vector<Blob<Dtype>*>& top);
 
   virtual void Backward_cpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)  { LOG(FATAL) << "FlowAugmentationLayer cannot do backward."; return; }
+      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom);
   virtual void Backward_gpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)  { LOG(FATAL) << "FlowAugmentationLayer cannot do backward."; return; }
+      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom);
       
 
   shared_ptr<SyncedMemory> coeff_matrices1_;
diff --git a/include/caffe/layers/generate_augmentation_parameters_layer.hpp b/include/caffe/layers/generate_augmentation_parameters_layer.hpp
@@ -35,9 +35,9 @@ class GenerateAugmentationParametersLayer : public AugmentationLayerBase<Dtype>,
       const vector<Blob<Dtype>*>& top);
 
   virtual void Backward_cpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)  { LOG(FATAL) << "GenerateAugmentationParametersLayer cannot do backward."; return; }
+      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom);
   virtual void Backward_gpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)  { LOG(FATAL) << "GenerateAugmentationParametersLayer cannot do backward."; return; }
+      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom);
       
     
   int num_params_; 
diff --git a/include/caffe/layers/mean_layer.hpp b/include/caffe/layers/mean_layer.hpp
@@ -29,9 +29,7 @@ class MeanLayer : public Layer<Dtype> {
       const vector<Blob<Dtype>*>& top);
 
   virtual void Backward_cpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)  { LOG(FATAL) << "MeanLayer cannot do backward."; return; }
-  virtual void Backward_gpu(const vector<Blob<Dtype>*>& top,
-      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)  { LOG(FATAL) << "MeanLayer cannot do backward."; return; }
+      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom);
 };
 
 
diff --git a/src/caffe/layers/black_augmentation_layer.cpp b/src/caffe/layers/black_augmentation_layer.cpp
@@ -40,6 +40,14 @@ void BlackAugmentationLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bott
     NOT_IMPLEMENTED;
 }
 
+template <typename Dtype>
+void BlackAugmentationLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top,
+		const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)
+{
+	LOG(FATAL) << "BlackAugmentation cannot do backward";
+	return;
+}
+
 #ifdef CPU_ONLY
 STUB_GPU(BlackAugmentationLayer);
 #endif
diff --git a/src/caffe/layers/black_augmentation_layer.cu b/src/caffe/layers/black_augmentation_layer.cu
@@ -97,6 +97,13 @@ void BlackAugmentationLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bott
     }
 }
 
+template <typename Dtype>
+void BlackAugmentationLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
+		const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)
+{
+	LOG(FATAL) << "BlackAugmentation cannot do backward";
+	return;
+}
 
 INSTANTIATE_LAYER_GPU_FUNCS(BlackAugmentationLayer);
 
diff --git a/src/caffe/layers/data_augmentation_layer.cpp b/src/caffe/layers/data_augmentation_layer.cpp
@@ -175,7 +175,7 @@ void DataAugmentationLayer<Dtype>::adjust_blobs(vector<Blob<Dtype>* > blobs)
       {
              // If using RGB mean, copy only RGB values (blob 2)
              Blob<Dtype> tmp; tmp.CopyFrom(*blobs[2], false,true);
-             caffe_gpu_memcpy(this->blobs_[2]->count()*sizeof(float), tmp.mutable_gpu_data(), this->blobs_[2]->mutable_gpu_data());
+             caffe_copy(this->blobs_[2]->count()*sizeof(float), tmp.mutable_cpu_data(), this->blobs_[2]->mutable_gpu_data());
 
              Dtype* data_mean_per_channel_cpu = this->blobs_[2]->mutable_cpu_data();
              for(int i=0; i<this->blobs_[2]->count(); i++)
@@ -208,7 +208,15 @@ template <typename Dtype>
 void DataAugmentationLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
       const vector<Blob<Dtype>*>& top)
 {
-   	LOG(FATAL) << "Forward CPU Augmentation not implemented.";
+	NOT_IMPLEMENTED;
+}
+
+template <typename Dtype>
+void DataAugmentationLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top,
+		const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)
+{
+	LOG(FATAL) << "DataAugmentationLayer cannot do backward.";
+	return;
 }
 
 #ifdef CPU_ONLY
diff --git a/src/caffe/layers/data_augmentation_layer.cu b/src/caffe/layers/data_augmentation_layer.cu
@@ -636,6 +636,14 @@ void DataAugmentationLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& botto
       
 }
 
+template <typename Dtype>
+void DataAugmentationLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
+		const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)
+{
+	LOG(FATAL) << "DataAugmentationLayer cannot do backward.";
+	return;
+}
+
 INSTANTIATE_LAYER_GPU_FUNCS(DataAugmentationLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/floatreader_layer.cpp b/src/caffe/layers/floatreader_layer.cpp
@@ -61,6 +61,14 @@ void FloatReaderLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
         memcpy(top[0]->mutable_cpu_data()+n*dataXSize_*dataYSize_*dataZSize_,data_,sizeof(float)*dataXSize_*dataYSize_*dataZSize_);
 }
 
+template <typename Dtype>
+void FloatReaderLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top,
+		const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)
+{
+	LOG(FATAL) << "FloatReaderLayer cannot do backward.";
+	return;
+}
+
 INSTANTIATE_CLASS(FloatReaderLayer);
 REGISTER_LAYER_CLASS(FloatReader);
 
diff --git a/src/caffe/layers/floatwriter_layer.cpp b/src/caffe/layers/floatwriter_layer.cpp
@@ -97,9 +97,13 @@ void FloatWriterLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
     }
 }
 
-#ifdef CPU_ONLY
-STUB_GPU_FORWARD(FloatWriterLayer, Forward);
-#endif
+template <typename Dtype>
+void FloatWriterLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top,
+		const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)
+{
+	LOG(FATAL) << "FloatWriterLayer cannot do backward.";
+	return;
+}
 
 INSTANTIATE_CLASS(FloatWriterLayer);
 REGISTER_LAYER_CLASS(FloatWriter);
diff --git a/src/caffe/layers/flow_augmentation_layer.cpp b/src/caffe/layers/flow_augmentation_layer.cpp
@@ -77,8 +77,16 @@ void FlowAugmentationLayer<Dtype>::Reshape(const vector<Blob<Dtype>*>& bottom,
 template <typename Dtype>
 void FlowAugmentationLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
     const vector<Blob<Dtype>*>& top)
-{  
-    LOG(FATAL) << "Forward CPU Augmentation not implemented.";
+{
+	NOT_IMPLEMENTED;
+}
+
+template <typename Dtype>
+void FlowAugmentationLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top,
+		const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)
+{
+	LOG(FATAL) << "FlowAugmentationLayer cannot do backward.";
+	return;
 }
 
 #ifdef CPU_ONLY
diff --git a/src/caffe/layers/flow_augmentation_layer.cu b/src/caffe/layers/flow_augmentation_layer.cu
@@ -165,6 +165,14 @@ void FlowAugmentationLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& botto
   
 }
 
+template <typename Dtype>
+void FlowAugmentationLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
+		const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)
+{
+	LOG(FATAL) << "FlowAugmentationLayer cannot do backward.";
+	return;
+}
+
 INSTANTIATE_LAYER_GPU_FUNCS(FlowAugmentationLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/flow_warp_layer.cpp b/src/caffe/layers/flow_warp_layer.cpp
@@ -256,6 +256,10 @@ void FlowWarpLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top,
 //    }
 }
 
+#ifdef CPU_ONLY
+STUB_GPU(FlowWarpLayer);
+#endif
+
 INSTANTIATE_CLASS(FlowWarpLayer);
 REGISTER_LAYER_CLASS(FlowWarp);
 
diff --git a/src/caffe/layers/flowriter_layer.cpp b/src/caffe/layers/flowriter_layer.cpp
@@ -105,10 +105,13 @@ void FLOWriterLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
     }
 }
 
-
-#ifdef CPU_ONLY
-STUB_GPU_FORWARD(FLOWriterLayer, Forward);
-#endif
+template <typename Dtype>
+void FLOWriterLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top,
+		const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)
+{
+	LOG(FATAL) << "FLOWriterLayer cannot do backward.";
+	return;
+}
 
 INSTANTIATE_CLASS(FLOWriterLayer);
 REGISTER_LAYER_CLASS(FLOWriter);
diff --git a/src/caffe/layers/generate_augmentation_parameters_layer.cpp b/src/caffe/layers/generate_augmentation_parameters_layer.cpp
@@ -105,13 +105,20 @@ void GenerateAugmentationParametersLayer<Dtype>::Reshape(const vector<Blob<Dtype
 }
 
 template <typename Dtype>
-void GenerateAugmentationParametersLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
-    const vector<Blob<Dtype>*>& top) {  
-  
-  LOG(FATAL) << "CPU forward pass not implemented";
+void GenerateAugmentationParametersLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, const vector<Blob<Dtype>*>& top)
+{
+	NOT_IMPLEMENTED;
+}
 
+template <typename Dtype>
+void GenerateAugmentationParametersLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top,
+		const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)
+{
+	LOG(FATAL) << "GenerateAugmentationParametersLayer cannot do backward.";
+	return;
 }
 
+
 #ifdef CPU_ONLY
 STUB_GPU(GenerateAugmentationParametersLayer);
 #endif
diff --git a/src/caffe/layers/generate_augmentation_parameters_layer.cu b/src/caffe/layers/generate_augmentation_parameters_layer.cu
@@ -114,6 +114,14 @@ void GenerateAugmentationParametersLayer<Dtype>::Forward_gpu(const vector<Blob<D
   }
 }
 
+template <typename Dtype>
+void GenerateAugmentationParametersLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
+		const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)
+{
+	LOG(FATAL) << "GenerateAugmentationParametersLayer cannot do backward.";
+	return;
+}
+
 
 
 INSTANTIATE_LAYER_GPU_FUNCS(GenerateAugmentationParametersLayer);
diff --git a/src/caffe/layers/mean_layer.cpp b/src/caffe/layers/mean_layer.cpp
@@ -122,6 +122,13 @@ void MeanLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
     }
 }
 
+template <typename Dtype>
+void MeanLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top,
+	      const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)
+{
+	LOG(FATAL) << "MeanLayer cannot do backward.";
+	return;
+}
 
 INSTANTIATE_CLASS(MeanLayer);
 REGISTER_LAYER_CLASS(Mean);
diff --git a/src/caffe/layers/resample_layer.cpp b/src/caffe/layers/resample_layer.cpp
@@ -56,18 +56,22 @@ void ResampleLayer<Dtype>::Reshape(const vector<Blob<Dtype>*>& bottom,
 
 template <typename Dtype>
 void ResampleLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
-      const vector<Blob<Dtype>*>& top) {
-  
-  LOG(FATAL) << "ResampleLayer: CPU Forward not yet implemented.";
+      const vector<Blob<Dtype>*>& top)
+{
+	NOT_IMPLEMENTED;
 }
 
 template <typename Dtype>
 void ResampleLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top,
       const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom) {
-  
+
   LOG(FATAL) << "ResampleLayer cannot do backward.";
 }
 
+#ifdef CPU_ONLY
+STUB_GPU(ResampleLayer);
+#endif
+
 INSTANTIATE_CLASS(ResampleLayer);
 REGISTER_LAYER_CLASS(Resample);
 

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,13 @@ void BlackAugmentationLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bott`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
	`100`	`+template <typename Dtype>`
	`101`	`+void BlackAugmentationLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,`
	`102`	`+ const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom)`
	`103`	`+{`
	`104`	`+ LOG(FATAL) << "BlackAugmentation cannot do backward";`
	`105`	`+ return;`
	`106`	`+}`
`100`	`107`
`101`	`108`	`INSTANTIATE_LAYER_GPU_FUNCS(BlackAugmentationLayer);`
`102`	`109`