fix instantiation

35 files changed, 46 insertions, 35 deletions

diff --git a/src/caffe/layers/absval_layer.cu b/src/caffe/layers/absval_layer.cu
index 48c76646..732d4c62 100644
--- a/src/caffe/layers/absval_layer.cu
+++ b/src/caffe/layers/absval_layer.cu
@@ -28,7 +28,7 @@ void AbsValLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(AbsValLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(AbsValLayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/base_data_layer.cu b/src/caffe/layers/base_data_layer.cu
index ff151036..204a16d2 100644
--- a/src/caffe/layers/base_data_layer.cu
+++ b/src/caffe/layers/base_data_layer.cu
@@ -20,6 +20,6 @@ void BasePrefetchingDataLayer<Dtype>::Forward_gpu(
   CreatePrefetchThread();
 }
 
-INSTANTIATE_CLASS(BasePrefetchingDataLayer);
+INSTANTIATE_LAYER_GPU_FORWARD(BasePrefetchingDataLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/bnll_layer.cu b/src/caffe/layers/bnll_layer.cu
index 3993bccd..d963d068 100644
--- a/src/caffe/layers/bnll_layer.cu
+++ b/src/caffe/layers/bnll_layer.cu
@@ -54,7 +54,7 @@ void BNLLLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(BNLLLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(BNLLLayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/concat_layer.cu b/src/caffe/layers/concat_layer.cu
index 1b4e40aa..88fc0900 100644
--- a/src/caffe/layers/concat_layer.cu
+++ b/src/caffe/layers/concat_layer.cu
@@ -71,6 +71,6 @@ void ConcatLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(ConcatLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(ConcatLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/contrastive_loss_layer.cu b/src/caffe/layers/contrastive_loss_layer.cu
index 14b55b37..78a55995 100644
--- a/src/caffe/layers/contrastive_loss_layer.cu
+++ b/src/caffe/layers/contrastive_loss_layer.cu
@@ -86,6 +86,6 @@ void ContrastiveLossLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(ContrastiveLossLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(ContrastiveLossLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/conv_layer.cu b/src/caffe/layers/conv_layer.cu
index 27d6500d..af14facb 100644
--- a/src/caffe/layers/conv_layer.cu
+++ b/src/caffe/layers/conv_layer.cu
@@ -137,6 +137,6 @@ void ConvolutionLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
 }
 
 
-INSTANTIATE_CLASS(ConvolutionLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(ConvolutionLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/cudnn_conv_layer.cu b/src/caffe/layers/cudnn_conv_layer.cu
index cf8607e1..071014e1 100644
--- a/src/caffe/layers/cudnn_conv_layer.cu
+++ b/src/caffe/layers/cudnn_conv_layer.cu
@@ -106,7 +106,7 @@ void CuDNNConvolutionLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(CuDNNConvolutionLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(CuDNNConvolutionLayer);
 
 }  // namespace caffe
 #endif
diff --git a/src/caffe/layers/cudnn_pooling_layer.cu b/src/caffe/layers/cudnn_pooling_layer.cu
index 8b9e7f1b..1c113aad 100644
--- a/src/caffe/layers/cudnn_pooling_layer.cu
+++ b/src/caffe/layers/cudnn_pooling_layer.cu
@@ -33,7 +33,7 @@ void CuDNNPoolingLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
       bottom_desc_, bottom_data, bottom_desc_, bottom_diff));
 }
 
-INSTANTIATE_CLASS(CuDNNPoolingLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(CuDNNPoolingLayer);
 
 }  // namespace caffe
 #endif
diff --git a/src/caffe/layers/cudnn_relu_layer.cu b/src/caffe/layers/cudnn_relu_layer.cu
index e3900f37..86250870 100644
--- a/src/caffe/layers/cudnn_relu_layer.cu
+++ b/src/caffe/layers/cudnn_relu_layer.cu
@@ -45,7 +45,7 @@ void CuDNNReLULayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
       this->bottom_desc_, bottom_data, this->bottom_desc_, bottom_diff));
 }
 
-INSTANTIATE_CLASS(CuDNNReLULayer);
+INSTANTIATE_LAYER_GPU_FUNCS(CuDNNReLULayer);
 
 }  // namespace caffe
 #endif
diff --git a/src/caffe/layers/cudnn_sigmoid_layer.cu b/src/caffe/layers/cudnn_sigmoid_layer.cu
index 50bf5fcb..31b094e2 100644
--- a/src/caffe/layers/cudnn_sigmoid_layer.cu
+++ b/src/caffe/layers/cudnn_sigmoid_layer.cu
@@ -35,7 +35,7 @@ void CuDNNSigmoidLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
       this->bottom_desc_, bottom_data, this->bottom_desc_, bottom_diff));
 }
 
