From 24ba5ee05ceb9cba02aebb885f8ae342eb3b70c6 Mon Sep 17 00:00:00 2001
From: Guanghua Yu <742925032@qq.com>
Date: Tue, 23 Feb 2021 15:22:13 +0800
Subject: [PATCH] merge develop conflict (#31122)

---
 paddle/fluid/operators/softmax_with_cross_entropy_op.cu | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/paddle/fluid/operators/softmax_with_cross_entropy_op.cu b/paddle/fluid/operators/softmax_with_cross_entropy_op.cu
index cb4eeab56a6..4e83e1ac734 100644
--- a/paddle/fluid/operators/softmax_with_cross_entropy_op.cu
+++ b/paddle/fluid/operators/softmax_with_cross_entropy_op.cu
@@ -268,6 +268,10 @@ struct HardLabelSoftmaxWithCrossEntropyFunctor {
     int64_t idx_remain = idx % remain;
     // labels, loss view as [n, remain]
     int64_t idx_lbl = idx_n * remain + idx_remain;
+    PADDLE_ENFORCE(labels_[idx_lbl] >= 0 && labels_[idx_lbl] < d_,
+                   "The value of label[%ld] expected >= 0 and < %ld,"
+                   "but got %ld. Please check input value.",
+                   idx_lbl, d_, labels_[idx_lbl]);
     // It also would ignore labels not in range(class_num).
     if (idx_axis != labels_[idx_lbl]) {
       log_softmax_[idx] = exp_on_device(log_softmax_[idx]);
-- 
GitLab