From e876f307ed96c7b05064467260af6323c45df9c1 Mon Sep 17 00:00:00 2001 From: Kexin Zhao Date: Thu, 3 May 2018 16:22:47 -0700 Subject: [PATCH] initial commit --- python/paddle/fluid/layer_helper.py | 4 ++-- python/paddle/fluid/layers/nn.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/python/paddle/fluid/layer_helper.py b/python/paddle/fluid/layer_helper.py index 62933b512529b..86efd1ff51cf2 100644 --- a/python/paddle/fluid/layer_helper.py +++ b/python/paddle/fluid/layer_helper.py @@ -400,11 +400,11 @@ def append_activation(self, input_var): 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 93e8d0bf296d4..1786be22fdcd0 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,