fixed compilation error on gcc 4.8.x due to the usage of isfinite (#30733)

revert-31068-fix_conv3d_windows
alncat 4 years ago committed by GitHub
parent 78d37c3f75
commit 5b59499e57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -96,10 +96,12 @@ void recompute_bias_and_weights(const Scope* scope,
variance_array = variance_array.sqrt(); variance_array = variance_array.sqrt();
variance_array = scale_array / variance_array; variance_array = scale_array / variance_array;
for (int i = 0; i < variance_tensor->numel(); i++) { for (int i = 0; i < variance_tensor->numel(); i++) {
PADDLE_ENFORCE_EQ( PADDLE_ENFORCE_EQ(std::isfinite(variance_array[i]), true,
isfinite(variance_array[i]), true, platform::errors::InvalidArgument(
platform::errors::InvalidArgument("fuse batch norm variance should be " "The inverse of Fused batch norm variance "
"finite. Found nonfinite values!")); "should be finite. Found nonfinite values! "
"Please check %s ",
bn_variance.Name()));
} }
EigenVectorArrayMap eltwise_y_in_array( EigenVectorArrayMap eltwise_y_in_array(
eltwise_y_in_tensor->mutable_data<float>(platform::CPUPlace()), eltwise_y_in_tensor->mutable_data<float>(platform::CPUPlace()),
@ -108,10 +110,12 @@ void recompute_bias_and_weights(const Scope* scope,
eltwise_y_in_array = eltwise_y_in_array =
((eltwise_y_in_array - mean_array) * variance_array) + bn_bias_array; ((eltwise_y_in_array - mean_array) * variance_array) + bn_bias_array;
for (int i = 0; i < eltwise_y_in_tensor->numel(); i++) { for (int i = 0; i < eltwise_y_in_tensor->numel(); i++) {
PADDLE_ENFORCE_EQ( PADDLE_ENFORCE_EQ(std::isfinite(eltwise_y_in_array[i]), true,
isfinite(eltwise_y_in_array[i]), true, platform::errors::InvalidArgument(
platform::errors::InvalidArgument("fused batch norm bias should be " "Fused batch norm bias should be "
"finite. Found nonfinite values!")); "finite. Found nonfinite values! "
"Please check %s and related variables.",
bn_variance.Name()));
} }
// Re-compute weight of conv2d from BN // Re-compute weight of conv2d from BN

Loading…
Cancel
Save