diff options
| author | Sergio Guadarrama <sguada@gmail.com> | 2014-10-05 19:37:59 -0700 |
|---|---|---|
| committer | Sergio Guadarrama <sguada@gmail.com> | 2014-10-05 19:37:59 -0700 |
| commit | 8ffb7b5adce42778b7fdbae8ee3fa4fd224b11a0 (patch) | |
| tree | 5378d1f1f657499717e65f417747a91a2d07e03c | |
| parent | 0ba046bc3ec7362b49d239d9d0947c2598a75ef0 (diff) | |
| parent | 1d3bbe2e7bf896379aecf8faa3fcdd5cf5bad522 (diff) | |
| download | caffeonacl-8ffb7b5adce42778b7fdbae8ee3fa4fd224b11a0.tar.gz caffeonacl-8ffb7b5adce42778b7fdbae8ee3fa4fd224b11a0.tar.bz2 caffeonacl-8ffb7b5adce42778b7fdbae8ee3fa4fd224b11a0.zip | |
Merge pull request #1221 from sguada/fix_cuddn_pooling
Missing param.pad condition for CUDNN pooling
| -rw-r--r-- | src/caffe/layer_factory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/caffe/layer_factory.cpp b/src/caffe/layer_factory.cpp index 8815ddd0..69863543 100644 --- a/src/caffe/layer_factory.cpp +++ b/src/caffe/layer_factory.cpp @@ -47,7 +47,8 @@ Layer<Dtype>* GetPoolingLayer(const LayerParameter& param) { #ifdef USE_CUDNN } else if (engine == PoolingParameter_Engine_CUDNN) { PoolingParameter p_param = param.pooling_param(); - if (p_param.pad_h() || p_param.pad_w() || param.top_size() > 1) { + if (p_param.pad() || p_param.pad_h() || p_param.pad_w() || + param.top_size() > 1) { LOG(INFO) << "CUDNN does not support padding or multiple tops. " << "Using Caffe's own pooling layer."; return new PoolingLayer<Dtype>(param); |