diff --git a/python/paddle/fluid/layer_helper.py b/python/paddle/fluid/layer_helper.py index 62933b512529bd04fab8c9ded12e636ecfae685c..86efd1ff51cf29485ee28b4d60ffb1439af1aad9 100644 --- a/python/paddle/fluid/layer_helper.py +++ b/python/paddle/fluid/layer_helper.py @@ -400,11 +400,11 @@ class LayerHelper(object): if isinstance(act, basestring): act = {'type': act} + if 'use_cudnn' in self.kwargs and self.kwargs.get('use_cudnn'): + act['use_cudnn'] = self.kwargs.get('use_cudnn') if 'use_mkldnn' in self.kwargs: act['use_mkldnn'] = self.kwargs.get('use_mkldnn') act_type = act.pop('type') - if 'use_mkldnn' in self.kwargs: - act['use_mkldnn'] = self.kwargs.get('use_mkldnn') tmp = input_var # NOTE(dzhwinter): some activation support inplace compution. if not core.IsInplace(act_type): diff --git a/python/paddle/fluid/layers/nn.py b/python/paddle/fluid/layers/nn.py index 93e8d0bf296d4846ad5f5924e70a6fbba823d82e..1786be22fdcd0d074b45bc94b3b0c4e8c41b4e8a 100644 --- a/python/paddle/fluid/layers/nn.py +++ b/python/paddle/fluid/layers/nn.py @@ -88,6 +88,7 @@ def fc(input, num_flatten_dims=1, param_attr=None, bias_attr=None, + use_cudnn=False, use_mkldnn=False, act=None, is_test=False,