-INSTANTIATE_CLASS(CuDNNSigmoidLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(CuDNNSigmoidLayer);
 
 }  // namespace caffe
 #endif
diff --git a/src/caffe/layers/cudnn_softmax_layer.cu b/src/caffe/layers/cudnn_softmax_layer.cu
index aef66730..f328afdd 100644
--- a/src/caffe/layers/cudnn_softmax_layer.cu
+++ b/src/caffe/layers/cudnn_softmax_layer.cu
@@ -35,7 +35,7 @@ void CuDNNSoftmaxLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(CuDNNSoftmaxLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(CuDNNSoftmaxLayer);
 
 }  // namespace caffe
 #endif
diff --git a/src/caffe/layers/cudnn_tanh_layer.cu b/src/caffe/layers/cudnn_tanh_layer.cu
index 20f887de..bf9ec7cf 100644
--- a/src/caffe/layers/cudnn_tanh_layer.cu
+++ b/src/caffe/layers/cudnn_tanh_layer.cu
@@ -35,7 +35,7 @@ void CuDNNTanHLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
       this->bottom_desc_, bottom_data, this->bottom_desc_, bottom_diff));
 }
 
-INSTANTIATE_CLASS(CuDNNTanHLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(CuDNNTanHLayer);
 
 }  // namespace caffe
 #endif
