[Fluid] Change paddle.fluid.layers.utils to paddle.utils (#5121)

Author: zhengqiwen1997

paddlenlp/transformers/generation_utils.py

@@ -21,7 +21,11 @@
 import paddle.nn as nn
 import paddle.nn.functional as F
 from paddle.common_ops_import import convert_dtype
-from paddle.fluid.layers.utils import map_structure
+
+try:
+    from paddle.utils import map_structure
+except ImportError:
+    from paddle.fluid.layers.utils import map_structure
 
 from paddlenlp.utils.log import logger
 

paddlenlp/transformers/transformer/modeling.py

@@ -16,7 +16,11 @@
 import paddle
 import paddle.nn as nn
 import paddle.nn.functional as F
-from paddle.fluid.layers.utils import map_structure
+
+try:
+    from paddle.utils import map_structure
+except ImportError:
+    from paddle.fluid.layers.utils import map_structure
 from paddle.nn import (
     TransformerDecoder,
     TransformerDecoderLayer,

tests/test_tipc/transformer/modeling.py

@@ -16,7 +16,11 @@
 import paddle
 import paddle.nn as nn
 import paddle.nn.functional as F
-from paddle.fluid.layers.utils import map_structure
+
+try:
+    from paddle.utils import map_structure
+except ImportError:
+    from paddle.fluid.layers.utils import map_structure
 
 __all__ = [
     "position_encoding_init",

tests/transformer/modeling.py

@@ -16,7 +16,11 @@
 import paddle
 import paddle.nn as nn
 import paddle.nn.functional as F
-from paddle.fluid.layers.utils import map_structure
+
+try:
+    from paddle.utils import map_structure
+except ImportError:
+    from paddle.fluid.layers.utils import map_structure
 
 __all__ = [
     "position_encoding_init",