Merge branch 'PaddlePaddle:release/2.3' into release/2.3

ppcls/arch/backbone/model_zoo/rexnet.py

@@ -30,7 +30,7 @@ MODEL_URLS = {
     "ReXNet_1_3":
     "https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/ReXNet_1_3_pretrained.pdparams",
     "ReXNet_1_5":
-    "https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/ReXNet_1_5_32x4d_pretrained.pdparams",
+    "https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/ReXNet_1_5_pretrained.pdparams",
     "ReXNet_2_0":
     "https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/ReXNet_2_0_pretrained.pdparams",
     "ReXNet_3_0":

ppcls/engine/evaluation/classification.py

@@ -91,7 +91,7 @@ def classification_eval(engine, epoch_id=0):
                     paddle.distributed.all_gather(pred_list, out)
                     pred = paddle.concat(pred_list, 0)
 
-                if accum_samples > total_samples:
+                if accum_samples > total_samples and not engine.use_dali:
                     pred = pred[:total_samples + current_samples -
                                 accum_samples]
                     labels = labels[:total_samples + current_samples -