diff --git a/src/caffe/layers/dropout_layer.cu b/src/caffe/layers/dropout_layer.cu
index fa737b86..df13d8ec 100644
--- a/src/caffe/layers/dropout_layer.cu
+++ b/src/caffe/layers/dropout_layer.cu
@@ -71,7 +71,7 @@ void DropoutLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(DropoutLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(DropoutLayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/eltwise_layer.cu b/src/caffe/layers/eltwise_layer.cu
index 9295cc6a..2247870d 100644
--- a/src/caffe/layers/eltwise_layer.cu
+++ b/src/caffe/layers/eltwise_layer.cu
@@ -130,6 +130,6 @@ void EltwiseLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(EltwiseLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(EltwiseLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/euclidean_loss_layer.cu b/src/caffe/layers/euclidean_loss_layer.cu
index 0f0c1a86..5b1de3ad 100644
--- a/src/caffe/layers/euclidean_loss_layer.cu
+++ b/src/caffe/layers/euclidean_loss_layer.cu
@@ -39,6 +39,6 @@ void EuclideanLossLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(EuclideanLossLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(EuclideanLossLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/exp_layer.cu b/src/caffe/layers/exp_layer.cu
index a0fd672a..2d75d8dd 100644
--- a/src/caffe/layers/exp_layer.cu
+++ b/src/caffe/layers/exp_layer.cu
@@ -38,7 +38,7 @@ void ExpLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(ExpLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(ExpLayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/flatten_layer.cu b/src/caffe/layers/flatten_layer.cu
index ef89bab6..42abdad4 100644
--- a/src/caffe/layers/flatten_layer.cu
+++ b/src/caffe/layers/flatten_layer.cu
@@ -18,6 +18,6 @@ void FlattenLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   bottom[0]->ShareDiff(*top[0]);
 }
 
-INSTANTIATE_CLASS(FlattenLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(FlattenLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/hdf5_data_layer.cu b/src/caffe/layers/hdf5_data_layer.cu
index 9f5daf23..02e3821d 100644
--- a/src/caffe/layers/hdf5_data_layer.cu
+++ b/src/caffe/layers/hdf5_data_layer.cu
@@ -41,6 +41,6 @@ void HDF5DataLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom,
   }
 }
 
-INSTANTIATE_CLASS(HDF5DataLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(HDF5DataLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/hdf5_output_layer.cu b/src/caffe/layers/hdf5_output_layer.cu
index 929c1ad8..ae497c34 100644
--- a/src/caffe/layers/hdf5_output_layer.cu
+++ b/src/caffe/layers/hdf5_output_layer.cu
@@ -38,6 +38,6 @@ void HDF5OutputLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   return;
 }
 
-INSTANTIATE_CLASS(HDF5OutputLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(HDF5OutputLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/im2col_layer.cu b/src/caffe/layers/im2col_layer.cu
index bad789c1..9c338b14 100644
--- a/src/caffe/layers/im2col_layer.cu
+++ b/src/caffe/layers/im2col_layer.cu
@@ -32,6 +32,6 @@ void Im2colLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
 }
 
 
-INSTANTIATE_CLASS(Im2colLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(Im2colLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/inner_product_layer.cu b/src/caffe/layers/inner_product_layer.cu
index 2164b4d4..a9e1784a 100644
--- a/src/caffe/layers/inner_product_layer.cu
+++ b/src/caffe/layers/inner_product_layer.cu
@@ -51,6 +51,6 @@ void InnerProductLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(InnerProductLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(InnerProductLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/lrn_layer.cu b/src/caffe/layers/lrn_layer.cu
index 47b003bc..58c39926 100644
--- a/src/caffe/layers/lrn_layer.cu
+++ b/src/caffe/layers/lrn_layer.cu
@@ -98,6 +98,10 @@ void LRNLayer<Dtype>::CrossChannelForward_gpu(
       n_threads, bottom_data, scale_data, -beta_, top_data);
   CUDA_POST_KERNEL_CHECK;
 }
+template void LRNLayer<float>::CrossChannelForward_gpu(
+    const vector<Blob<float>*>& bottom, const vector<Blob<float>*>& top);
+template void LRNLayer<double>::CrossChannelForward_gpu(
+    const vector<Blob<double>*>& bottom, const vector<Blob<double>*>& top);
 
 
 template <typename Dtype>
@@ -188,8 +192,15 @@ void LRNLayer<Dtype>::CrossChannelBackward_gpu(
       size_, -beta_, Dtype(2. * alpha_ * beta_ / size_),
       bottom[0]->mutable_gpu_diff());
 }
+template void LRNLayer<float>::CrossChannelBackward_gpu(
+    const vector<Blob<float>*>& top, const vector<bool>& propagate_down,
+    const vector<Blob<float>*>& bottom);
+template void LRNLayer<double>::CrossChannelBackward_gpu(
+    const vector<Blob<double>*>& top, const vector<bool>& propagate_down,
+    const vector<Blob<double>*>& bottom);
 
 
-INSTANTIATE_CLASS(LRNLayer);
+
+INSTANTIATE_LAYER_GPU_FUNCS(LRNLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/mvn_layer.cu b/src/caffe/layers/mvn_layer.cu
index c2a241f0..0667f503 100644
--- a/src/caffe/layers/mvn_layer.cu
+++ b/src/caffe/layers/mvn_layer.cu
@@ -139,7 +139,7 @@ void MVNLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
 }
 
 
-INSTANTIATE_CLASS(MVNLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(MVNLayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/pooling_layer.cu b/src/caffe/layers/pooling_layer.cu
index aec985a7..0d3f2183 100644
--- a/src/caffe/layers/pooling_layer.cu
+++ b/src/caffe/layers/pooling_layer.cu
@@ -373,7 +373,7 @@ void PoolingLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
 }
 
 
-INSTANTIATE_CLASS(PoolingLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(PoolingLayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/power_layer.cu b/src/caffe/layers/power_layer.cu
index 367320a9..90d94405 100644
--- a/src/caffe/layers/power_layer.cu
+++ b/src/caffe/layers/power_layer.cu
@@ -81,7 +81,7 @@ void PowerLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(PowerLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(PowerLayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/relu_layer.cu b/src/caffe/layers/relu_layer.cu
index 22d5f4b5..b8924c85 100644
--- a/src/caffe/layers/relu_layer.cu
+++ b/src/caffe/layers/relu_layer.cu
@@ -59,7 +59,7 @@ void ReLULayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
 }
 
 
-INSTANTIATE_CLASS(ReLULayer);
+INSTANTIATE_LAYER_GPU_FUNCS(ReLULayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu
index 175f6f86..d9db4af6 100644
--- a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu
+++ b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu
@@ -51,7 +51,7 @@ void SigmoidCrossEntropyLossLayer<Dtype>::Backward_gpu(
   }
 }
 
-INSTANTIATE_CLASS(SigmoidCrossEntropyLossLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(SigmoidCrossEntropyLossLayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/sigmoid_layer.cu b/src/caffe/layers/sigmoid_layer.cu
index 6879ff7f..e1af0657 100644
--- a/src/caffe/layers/sigmoid_layer.cu
+++ b/src/caffe/layers/sigmoid_layer.cu
@@ -56,7 +56,7 @@ void SigmoidLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(SigmoidLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(SigmoidLayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/silence_layer.cu b/src/caffe/layers/silence_layer.cu
index b350b195..8d044ee7 100644
--- a/src/caffe/layers/silence_layer.cu
+++ b/src/caffe/layers/silence_layer.cu
@@ -23,6 +23,6 @@ void SilenceLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(SilenceLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(SilenceLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/slice_layer.cu b/src/caffe/layers/slice_layer.cu
index 65784080..b5c5e615 100644
--- a/src/caffe/layers/slice_layer.cu
+++ b/src/caffe/layers/slice_layer.cu
@@ -63,6 +63,6 @@ void SliceLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }  // slice_dim_ is guaranteed to be 0 or 1 by SetUp.
 }
 
-INSTANTIATE_CLASS(SliceLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(SliceLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/softmax_layer.cu b/src/caffe/layers/softmax_layer.cu
index 8ba31d75..292ad2b3 100644
--- a/src/caffe/layers/softmax_layer.cu
+++ b/src/caffe/layers/softmax_layer.cu
@@ -148,7 +148,7 @@ void SoftmaxLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   caffe_gpu_mul<Dtype>(top[0]->count(), bottom_diff, top_data, bottom_diff);
 }
 
-INSTANTIATE_CLASS(SoftmaxLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(SoftmaxLayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/softmax_loss_layer.cu b/src/caffe/layers/softmax_loss_layer.cu
index 060dc24d..4cdaf51b 100644
--- a/src/caffe/layers/softmax_loss_layer.cu
+++ b/src/caffe/layers/softmax_loss_layer.cu
@@ -21,7 +21,7 @@ void SoftmaxWithLossLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   Backward_cpu(top, propagate_down, bottom);
 }
 
-INSTANTIATE_CLASS(SoftmaxWithLossLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(SoftmaxWithLossLayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/split_layer.cu b/src/caffe/layers/split_layer.cu
index 0513b204..a4f5df26 100644
--- a/src/caffe/layers/split_layer.cu
+++ b/src/caffe/layers/split_layer.cu
@@ -33,6 +33,6 @@ void SplitLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
 }
 
 
-INSTANTIATE_CLASS(SplitLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(SplitLayer);
 
 }  // namespace caffe
diff --git a/src/caffe/layers/tanh_layer.cu b/src/caffe/layers/tanh_layer.cu
index a141f8e8..f1a0fc88 100644
--- a/src/caffe/layers/tanh_layer.cu
+++ b/src/caffe/layers/tanh_layer.cu
@@ -54,7 +54,7 @@ void TanHLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
   }
 }
 
-INSTANTIATE_CLASS(TanHLayer);
+INSTANTIATE_LAYER_GPU_FUNCS(TanHLayer);
 
 
 }  // namespace caffe
diff --git a/src/caffe/layers/threshold_layer.cu b/src/caffe/layers/threshold_layer.cu
index 7e651290..bfa7f159 100644
--- a/src/caffe/layers/threshold_layer.cu
+++ b/src/caffe/layers/threshold_layer.cu
@@ -27,7 +27,7 @@ void ThresholdLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom,
 }
 
 
-INSTANTIATE_CLASS(ThresholdLayer);
+INSTANTIATE_LAYER_GPU_FORWARD(ThresholdLayer);
 
 
 }  // namespace caffe