aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/framework/memory_types_test.cc
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <gardener@tensorflow.org>2016-08-12 07:06:13 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-08-12 08:17:23 -0700
commit84cefad9ccd0cab0c8d594597492feec1f3ebcda (patch)
tree5af9d49ea62cf84b1f0bcdbe24b3e08d4e94690f /tensorflow/core/framework/memory_types_test.cc
parent55b44e625cda15faea494f70f164a5d0ede4977d (diff)
Remove special handling of host-memory/device-memory for int32 arguments in type lists.
The current special case behavior is preserved only for functions and their gradients. Change: 130100547
Diffstat (limited to 'tensorflow/core/framework/memory_types_test.cc')
-rw-r--r--tensorflow/core/framework/memory_types_test.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/tensorflow/core/framework/memory_types_test.cc b/tensorflow/core/framework/memory_types_test.cc
index c4cd875bc4..4704da9a11 100644
--- a/tensorflow/core/framework/memory_types_test.cc
+++ b/tensorflow/core/framework/memory_types_test.cc
@@ -63,11 +63,11 @@ TEST(MemoryTypesForNode, Simple) {
TF_EXPECT_OK(MemoryTypesForNode(OpRegistry::Global(), DEVICE_CPU, node_def,
&input, &output));
EXPECT_EQ(MemoryTypeVector({DEVICE_MEMORY, DEVICE_MEMORY, DEVICE_MEMORY,
- DEVICE_MEMORY, DEVICE_MEMORY, HOST_MEMORY,
- DEVICE_MEMORY, HOST_MEMORY}),
+ DEVICE_MEMORY, DEVICE_MEMORY, DEVICE_MEMORY,
+ DEVICE_MEMORY, DEVICE_MEMORY}),
input);
EXPECT_EQ(MemoryTypeVector({DEVICE_MEMORY, DEVICE_MEMORY, DEVICE_MEMORY,
- HOST_MEMORY, DEVICE_MEMORY, HOST_MEMORY}),
+ DEVICE_MEMORY, DEVICE_MEMORY, DEVICE_MEMORY}),
output);
TF_EXPECT_OK(MemoryTypesForNode(OpRegistry::Global(), DEVICE_GPU, node_def,
@@ -77,7 +77,7 @@ TEST(MemoryTypesForNode, Simple) {
HOST_MEMORY, HOST_MEMORY, HOST_MEMORY, HOST_MEMORY}),
input);
EXPECT_EQ(MemoryTypeVector({HOST_MEMORY, HOST_MEMORY, HOST_MEMORY,
- HOST_MEMORY, DEVICE_MEMORY, HOST_MEMORY}),
+ DEVICE_MEMORY, DEVICE_MEMORY, DEVICE_MEMORY}),
output);
}