Merge commit for internal changes

Author: Vijay Vasudevan

WORKSPACE

@@ -94,7 +94,7 @@ new_git_repository(
 new_git_repository(
   name = "d3",
   build_file = "bower.BUILD",
-  remote = "https://github.com/mbostock/d3.git",
+  remote = "https://github.com/mbostock-bower/d3-bower.git",
   tag = "v3.5.6",
 )
 
@@ -136,7 +136,7 @@ new_git_repository(
 new_git_repository(
   name = "iron_a11y_keys_behavior",
   build_file = "bower.BUILD",
-  remote = "https://github.com/PolymerElements/iron-a11y-keys-behavior.git",
+  remote = "https://github.com/polymerelements/iron-a11y-keys-behavior.git",
   tag = "v1.1.1",
 )
 
@@ -151,7 +151,7 @@ new_git_repository(
   name = "iron_autogrow_textarea",
   build_file = "bower.BUILD",
   remote = "https://github.com/PolymerElements/iron-autogrow-textarea.git",
-  tag = "v1.0.10",
+  tag = "v1.0.11",
 )
 
 new_git_repository(
@@ -179,7 +179,7 @@ new_git_repository(
   name = "iron_component_page",
   build_file = "bower.BUILD",
   remote = "https://github.com/PolymerElements/iron-component-page.git",
-  tag = "v1.1.4",
+  tag = "v1.1.3",
 )
 
 new_git_repository(
@@ -193,7 +193,7 @@ new_git_repository(
   name = "iron_dropdown",
   build_file = "bower.BUILD",
   remote = "https://github.com/polymerelements/iron-dropdown.git",
-  tag = "v1.1.0",
+  tag = "v1.2.0",
 )
 
 new_git_repository(
@@ -206,8 +206,8 @@ new_git_repository(
 new_git_repository(
   name = "iron_flex_layout",
   build_file = "bower.BUILD",
-  remote = "https://github.com/polymerelements/iron-flex-layout.git",
-  tag = "v1.2.2",
+  remote = "https://github.com/PolymerElements/iron-flex-layout.git",
+  tag = "v1.2.3",
 )
 
 new_git_repository(
@@ -220,14 +220,14 @@ new_git_repository(
 new_git_repository(
   name = "iron_icon",
   build_file = "bower.BUILD",
-  remote = "https://github.com/PolymerElements/iron-icon.git",
+  remote = "https://github.com/polymerelements/iron-icon.git",
   tag = "v1.0.7",
 )
 
 new_git_repository(
   name = "iron_icons",
   build_file = "bower.BUILD",
-  remote = "https://github.com/PolymerElements/iron-icons.git",
+  remote = "https://github.com/polymerelements/iron-icons.git",
   tag = "v1.1.3",
 )
 
@@ -256,7 +256,7 @@ new_git_repository(
   name = "iron_menu_behavior",
   build_file = "bower.BUILD",
   remote = "https://github.com/PolymerElements/iron-menu-behavior.git",
-  tag = "v1.1.0",
+  tag = "v1.1.1",
 )
 
 new_git_repository(
@@ -270,7 +270,7 @@ new_git_repository(
   name = "iron_overlay_behavior",
   build_file = "bower.BUILD",
   remote = "https://github.com/polymerelements/iron-overlay-behavior.git",
-  tag = "v1.2.0",
+  tag = "v1.3.2",
 )
 
 new_git_repository(
@@ -284,7 +284,7 @@ new_git_repository(
   name = "iron_resizable_behavior",
   build_file = "bower.BUILD",
   remote = "https://github.com/polymerelements/iron-resizable-behavior.git",
-  tag = "v1.0.2",
+  tag = "v1.0.3",
 )
 
 new_git_repository(

tensorflow/core/common_runtime/gpu/gpu_allocator_retry.cc

@@ -55,17 +55,4 @@ void* GPUAllocatorRetry::AllocateRaw(
   return ptr;
 }
 
-void GPUAllocatorRetry::DeallocateRaw(std::function<void(void*)> dealloc_func,
-                                      void* ptr) {
-  if (ptr == nullptr) {
-    LOG(ERROR) << "Request to free nullptr";
-    return;
-  }
-  dealloc_func(ptr);
-  {
-    mutex_lock l(mu_);
-    memory_returned_.notify_all();
-  }
-}
-
 }  // namespace tensorflow

tensorflow/core/common_runtime/gpu/gpu_allocator_retry.h

@@ -36,17 +36,25 @@ class GPUAllocatorRetry {
   // set to true.  The value returned is either the first good pointer
   // obtained from 'alloc_func' or nullptr.
   void* AllocateRaw(std::function<void*(size_t alignment, size_t num_bytes,
-                                        bool verbose_failure)> alloc_func,
+                                        bool verbose_failure)>
+                        alloc_func,
                     int max_millis_to_wait, size_t alignment, size_t bytes);
 
-  // Calls dealloc_func(ptr) and then notifies any threads blocked in
-  // AllocateRaw() that would like to retry.
-  void DeallocateRaw(std::function<void(void* ptr)> dealloc_func, void* ptr);
+  // Called to notify clients that some memory was returned.
+  void NotifyDealloc();
 
  private:
   Env* env_;
   mutex mu_;
   condition_variable memory_returned_;
 };
+
+// Implementation details below
+inline void GPUAllocatorRetry::NotifyDealloc() {
+  mutex_lock l(mu_);
+  memory_returned_.notify_all();
+}
+
 }  // namespace tensorflow
+
 #endif  // TENSORFLOW_CORE_COMMON_RUNTIME_GPU_GPU_ALLOCATOR_RETRY_H_

tensorflow/core/common_runtime/gpu/gpu_allocator_retry_test.cc

@@ -49,12 +49,9 @@ class FakeAllocator {
   }
 
   void DeallocateRaw(void* ptr) {
-    retry_.DeallocateRaw(
-        [this](void* p) {
-          mutex_lock l(mu_);
-          ++memory_capacity_;
-        },
-        ptr);
+    mutex_lock l(mu_);
+    ++memory_capacity_;
+    retry_.NotifyDealloc();
   }
 
  private:

tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.cc

@@ -290,8 +290,8 @@ void GPUBFCAllocator::SplitChunk(GPUBFCAllocator::ChunkHandle h,
 }
 
 void GPUBFCAllocator::DeallocateRaw(void* ptr) {
-  retry_helper_.DeallocateRaw([this](void* p) { DeallocateRawInternal(p); },
-                              ptr);
+  DeallocateRawInternal(ptr);
+  retry_helper_.NotifyDealloc();
 }
 
 void GPUBFCAllocator::DeallocateRawInternal(void* ptr) {

tensorflow/python/lib/io/tf_record.py

@@ -69,7 +69,7 @@ def __init__(self, path):
 
   def __enter__(self):
     """Enter a `with` block."""
-    pass
+    return self
 
   def __exit__(self, unused_type, unused_value, unused_traceback):
     """Exit a `with` block, closing the file."""

tensorflow/python/ops/batch_norm_benchmark.py

@@ -1,3 +1,17 @@
+# Copyright 2015 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 """End-to-end benchmark for batch normalization."""
 from __future__ import absolute_import
 from __future__ import division

tensorflow/stream_executor/dso_loader.cc

@@ -69,9 +69,9 @@ string GetCudnnVersion() { return ""; }
 }
 
 /* static */ port::Status DsoLoader::GetLibcudaDsoHandle(void** dso_handle) {
-  return GetDsoHandle(FindDsoPath("libcuda.so" + GetCudaVersion(),
-                                  "third_party/gpus/cuda/driver/lib64"),
-                      dso_handle);
+  return GetDsoHandle(
+      FindDsoPath("libcuda.so.1", "third_party/gpus/cuda/driver/lib64"),
+      dso_handle);
 }
 
 /* static */ port::Status DsoLoader::GetLibcuptiDsoHandle(void** dso_handle) {

tensorflow/tensorboard/bower.json

@@ -22,6 +22,7 @@
     "iron-ajax": "PolymerElements/iron-ajax#1.1.1",
     "iron-behaviors": "PolymerElements/iron-behaviors#1.0.10",
     "iron-collapse": "PolymerElements/iron-collapse#1.0.5",
+    "iron-component-page": "PolymerElements/iron-component-page#1.1.3",
     "iron-list": "PolymerElements/iron-list#1.1.7",
     "iron-selector": "PolymerElements/iron-selector#1.0.7",
     "paper-behaviors": "PolymerElements/paper-behaviors#1.0.9",
@@ -45,7 +46,6 @@
     "paper-tabs": "PolymerElements/paper-tabs#1.0.4"
   },
   "devDependencies": {
-    "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
     "web-component-tester": "Polymer/web-component-tester"
   },
   "resolutions": {