From 065ffcce6fbb63fe90581f8d27781f4eb10ab786 Mon Sep 17 00:00:00 2001
From: gongweibao <weibao.gong@gmail.com>
Date: Sun, 7 Apr 2019 15:31:50 +0800
Subject: [PATCH] fix dgcclipnorm bug test=develop (#16629)

---
 paddle/fluid/operators/dgc_clip_by_norm_op.h | 27 +++++++++++---------
 python/paddle/fluid/optimizer.py             |  4 +--
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/paddle/fluid/operators/dgc_clip_by_norm_op.h b/paddle/fluid/operators/dgc_clip_by_norm_op.h
index bd22d16f7a2..197bf59b2a4 100644
--- a/paddle/fluid/operators/dgc_clip_by_norm_op.h
+++ b/paddle/fluid/operators/dgc_clip_by_norm_op.h
@@ -24,18 +24,21 @@ class DGCClipByNormKernel : public ClipByNormKernel<DeviceContext, T> {
  public:
   void Compute(const framework::ExecutionContext& context) const override {
     auto rampup_begin_step = context.Attr<float>("rampup_begin_step");
-    if (static_cast<int>(rampup_begin_step) >= 0) {
-      auto current_step_tensor =
-          context.Input<framework::Tensor>("current_step");
-      auto* current_step = current_step_tensor->data<T>();
-
-      if (static_cast<int>(*current_step) <
-          static_cast<int>(rampup_begin_step)) {
-        VLOG(10) << "current_step:" << *current_step
-                 << " < rampup_begin_step:" << rampup_begin_step
-                 << " so does't use dgc_clip_by_norm";
-        return;
-      }
+    if (static_cast<int>(rampup_begin_step) < 0) {
+      return;
+    }
+
+    auto current_step_tensor = context.Input<framework::Tensor>("current_step");
+    auto* current_step = current_step_tensor->data<T>();
+
+    VLOG(10) << "current_step:" << *current_step
+             << ", rampup_begin_step:" << rampup_begin_step;
+
+    if (static_cast<int>(*current_step) < static_cast<int>(rampup_begin_step)) {
+      VLOG(10) << "current_step:" << *current_step
+               << " < rampup_begin_step:" << rampup_begin_step
+               << " so does't use dgc_clip_by_norm";
+      return;
     }
 
     return ClipByNormKernel<DeviceContext, T>::Compute(context);
diff --git a/python/paddle/fluid/optimizer.py b/python/paddle/fluid/optimizer.py
index 79accabe878..7e6e37116fe 100644
--- a/python/paddle/fluid/optimizer.py
+++ b/python/paddle/fluid/optimizer.py
@@ -832,7 +832,7 @@ class DGCMomentumOptimizer(MomentumOptimizer):
             type=x.type, name=name, dtype=x.dtype, persistable=False)
 
         helper.append_op(
-            type="clip_by_norm",
+            type="dgc_clip_by_norm",
             inputs={"X": x,
                     "current_step": self._global_step_var},
             attrs={
@@ -845,7 +845,7 @@ class DGCMomentumOptimizer(MomentumOptimizer):
     def _append_clip_norm(self, grad_var, clip_norm):
         with grad_var.block.program._backward_role_guard():
             return self._clip_by_norm(
-                x=grad_var, max_norm=clip_norm, name=grad_var.name + "@DGC")
+                x=grad_var, max_norm=clip_norm, name=grad_var.name)
 
     def _dgc_op(self, param_var, clip_var, grad_var, u_var, v_var, k_var,
                 encoded_var):
-- 
GitLab