Merge changes from github.

Change: 138143557

2 files changed, 5 insertions, 3 deletions

diff --git a/tensorflow/core/common_runtime/gpu/pool_allocator.h b/tensorflow/core/common_runtime/gpu/pool_allocator.h
index b2f0265145..5842758f0e 100644
--- a/tensorflow/core/common_runtime/gpu/pool_allocator.h
+++ b/tensorflow/core/common_runtime/gpu/pool_allocator.h
@@ -173,7 +173,7 @@ class BasicCPUAllocator : public SubAllocator {
   void* Alloc(size_t alignment, size_t num_bytes) override {
     return port::aligned_malloc(num_bytes, alignment);
   }
-  void Free(void* ptr, size_t num_bytes) override { free(ptr); }
+  void Free(void* ptr, size_t num_bytes) override { port::aligned_free(ptr); }
 };
 
 // Allocator for pinned CPU RAM that is made known to CUDA for the
diff --git a/tensorflow/core/common_runtime/simple_placer.cc b/tensorflow/core/common_runtime/simple_placer.cc
index fda429b52a..721e73898b 100644
--- a/tensorflow/core/common_runtime/simple_placer.cc
+++ b/tensorflow/core/common_runtime/simple_placer.cc
@@ -815,9 +815,11 @@ void SimplePlacer::AssignAndLog(const string& assigned_device,
   node->set_assigned_device_name(assigned_device);
   // Log placement if log_device_placement is set.
   if (options_ && options_->config.log_device_placement()) {
-    printf("%s: %s\n", node->name().c_str(),
+    printf("%s: (%s): %s\n", node->name().c_str(),
+           node->type_string().c_str(),
            node->assigned_device_name().c_str());
-    LOG(INFO) << node->name() << ": " << node->assigned_device_name();
+    LOG(INFO) << node->name() << ": " << "(" << node->type_string() << ")" 
+              << node->assigned_device_name();
   }
 }