[FIX] adapt to paddle 2.4 & 2.5 (#3316)

Author: TingquanGao

contrib/CrossPseudoSupervision/batch_transforms/custom_collate.py

@@ -12,7 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle.fluid.dataloader.collate import default_collate_fn
+import paddle
+paddle_version = paddle.__version__[:3]
+# paddle version < 2.5.0 and not develop
+if paddle_version not in ["2.5", "0.0"]:
+    from paddle.fluid.dataloader.collate import default_collate_fn
+# paddle version >= 2.5.0 or develop
+else:
+    from paddle.io.dataloader.collate import default_collate_fn
 
 
 class SegCollate(object):

contrib/PanopticSeg/paddlepanseg/datasets/base_dataset.py

@@ -18,11 +18,19 @@
 
 import numpy as np
 import paddle
-from paddle.fluid.dataloader.collate import default_collate_fn
+
 from paddleseg.transforms import Compose
 
 from paddlepanseg.cvlibs import build_info_dict
 
+paddle_version = paddle.__version__[:3]
+# paddle version < 2.5.0 and not develop
+if paddle_version not in ["2.5", "0.0"]:
+    from paddle.fluid.dataloader.collate import default_collate_fn
+# paddle version >= 2.5.0 or develop
+else:
+    from paddle.io.dataloader.collate import default_collate_fn
+
 
 class PanopticDataset(paddle.io.Dataset):
     NO_COLLATION_KEYS = ('gt_fields', 'trans_info', 'image_id')