Merge pull request #13132 from jacquesqiao/cherry-pick-pserver-merge-selected-rows

Cherry pick pserver merge selected rows

python/paddle/fluid/tests/unittests/test_dist_transpiler.py

@@ -440,7 +440,7 @@ class TestLocalLookupTable(TestDistLookupTableBase):
         # 2 optimize for table adam
         # NOTE: if param is not selected rows, the grad will scaled to grad / trainer_num
         self.assertEqual([op.type for op in pserver1.blocks[2].ops],
-                         ["sum", "adam", "scale", "scale"])
+                         ["sum", "scale", "adam", "scale", "scale"])
 
         trainer, _ = self.get_trainer()
         self.assertEqual(len(trainer.blocks), 1)

python/paddle/fluid/transpiler/distribute_transpiler.py

@@ -1287,8 +1287,6 @@ class DistributeTranspiler(object):
                 inputs={"X": vars2merge},
                 outputs={"Out": merged_var},
                 attrs={"use_mkldnn": False})
-            # TODO(panyx0718): What if it's SELECTED_ROWS.
-            if not merged_var.type == core.VarDesc.VarType.SELECTED_ROWS:
             optimize_block.append_op(
                 type="scale",
                 inputs={"X": merged_var},