Paddle2.5 (#10410)

* update paddlenlp version for paddle2.5

* clear fluid

ppocr/optimizer/optimizer.py

@@ -84,8 +84,7 @@ class Adam(object):
         if self.group_lr:
             if self.training_step == 'LF_2':
                 import paddle
-                if isinstance(model, paddle.fluid.dygraph.parallel.
-                              DataParallel):  # multi gpu
+                if isinstance(model, paddle.DataParallel):  # multi gpu
                     mlm = model._layers.head.MLM_VRM.MLM.parameters()
                     pre_mlm_pp = model._layers.head.MLM_VRM.Prediction.pp_share.parameters(
                     )

ppstructure/kie/requirements.txt

@@ -4,4 +4,4 @@ seqeval
 pypandoc
 attrdict3
 python_docx
-paddlenlp>=2.4.1
+paddlenlp>=2.5.2
\ No newline at end of file

test_tipc/supplementary/data_loader.py

 import numpy as np
 from paddle.vision.datasets import Cifar100
 from paddle.vision.transforms import Normalize
-from paddle.fluid.dataloader.collate import default_collate_fn
 import signal
 import os
 from paddle.io import Dataset, DataLoader, DistributedBatchSampler

test_tipc/supplementary/train.py

@@ -71,7 +71,7 @@ def amp_scaler(config):
             'FLAGS_cudnn_batchnorm_spatial_persistent': 1,
             'FLAGS_max_inplace_grad_add': 8,
         }
-        paddle.fluid.set_flags(AMP_RELATED_FLAGS_SETTING)
+        paddle.set_flags(AMP_RELATED_FLAGS_SETTING)
         scale_loss = config["AMP"].get("scale_loss", 1.0)
         use_dynamic_loss_scaling = config["AMP"].get("use_dynamic_loss_scaling",
                                                      False)

tools/eval.py

@@ -112,7 +112,7 @@ def main():
             'FLAGS_cudnn_batchnorm_spatial_persistent': 1,
             'FLAGS_max_inplace_grad_add': 8,
         }
-        paddle.fluid.set_flags(AMP_RELATED_FLAGS_SETTING)
+        paddle.set_flags(AMP_RELATED_FLAGS_SETTING)
         scale_loss = config["Global"].get("scale_loss", 1.0)
         use_dynamic_loss_scaling = config["Global"].get(
             "use_dynamic_loss_scaling", False)

tools/infer/utility.py

@@ -313,7 +313,7 @@ def get_infer_gpuid():
     if sysstr == "Windows":
         return 0
 
-    if not paddle.fluid.core.is_compiled_with_rocm():
+    if not paddle.device.is_compiled_with_rocm:
         cmd = "env | grep CUDA_VISIBLE_DEVICES"
     else:
         cmd = "env | grep HIP_VISIBLE_DEVICES"