Check label range in cross entropy calculation. (#10954)

qingqing01 · web-flow · commit 3ba75d4a696d · 2018-05-28T11:16:01.000+08:00
diff --git a/paddle/fluid/operators/math/cross_entropy.cc b/paddle/fluid/operators/math/cross_entropy.cc
@@ -46,7 +46,10 @@ class CrossEntropyFunctor<platform::CPUDeviceContext, T> {
 
       const int64_t* label_data = labels->data<int64_t>();
       for (int i = 0; i < batch_size; ++i) {
-        int index = i * class_num + label_data[i];
+        int lbl = label_data[i];
+        PADDLE_ENFORCE_GE(lbl, 0);
+        PADDLE_ENFORCE_LT(lbl, class_num);
+        int index = i * class_num + lbl;
         loss_data[i] = -math::TolerableValue<T>()(std::log(prob_data[index]));
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,10 @@ class CrossEntropyFunctor<platform::CPUDeviceContext, T> {`
`46`	`46`
`47`	`47`	`const int64_t* label_data = labels->data<int64_t>();`
`48`	`48`	`for (int i = 0; i < batch_size; ++i) {`
`49`		`- int index = i * class_num + label_data[i];`
	`49`	`+ int lbl = label_data[i];`
	`50`	`+ PADDLE_ENFORCE_GE(lbl, 0);`
	`51`	`+ PADDLE_ENFORCE_LT(lbl, class_num);`
	`52`	`+ int index = i * class_num + lbl;`
`50`	`53`	`loss_data[i] = -math::TolerableValue<T>()(std::log(prob_data[index]));`
`51`	`54`	`}`
`52`	`55`	`}`