merge 809 into release/2.1.1 (#851)

Co-authored-by: Nwhs <wanghaoshuang@baidu.com>

paddleslim/dygraph/prune/pruning_plan.py

@@ -131,7 +131,8 @@ class PruningPlan():
             backup_name = var_tmp.name.replace(".", "_") + "_backup"
             if backup_name not in sub_layer._buffers:
                 sub_layer.register_buffer(
-                    backup_name, paddle.to_tensor(var_tmp.value().get_tensor()))
+                    backup_name,
+                    paddle.to_tensor(np.array(var_tmp.value().get_tensor())))
                 _logger.debug("Backup values of {} into buffers.".format(
                     var_tmp.name))
 

tests/test_soft_label_loss.py

@@ -55,9 +55,8 @@ class TestSoftLabelLoss(StaticCase):
             for op in block.ops:
                 loss_ops.append(op.type)
         self.assertTrue(set(merged_ops).difference(set(loss_ops)) == set())
-        self.assertTrue(
-            set(loss_ops).difference(set(merged_ops)) ==
-            {'cross_entropy', 'softmax', 'reduce_mean', 'scale'})
+        self.assertTrue({'cross_entropy', 'softmax', 'reduce_mean'}.issubset(
+            set(loss_ops).difference(set(merged_ops))))
 
 
 if __name__ == '__main__':