message: Enabling NCHW layout specific subtests on the ROCm platform
diff: @@ -553,9 +553,9 @@ TEST_F(ConstantFoldingTest, ConstantPushDownBiasAdd) {
  TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_ScalarConst) {
  for (string data_format : {
  "NHWC",
  -#if GOOGLE_CUDA
  +#if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
  "NCHW"
  -#endif // GOOGLE_CUDA
  +#endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
  }) {
  MulConvPushDownTest(
  /*input_shape=*/data_format == "NHWC" ? TensorShape{4, 10, 10, 3}
  @@ -574,9 +574,9 @@ TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_ScalarConst) {
  TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_SingletonConst) {
  for (string data_format : {
  "NHWC",
  -#if GOOGLE_CUDA
  +#if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
  "NCHW"
  -#endif // GOOGLE_CUDA
  +#endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
  }) {
  for (auto mul_const_input_shape :
  {TensorShape{1}, TensorShape{1, 1, 1, 1}}) {
  @@ -596,9 +596,9 @@ TEST_F(ConstantFoldingTest,
  MulConvPushDownTest_Conv2D_SingletonConst_ShapeMismatch) {
  for (string data_format : {
  "NHWC",
  -#if GOOGLE_CUDA
  +#if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
  "NCHW"
  -#endif // GOOGLE_CUDA
  +#endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
  }) {
  MulConvPushDownTest(
  /*input_shape=*/data_format == "NHWC" ? TensorShape{4, 10, 10, 3}
  @@ -614,9 +614,9 @@ TEST_F(ConstantFoldingTest,
  TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_3x1x3Const) {
  for (auto data_format : {
  "NHWC",
  -#if GOOGLE_CUDA
  +#if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
  "NCHW"
  -#endif // GOOGLE_CUDA
  +#endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
  }) {
  MulConvPushDownTest(
  /*input_shape=*/{3, 3, 3, 3},
  @@ -641,7 +641,7 @@ TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_NHWC_VectorLikeConst) {
  }
  }
  -#if GOOGLE_CUDA
  +#if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
  TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_NCHW_VectorLikeConst) {
  for (auto mul_const_input_shape :
  {TensorShape{3}, TensorShape{3, 1, 1}, TensorShape{1, 3, 1, 1}}) {
  @@ -655,14 +655,14 @@ TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_NCHW_VectorLikeConst) {
  /*expect_folded=*/false);
  }
  }
  -#endif // GOOGLE_CUDA
  +#endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
  TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_3x1Const) {
  for (auto data_format : {
  "NHWC",
  -#if GOOGLE_CUDA
  +#if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
  "NCHW"
  -#endif // GOOGLE_CUDA
  +#endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
  }) {
  MulConvPushDownTest(
  /*input_shape=*/{3, 3, 3, 3},
  