experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix conv_ops_test and remapper_test

Browse Source
This commit is contained in:
Guozhong Zhuang 2020-05-14 08:28:07 -07:00
parent a04c8be3e7
commit 5d92849778
2 changed files with 26 additions and 0 deletions
tensorflow/core
grappler/optimizers
remapper_test.cc
kernels
conv_ops_test.cc

3
tensorflow/core/grappler/optimizers/remapper_test.cc
View File

@ -607,6 +607,7 @@ TEST_F(RemapperTest, FuseMatMulWithBiasAndActivation) {
}
}
#ifndef INTEL_MKL
TEST_F(RemapperTest, FuseConv2DWithBatchNorm) {
using ops::Placeholder;
@ -685,6 +686,7 @@ TEST_F(RemapperTest, FuseConv2DWithBatchNorm) {
test::ExpectTensorNear<float>(tensors[0], tensors_expected[0], 1e-6);
}
TEST_F(RemapperTest, FuseConv2DWithBatchNormAndActivation) {
using ops::Placeholder;
@ -850,6 +852,7 @@ TEST_F(RemapperTest, FuseConv2DWithSqueezeAndBias) {
ASSERT_EQ(tensors.size(), 1);
test::ExpectTensorNear<float>(tensors[0], tensors_expected[0], 1e-6);
}
#endif
} // namespace grappler
} // namespace tensorflow

23
tensorflow/core/kernels/conv_ops_test.cc
View File

@ -1028,12 +1028,14 @@ TYPED_TEST_P(FusedConv2DWithBiasOpTest, SpatialConvolution) {
this->VerifyConv2DWithBias(filter_size, filter_count);
}
#ifndef INTEL_MKL
TYPED_TEST_P(FusedConv2DWithBiasOpTest, ExplicitPaddingConvolution) {
const int filter_size = 3;
const int filter_count = 12;
this->VerifyConv2DWithBias(filter_size, filter_count,
/*explicit_paddings=*/{0, 0, 1, 2, 3, 4, 0, 0});
}
#endif
TYPED_TEST_P(FusedConv2DWithBiasOpTest, OneByOneConvolutionAndActivation) {
const int filter_size = 1;
@ -1062,6 +1064,7 @@ TYPED_TEST_P(FusedConv2DWithBiasOpTest, SpatialConvolutionAndActivation) {
}
}
#ifndef INTEL_MKL
TYPED_TEST_P(FusedConv2DWithBiasOpTest,
ExplicitPaddingConvolutionAndActivation) {
const int filter_size = 3;
@ -1072,6 +1075,7 @@ TYPED_TEST_P(FusedConv2DWithBiasOpTest,
/*explicit_paddings=*/{0, 0, 1, 2, 3, 4, 0, 0});
}
}
#endif
// -------------------------------------------------------------------------- //
// Conv2D + FusedBatchNorm + {Activation} //
@ -1095,6 +1099,7 @@ TYPED_TEST_P(FusedConv2DWithBatchNormOpTest, SpatialConvolution) {
this->VerifyConv2DWithBatchNorm(filter_size, filter_count);
}
#ifndef INTEL_MKL
TYPED_TEST_P(FusedConv2DWithBatchNormOpTest, ExplicitPaddingConvolution) {
const int filter_size = 3;
const int filter_count = 12;
@ -1102,6 +1107,7 @@ TYPED_TEST_P(FusedConv2DWithBatchNormOpTest, ExplicitPaddingConvolution) {
filter_size, filter_count,
/*explicit_paddings=*/{0, 0, 1, 2, 3, 4, 0, 0});
}
#endif
TYPED_TEST_P(FusedConv2DWithBatchNormOpTest, OneByOneConvolutionAndActivation) {
const int filter_size = 1;
@ -1131,6 +1137,7 @@ TYPED_TEST_P(FusedConv2DWithBatchNormOpTest, SpatialConvolutionAndActivation) {
}
}
#ifndef INTEL_MKL
TYPED_TEST_P(FusedConv2DWithBatchNormOpTest,
ExplicitPaddingConvolutionAndActivation) {
const int filter_size = 3;
@ -1141,34 +1148,50 @@ TYPED_TEST_P(FusedConv2DWithBatchNormOpTest,
/*explicit_paddings=*/{0, 0, 1, 2, 3, 4, 0, 0});
}
}
#endif
REGISTER_TYPED_TEST_SUITE_P(FusedConv2DWithBiasOpTest, //
OneByOneConvolution, //
ImageSizeConvolution, //
SpatialConvolution, //
#ifndef INTEL_MKL
ExplicitPaddingConvolution, //
#endif
OneByOneConvolutionAndActivation, //
ImageSizeConvolutionAndActivation, //
#ifndef INTEL_MKL
SpatialConvolutionAndActivation, //
ExplicitPaddingConvolutionAndActivation);
#else
SpatialConvolutionAndActivation);
#endif
REGISTER_TYPED_TEST_SUITE_P(FusedConv2DWithBatchNormOpTest, //
OneByOneConvolution, //
ImageSizeConvolution, //
SpatialConvolution, //
#ifndef INTEL_MKL
ExplicitPaddingConvolution, //
#endif
OneByOneConvolutionAndActivation, //
ImageSizeConvolutionAndActivation, //
#ifndef INTEL_MKL
SpatialConvolutionAndActivation, //
ExplicitPaddingConvolutionAndActivation);
#else
SpatialConvolutionAndActivation);
#endif
using FusedBiasAddDataTypes = ::testing::Types<float, double>;
INSTANTIATE_TYPED_TEST_SUITE_P(Test, FusedConv2DWithBiasOpTest,
FusedBiasAddDataTypes);
#ifndef INTEL_MKL
using FusedBatchNormDataTypes = ::testing::Types<float>;
INSTANTIATE_TYPED_TEST_SUITE_P(Test, FusedConv2DWithBatchNormOpTest,
FusedBatchNormDataTypes);
#endif
#endif // TENSORFLOW_USE_ROCM
} // namespace tensorflow