From 734f8f0d3c6378974dab85b8f3326bec62725cd9 Mon Sep 17 00:00:00 2001
From: autoih <ihjhuo@ibm.com>
Date: Mon, 9 Sep 2019 19:18:04 -0700
Subject: [PATCH 1/3] relocate raise place
---
tensorflow/python/ops/image_grad_test.py | 56 +++++++++++-------------
1 file changed, 26 insertions(+), 30 deletions(-)
diff --git a/tensorflow/python/ops/image_grad_test.py b/tensorflow/python/ops/image_grad_test.py
index 7f4d9be113d..38bda2b625b 100644
--- a/tensorflow/python/ops/image_grad_test.py
+++ b/tensorflow/python/ops/image_grad_test.py
@@ -46,12 +46,11 @@ class ResizeNearestNeighborOpTest(test.TestCase):
for nptype in self.TYPES:
x = np.arange(0, 4).reshape(in_shape).astype(nptype)
+ input_tensor = constant_op.constant(x, shape=in_shape)
+ resize_out = image_ops.resize_nearest_neighbor(input_tensor,
+ out_shape[1:3])
with self.cached_session(use_gpu=True):
- input_tensor = constant_op.constant(x, shape=in_shape)
- resize_out = image_ops.resize_nearest_neighbor(input_tensor,
- out_shape[1:3])
self.assertEqual(out_shape, list(resize_out.get_shape()))
-
resize_out = self.evaluate(resize_out)
self.assertEqual(out_shape, list(resize_out.shape))
@@ -119,11 +118,10 @@ class ResizeBilinearOpTest(test.TestCase):
x = np.arange(0, 4).reshape(in_shape).astype(np.float32)
+ input_tensor = constant_op.constant(x, shape=in_shape)
+ resize_out = image_ops.resize_bilinear(input_tensor, out_shape[1:3])
with self.cached_session():
- input_tensor = constant_op.constant(x, shape=in_shape)
- resize_out = image_ops.resize_bilinear(input_tensor, out_shape[1:3])
self.assertEqual(out_shape, list(resize_out.get_shape()))
-
resize_out = self.evaluate(resize_out)
self.assertEqual(out_shape, list(resize_out.shape))
@@ -210,12 +208,11 @@ class ResizeBicubicOpTest(test.TestCase):
x = np.arange(0, 4).reshape(in_shape).astype(np.float32)
for align_corners in [True, False]:
+ input_tensor = constant_op.constant(x, shape=in_shape)
+ resize_out = image_ops.resize_bicubic(input_tensor, out_shape[1:3],
+ align_corners=align_corners)
with self.cached_session():
- input_tensor = constant_op.constant(x, shape=in_shape)
- resize_out = image_ops.resize_bicubic(input_tensor, out_shape[1:3],
- align_corners=align_corners)
self.assertEqual(out_shape, list(resize_out.get_shape()))
-
resize_out = self.evaluate(resize_out)
self.assertEqual(out_shape, list(resize_out.shape))
@@ -243,12 +240,12 @@ class ResizeBicubicOpTest(test.TestCase):
x = np.arange(0, 24).reshape(in_shape).astype(np.float32)
for align_corners in [True, False]:
+ input_tensor = constant_op.constant(x, shape=in_shape)
+ resize_out = image_ops.resize_bicubic(input_tensor, out_shape[1:3],
+ align_corners=align_corners)
with self.cached_session():
- input_tensor = constant_op.constant(x, shape=in_shape)
- resize_out = image_ops.resize_bicubic(input_tensor, out_shape[1:3],
- align_corners=align_corners)
err = gradient_checker.compute_gradient_error(
- input_tensor, in_shape, resize_out, out_shape, x_init_value=x)
+ input_tensor, in_shape, resize_out, out_shape, x_init_value=x)
self.assertLess(err, 1e-3)
@test_util.run_deprecated_v1
@@ -258,9 +255,9 @@ class ResizeBicubicOpTest(test.TestCase):
x = np.arange(0, 24).reshape(in_shape).astype(np.uint8)
+ input_tensor = constant_op.constant(x, shape=in_shape)
+ resize_out = image_ops.resize_bicubic(input_tensor, out_shape[1:3])
with self.cached_session():
- input_tensor = constant_op.constant(x, shape=in_shape)
- resize_out = image_ops.resize_bicubic(input_tensor, out_shape[1:3])
grad = gradients_impl.gradients(input_tensor, [resize_out])
self.assertEqual([None], grad)
@@ -349,16 +346,16 @@ class CropAndResizeOpTest(test.TestCase):
boxes = np.array([[0, 0, 1, 1], [.1, .2, .7, .8]], dtype=np.float32)
box_ind = np.array([0, 1], dtype=np.int32)
+ crops = image_ops.crop_and_resize(
+ constant_op.constant(
+ image, shape=image_shape),
+ constant_op.constant(
+ boxes, shape=[num_boxes, 4]),
+ constant_op.constant(
+ box_ind, shape=[num_boxes]),
+ constant_op.constant(
+ crop_size, shape=[2]))
with self.session(use_gpu=True) as sess:
- crops = image_ops.crop_and_resize(
- constant_op.constant(
- image, shape=image_shape),
- constant_op.constant(
- boxes, shape=[num_boxes, 4]),
- constant_op.constant(
- box_ind, shape=[num_boxes]),
- constant_op.constant(
- crop_size, shape=[2]))
self.assertEqual(crops_shape, list(crops.get_shape()))
crops = self.evaluate(crops)
self.assertEqual(crops_shape, list(crops.shape))
@@ -472,12 +469,11 @@ class RGBToHSVOpTest(test.TestCase):
for nptype in self.TYPES:
x = np.random.randint(0, high=255, size=[2, 20, 30, 3]).astype(nptype)
+ rgb_input_tensor = constant_op.constant(x, shape=in_shape)
+ hsv_out = gen_image_ops.rgb_to_hsv(rgb_input_tensor)
with self.cached_session(use_gpu=True):
- rgb_input_tensor = constant_op.constant(x, shape=in_shape)
- hsv_out = gen_image_ops.rgb_to_hsv(rgb_input_tensor)
self.assertEqual(out_shape, list(hsv_out.get_shape()))
-
- hsv_out = self.evaluate(hsv_out)
+ hsv_out = self.evaluate(hsv_out)
self.assertEqual(out_shape, list(hsv_out.shape))
def testRGBToHSVGradSimpleCase(self):
From 7a766ea0bbab837348e05f62dd489a7a6436e045 Mon Sep 17 00:00:00 2001
From: autoih <ihjhuo@ibm.com>
Date: Mon, 7 Oct 2019 10:48:33 -0700
Subject: [PATCH 2/3] sanity
---
tensorflow/python/ops/image_grad_test.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tensorflow/python/ops/image_grad_test.py b/tensorflow/python/ops/image_grad_test.py
index 38bda2b625b..28c19634367 100644
--- a/tensorflow/python/ops/image_grad_test.py
+++ b/tensorflow/python/ops/image_grad_test.py
@@ -245,7 +245,7 @@ class ResizeBicubicOpTest(test.TestCase):
align_corners=align_corners)
with self.cached_session():
err = gradient_checker.compute_gradient_error(
- input_tensor, in_shape, resize_out, out_shape, x_init_value=x)
+ input_tensor, in_shape, resize_out, out_shape, x_init_value=x)
self.assertLess(err, 1e-3)
@test_util.run_deprecated_v1
@@ -347,14 +347,14 @@ class CropAndResizeOpTest(test.TestCase):
box_ind = np.array([0, 1], dtype=np.int32)
crops = image_ops.crop_and_resize(
- constant_op.constant(
- image, shape=image_shape),
- constant_op.constant(
- boxes, shape=[num_boxes, 4]),
- constant_op.constant(
- box_ind, shape=[num_boxes]),
- constant_op.constant(
- crop_size, shape=[2]))
+ constant_op.constant(
+ image, shape=image_shape),
+ constant_op.constant(
+ boxes, shape=[num_boxes, 4]),
+ constant_op.constant(
+ box_ind, shape=[num_boxes]),
+ constant_op.constant(
+ crop_size, shape=[2]))
with self.session(use_gpu=True) as sess:
self.assertEqual(crops_shape, list(crops.get_shape()))
crops = self.evaluate(crops)
From 6439f1c444cf8159e9dc8c0476890a1053ba9a0a Mon Sep 17 00:00:00 2001
From: autoih <ihjhuo@ibm.com>
Date: Wed, 9 Oct 2019 13:43:47 -0700
Subject: [PATCH 3/3] indentation
---
tensorflow/python/ops/image_grad_test.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tensorflow/python/ops/image_grad_test.py b/tensorflow/python/ops/image_grad_test.py
index 28c19634367..07987d77305 100644
--- a/tensorflow/python/ops/image_grad_test.py
+++ b/tensorflow/python/ops/image_grad_test.py
@@ -348,13 +348,13 @@ class CropAndResizeOpTest(test.TestCase):
crops = image_ops.crop_and_resize(
constant_op.constant(
- image, shape=image_shape),
+ image, shape=image_shape),
constant_op.constant(
- boxes, shape=[num_boxes, 4]),
+ boxes, shape=[num_boxes, 4]),
constant_op.constant(
- box_ind, shape=[num_boxes]),
- constant_op.constant(
- crop_size, shape=[2]))
+ box_ind, shape=[num_boxes]),
+ constant_op.constant(
+ crop_size, shape=[2]))
with self.session(use_gpu=True) as sess:
self.assertEqual(crops_shape, list(crops.get_shape()))
crops = self.evaluate(crops)