Merged
fix(bce_with_logits_bwd): 空 self 不再跳过 shape 校验 #13156
sunhao_hwAdd on 22 days ago
fix(bce_with_logits_bwd): 空 self 不再跳过 shape 校验 #13156
Merged
Total: 4 files changed+38-6
Mloss/sigmoid_cross_entropy_with_logits_grad_v2/docs/aclnnBinaryCrossEntropyWithLogitsBackward.md+1-1
| @@ -93,7 +93,7 @@ aclnnStatus aclnnBinaryCrossEntropyWithLogitsBackward( | |||
| 93 | <td>-</td> | 93 | <td>-</td> |
| 94 | <td>FLOAT16、FLOAT、BFLOAT16</td> | 94 | <td>FLOAT16、FLOAT、BFLOAT16</td> |
| 95 | <td>ND</td> | 95 | <td>ND</td> |
| 96 | - <td>1-8</td> | 96 | + <td>0-8</td> |
| 97 | <td>√</td> | 97 | <td>√</td> |
| 98 | </tr> | 98 | </tr> |
| 99 | <tr> | 99 | <tr> |
Mloss/sigmoid_cross_entropy_with_logits_grad_v2/docs/aclnnBinaryCrossEntropyWithLogitsBackward_en.md+1-1
| @@ -95,7 +95,7 @@ aclnnStatus aclnnBinaryCrossEntropyWithLogitsBackward( | |||
| 95 | <td>-</td> | 95 | <td>-</td> |
| 96 | <td>FLOAT16, FLOAT, BFLOAT16</td> | 96 | <td>FLOAT16, FLOAT, BFLOAT16</td> |
| 97 | <td>ND</td> | 97 | <td>ND</td> |
| 98 | - <td>1-8</td> | 98 | + <td>0-8</td> |
| 99 | <td>√</td> | 99 | <td>√</td> |
| 100 | </tr> | 100 | </tr> |
| 101 | <tr> | 101 | <tr> |
| @@ -175,10 +175,7 @@ static bool CheckFormat(const aclTensor* self, const aclTensor* target, const ac | |||
| 175 | static bool CheckShape(const aclTensor* gradOutput, const aclTensor* self, const aclTensor* target, | 175 | static bool CheckShape(const aclTensor* gradOutput, const aclTensor* self, const aclTensor* target, |
| 176 | const aclTensor* weightOptional, const aclTensor* posWeightOptional, const aclTensor* out) | 176 | const aclTensor* weightOptional, const aclTensor* posWeightOptional, const aclTensor* out) |
| 177 | { | 177 | { |
| 178 | - if (self->IsEmpty()) { | 178 | + // 0 尺寸维度仍参与 shape / broadcast 比较,空 self 不能跳过校验。 |
| 179 | - return true; | ||
| 180 | - } | ||
| 181 | - | ||
| 182 | // target与self, out的shape必须一致 | 179 | // target与self, out的shape必须一致 |
| 183 | OP_CHECK_SHAPE_NOT_EQUAL(self, target, return false); | 180 | OP_CHECK_SHAPE_NOT_EQUAL(self, target, return false); |
| 184 | OP_CHECK_SHAPE_NOT_EQUAL(self, out, return false); | 181 | OP_CHECK_SHAPE_NOT_EQUAL(self, out, return false); |
| @@ -244,6 +244,41 @@ TEST_F(l2_binary_cross_entropy_with_logits_backward_test, case_empty) | |||
| 244 | ut.TestPrecision(); | 244 | ut.TestPrecision(); |
| 245 | } | 245 | } |
| 246 | 246 | ||
| 247 | +TEST_F(l2_binary_cross_entropy_with_logits_backward_test, case_empty_shape_invalid) | ||
| 248 | +{ | ||
| 249 | + int64_t reduction = None; | ||
| 250 | + uint64_t workspace_size = 0; | ||
| 251 | + | ||
| 252 | + auto gradOutput = TensorDesc({0, 4}, ACL_FLOAT, ACL_FORMAT_ND).ValueRange(0, 1); | ||
| 253 | + auto input = TensorDesc({0, 4}, ACL_FLOAT, ACL_FORMAT_ND).ValueRange(0, 1); | ||
| 254 | + auto target = TensorDesc({0, 4}, ACL_FLOAT, ACL_FORMAT_ND); | ||
| 255 | + auto output = TensorDesc({2, 4}, ACL_FLOAT, ACL_FORMAT_ND); | ||
| 256 | + auto ut = OP_API_UT(aclnnBinaryCrossEntropyWithLogitsBackward, | ||
| 257 | + INPUT(gradOutput, input, target, (aclTensor*)nullptr, (aclTensor*)nullptr, reduction), | ||
| 258 | + OUTPUT(output)); | ||
| 259 | + aclnnStatus aclRet = ut.TestGetWorkspaceSize(&workspace_size); | ||
| 260 | + EXPECT_EQ(aclRet, ACLNN_ERR_PARAM_INVALID); | ||
| 261 | + | ||
| 262 | + auto targetMismatch = TensorDesc({2, 4}, ACL_FLOAT, ACL_FORMAT_ND); | ||
| 263 | + auto outputEmpty = TensorDesc({0, 4}, ACL_FLOAT, ACL_FORMAT_ND); | ||
| 264 | + auto utTarget = OP_API_UT( | ||
| 265 | + aclnnBinaryCrossEntropyWithLogitsBackward, | ||
| 266 | + INPUT(gradOutput, input, targetMismatch, (aclTensor*)nullptr, (aclTensor*)nullptr, reduction), | ||
| 267 | + OUTPUT(outputEmpty)); | ||
| 268 | + workspace_size = 0; | ||
| 269 | + aclRet = utTarget.TestGetWorkspaceSize(&workspace_size); | ||
| 270 | + EXPECT_EQ(aclRet, ACLNN_ERR_PARAM_INVALID); | ||
| 271 | + | ||
| 272 | + auto gradOutputMismatch = TensorDesc({5}, ACL_FLOAT, ACL_FORMAT_ND).ValueRange(0, 1); | ||
| 273 | + auto utGrad = OP_API_UT( | ||
| 274 | + aclnnBinaryCrossEntropyWithLogitsBackward, | ||
| 275 | + INPUT(gradOutputMismatch, input, target, (aclTensor*)nullptr, (aclTensor*)nullptr, reduction), | ||
| 276 | + OUTPUT(outputEmpty)); | ||
| 277 | + workspace_size = 0; | ||
| 278 | + aclRet = utGrad.TestGetWorkspaceSize(&workspace_size); | ||
| 279 | + EXPECT_EQ(aclRet, ACLNN_ERR_PARAM_INVALID); | ||
| 280 | +} | ||
| 281 | + | ||
| 247 | TEST_F(l2_binary_cross_entropy_with_logits_backward_test, case_dtype_promotion) | 282 | TEST_F(l2_binary_cross_entropy_with_logits_backward_test, case_dtype_promotion) |
| 248 | { | 283 | { |
| 249 | vector<float> target_value; | 284 | vector<float> target_value; |
修改了shape是0维的以后,资料修改一下,1-8维改为0-8维