diff options
Diffstat (limited to 'tensorflow/python/framework/device_test.py')
| -rw-r--r-- | tensorflow/python/framework/device_test.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tensorflow/python/framework/device_test.py b/tensorflow/python/framework/device_test.py index e6dc3c8063..0859e956ff 100644 --- a/tensorflow/python/framework/device_test.py +++ b/tensorflow/python/framework/device_test.py @@ -79,17 +79,17 @@ class DeviceTest(test_util.TensorFlowTestCase): self.assertEquals("/replica:1/task:0/device:CPU:0", d.to_string()) d.parse_from_string("/replica:1/task:0/device:CPU:0") self.assertEquals("/replica:1/task:0/device:CPU:0", d.to_string()) - d.parse_from_string("/job:muu/gpu:2") + d.parse_from_string("/job:muu/device:GPU:2") self.assertEquals("/job:muu/device:GPU:2", d.to_string()) with self.assertRaises(Exception) as e: - d.parse_from_string("/job:muu/gpu:2/cpu:0") + d.parse_from_string("/job:muu/device:GPU:2/cpu:0") self.assertTrue("Cannot specify multiple device" in str(e.exception)) def testFromString(self): d = device.DeviceSpec.from_string("/job:foo/replica:0") self.assertEquals("/job:foo/replica:0", d.to_string()) with self.assertRaises(Exception) as e: - d = device.DeviceSpec.from_string("/job:muu/gpu:2/cpu:0") + d = device.DeviceSpec.from_string("/job:muu/device:GPU:2/cpu:0") self.assertTrue("Cannot specify multiple device" in str(e.exception)) d = device.DeviceSpec.from_string("/job:foo/replica:0/task:3/cpu:*") @@ -102,13 +102,13 @@ class DeviceTest(test_util.TensorFlowTestCase): def testMerge(self): d = device.DeviceSpec.from_string("/job:foo/replica:0") self.assertEquals("/job:foo/replica:0", d.to_string()) - d.merge_from(device.DeviceSpec.from_string("/task:1/gpu:2")) + d.merge_from(device.DeviceSpec.from_string("/task:1/device:GPU:2")) self.assertEquals("/job:foo/replica:0/task:1/device:GPU:2", d.to_string()) d = device.DeviceSpec() d.merge_from(device.DeviceSpec.from_string("/task:1/cpu:0")) self.assertEquals("/task:1/device:CPU:0", d.to_string()) - d.merge_from(device.DeviceSpec.from_string("/job:boo/gpu:0")) + d.merge_from(device.DeviceSpec.from_string("/job:boo/device:GPU:0")) self.assertEquals("/job:boo/task:1/device:GPU:0", d.to_string()) d.merge_from(device.DeviceSpec.from_string("/job:muu/cpu:2")) self.assertEquals("/job:muu/task:1/device:CPU:2", d.to_string()) @@ -134,10 +134,10 @@ class DeviceTest(test_util.TensorFlowTestCase): self.assertEqual("/job:foo/replica:0/task:0/device:GPU:0", device.canonical_name( - "/job:foo/replica:0/task:0/gpu:0")) + "/job:foo/replica:0/task:0/device:GPU:0")) self.assertEqual("/job:foo/replica:0/task:0/device:GPU:0", device.canonical_name( - "/gpu:0/task:0/replica:0/job:foo")) + "/device:GPU:0/task:0/replica:0/job:foo")) def testCheckValid(self): device.check_valid("/job:foo/replica:0") @@ -155,7 +155,7 @@ class DeviceTest(test_util.TensorFlowTestCase): self.assertTrue("Unknown attribute: 'bar'" in str(e.exception)) with self.assertRaises(Exception) as e: - device.check_valid("/cpu:0/gpu:2") + device.check_valid("/cpu:0/device:GPU:2") self.assertTrue("Cannot specify multiple device" in str(e.exception)) |