clear fluid (PaddlePaddle#10333)

truongnn1106 · Jul 10, 2023 · b0e3c3f · b0e3c3f
1 parent 722e9dc
commit b0e3c3f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/ppocr/optimizer/optimizer.py b/ppocr/optimizer/optimizer.py
@@ -84,8 +84,7 @@ def __call__(self, model):
  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(
  )

diff --git a/test_tipc/supplementary/data_loader.py b/test_tipc/supplementary/data_loader.py
@@ -1,7 +1,6 @@
 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

diff --git a/test_tipc/supplementary/train.py b/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)

diff --git a/tools/eval.py b/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)

diff --git a/tools/infer/utility.py b/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"