Branch 158278922

WORKSPACE

@@ -2,11 +2,11 @@ workspace(name = "org_tensorflow")
 
 http_archive(
     name = "io_bazel_rules_closure",
-    sha256 = "edc91f556b762fc5212d1050d00b12e40dd0b0b1c1d5d96886b59e9a30a6cae4",
-    strip_prefix = "rules_closure-3f07fb6a58870afbb36051bd5d54da4479561cc6",
+    sha256 = "bc41b80486413aaa551860fc37471dbc0666e1dbb5236fb6177cb83b0c105846",
+    strip_prefix = "rules_closure-dec425a4ff3faf09a56c85d082e4eed05d8ce38f",
     urls = [
-        "http://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/3f07fb6a58870afbb36051bd5d54da4479561cc6.tar.gz",  # 2017-05-31
-        "https://github.com/bazelbuild/rules_closure/archive/3f07fb6a58870afbb36051bd5d54da4479561cc6.tar.gz",
+        "http://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/dec425a4ff3faf09a56c85d082e4eed05d8ce38f.tar.gz",  # 2017-06-02
+        "https://github.com/bazelbuild/rules_closure/archive/dec425a4ff3faf09a56c85d082e4eed05d8ce38f.tar.gz",
     ],
 )
 

configure

@@ -687,6 +687,12 @@ if is_windows; then
   write_action_env_to_bazelrc "CUDA_PATH" "$CUDA_PATH"
   write_action_env_to_bazelrc "CUDA_COMPUTE_CAPABILITIES" "$CUDA_COMPUTE_CAPABILITIES"
   write_action_env_to_bazelrc "NO_WHOLE_ARCHIVE_OPTION" "1"
+  write_to_bazelrc "build --config=win-cuda"
+  write_to_bazelrc "test --config=win-cuda"
+else
+  # If CUDA is enabled, always use GPU during build and test.
+  write_to_bazelrc "build --config=cuda"
+  write_to_bazelrc "test --config=cuda"
 fi
 
 # end of if "$TF_NEED_CUDA" == "1"

tensorflow/BUILD

@@ -245,6 +245,7 @@ filegroup(
         "//tensorflow/contrib/data/python/framework:all_files",
         "//tensorflow/contrib/data/python/kernel_tests:all_files",
         "//tensorflow/contrib/data/python/ops:all_files",
+        "//tensorflow/contrib/data/python/util:all_files",
         "//tensorflow/contrib/distributions:all_files",
         "//tensorflow/contrib/factorization:all_files",
         "//tensorflow/contrib/factorization/kernels:all_files",
@@ -369,6 +370,8 @@ filegroup(
         "//tensorflow/tensorboard/components/tf_graph_controls/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_graph_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_debugger_data_card:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_debugger_data_card/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_info:all_files",
         "//tensorflow/tensorboard/components/tf_graph_info/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_loader:all_files",

tensorflow/cc/saved_model/loader.cc

@@ -23,6 +23,7 @@ limitations under the License.
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/protobuf_internal.h"
 #include "tensorflow/core/protobuf/saved_model.pb.h"
+#include "tensorflow/core/protobuf/saver.pb.h"
 #include "tensorflow/core/public/session.h"
 #include "tensorflow/core/public/session_options.h"
 #include "tensorflow/core/util/tensor_bundle/naming.h"

tensorflow/compiler/aot/BUILD

@@ -128,8 +128,8 @@ cc_library(
         "//tensorflow/compiler/xla/legacy_flags:compiler_functor_flags",
         "//tensorflow/compiler/xla/legacy_flags:cpu_compiler_flags",
         "//tensorflow/compiler/xla/legacy_flags:cpu_runtime_flags",
+        "//tensorflow/compiler/xla/legacy_flags:debug_options_flags",
         "//tensorflow/compiler/xla/legacy_flags:hlo_graph_dumper_flags",
-        "//tensorflow/compiler/xla/legacy_flags:hlo_pass_pipeline_flags",
         "//tensorflow/compiler/xla/legacy_flags:llvm_util_flags",
         "//tensorflow/compiler/xla/legacy_flags:service_flags",
         "//tensorflow/compiler/xla/legacy_flags:util_flags",

tensorflow/compiler/aot/tfcompile_main.cc

@@ -28,8 +28,8 @@ limitations under the License.
 #include "tensorflow/compiler/xla/legacy_flags/compiler_functor_flags.h"
 #include "tensorflow/compiler/xla/legacy_flags/cpu_compiler_flags.h"
 #include "tensorflow/compiler/xla/legacy_flags/cpu_runtime_flags.h"
+#include "tensorflow/compiler/xla/legacy_flags/debug_options_flags.h"
 #include "tensorflow/compiler/xla/legacy_flags/hlo_graph_dumper_flags.h"
-#include "tensorflow/compiler/xla/legacy_flags/hlo_pass_pipeline_flags.h"
 #include "tensorflow/compiler/xla/legacy_flags/llvm_util_flags.h"
 #include "tensorflow/compiler/xla/legacy_flags/service_flags.h"
 #include "tensorflow/compiler/xla/legacy_flags/util_flags.h"
@@ -142,7 +142,7 @@ int main(int argc, char** argv) {
   xla::legacy_flags::AppendCpuCompilerFlags(&flag_list);
   xla::legacy_flags::AppendCpuRuntimeFlags(&flag_list);
   xla::legacy_flags::AppendHloGraphDumperFlags(&flag_list);
-  xla::legacy_flags::AppendHloPassPipelineFlags(&flag_list);
+  xla::legacy_flags::AppendDebugOptionsFlags(&flag_list);
   xla::legacy_flags::AppendLlvmUtilFlags(&flag_list);
   xla::legacy_flags::AppendServiceFlags(&flag_list);
   xla::legacy_flags::AppendUtilFlags(&flag_list);

tensorflow/compiler/tf2xla/xla_compiler.cc

@@ -70,7 +70,7 @@ bool XlaCompiler::Argument::operator==(
 }
 
 XlaCompiler::XlaCompiler(XlaCompiler::Options options)
-    : options_(std::move(options)),
+    : options_(options),
       initialization_status_(Status::OK()),
       next_step_id_(1),
       device_(

tensorflow/compiler/xla/client/computation.cc

@@ -28,7 +28,7 @@ Computation::Computation(ServiceInterface* parent,
     : handle_(handle), parent_(parent) {}
 
 Computation::Computation(Computation&& computation)
-    : handle_(computation.handle_), parent_(computation.parent_) {
+    : handle_(std::move(computation.handle_)), parent_(computation.parent_) {
   computation.ResetWithoutFreeing();
 }
 

tensorflow/compiler/xla/legacy_flags/BUILD

@@ -65,6 +65,20 @@ cc_library(
         ],
 )
 
+cc_library(
+    name = "debug_options_flags",
+    srcs = ["debug_options_flags.cc"],
+    hdrs = ["debug_options_flags.h"],
+    deps =
+        [
+            ":parse_flags_from_env",
+            "//tensorflow/compiler/xla:types",
+            "//tensorflow/compiler/xla:xla_proto",
+            "//tensorflow/core:framework_internal",
+            "//tensorflow/core:lib",
+        ],
+)
+
 cc_library(
     name = "cpu_compiler_flags",
     srcs = ["cpu_compiler_flags.cc"],
@@ -160,18 +174,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "hlo_pass_pipeline_flags",
-    srcs = ["hlo_pass_pipeline_flags.cc"],
-    hdrs = ["hlo_pass_pipeline_flags.h"],
-    deps = [
-        ":parse_flags_from_env",
-        "//tensorflow/compiler/xla:types",
-        "//tensorflow/core:framework_internal",
-        "//tensorflow/core:lib",
-    ],
-)
-
 cc_library(
     name = "alias_analysis_flags",
     srcs = ["alias_analysis_flags.cc"],

tensorflow/compiler/xla/legacy_flags/debug_options_flags.cc

@@ -0,0 +1,84 @@
+/* Copyright 2017 The TensorFlow Authors. 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.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/legacy_flags/debug_options_flags.h"
+
+#include <mutex>  // NOLINT(build/c++11): only using std::call_once, not mutex.
+#include <vector>
+#include "tensorflow/compiler/xla/legacy_flags/parse_flags_from_env.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+
+namespace xla {
+namespace legacy_flags {
+
+struct DebugOptionsFlags {
+  string xla_generate_hlo_graph;
+
+  string xla_disable_hlo_passes;
+};
+
+namespace {
+
+DebugOptionsFlags* flag_values;
+std::vector<tensorflow::Flag>* flag_objects;
+std::once_flag flags_init;
+
+// Allocates flag_values and flag_objects; this function must not be called more
+// than once - its call done via call_once.
+void AllocateFlags() {
+  flag_values = new DebugOptionsFlags;
+  flag_values->xla_generate_hlo_graph = "";
+  flag_values->xla_disable_hlo_passes = "";
+
+  flag_objects = new std::vector<tensorflow::Flag>(
+      {tensorflow::Flag(
+           "xla_generate_hlo_graph", &flag_values->xla_generate_hlo_graph,
+           "HLO modules matching this regex will be dumped to a .dot file "
+           "throughout various stages in compilation."),
+
+       tensorflow::Flag(
+           "xla_disable_hlo_passes", &flag_values->xla_disable_hlo_passes,
+           "Comma-separated list of HLO passes to be disabled. These names "
+           "must "
+           "exactly match the passes' names; no whitespace around commas.")});
+  ParseFlagsFromEnv(*flag_objects);
+}
+
+}  // namespace
+
+void AppendDebugOptionsFlags(std::vector<tensorflow::Flag>* flag_list) {
+  std::call_once(flags_init, &AllocateFlags);
+  flag_list->insert(flag_list->end(), flag_objects->begin(),
+                    flag_objects->end());
+}
+
+xla::DebugOptions GetDebugOptionsFromFlags() {
+  std::call_once(flags_init, &AllocateFlags);
+
+  DebugOptions options;
+
+  options.set_xla_generate_hlo_graph(flag_values->xla_generate_hlo_graph);
+
+  std::vector<string> disabled_passes =
+      tensorflow::str_util::Split(flag_values->xla_disable_hlo_passes, ',');
+  for (const auto& passname : disabled_passes) {
+    options.add_xla_disable_hlo_passes(passname);
+  }
+
+  return options;
+}
+
+}  // namespace legacy_flags
+}  // namespace xla

tensorflow/compiler/xla/legacy_flags/debug_options_flags.h

@@ -0,0 +1,38 @@
+/* Copyright 2017 The TensorFlow Authors. 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.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_COMPILER_XLA_LEGACY_FLAGS_DEBUG_OPTIONS_FLAGS_H_
+#define THIRD_PARTY_TENSORFLOW_COMPILER_XLA_LEGACY_FLAGS_DEBUG_OPTIONS_FLAGS_H_
+
+#include <vector>
+
+#include "tensorflow/compiler/xla/xla.pb.h"
+#include "tensorflow/core/util/command_line_flags.h"
+
+namespace xla {
+namespace legacy_flags {
+
+// Appends flag definitions for debug options to flag_list.
+void AppendDebugOptionsFlags(std::vector<tensorflow::Flag>* flag_list);
+
+// Fetches a DebugOptions proto message from flags provided to the program.
+// Flags must be registered with the flags parser using AppendDebugOptionsFlags
+// first.
+xla::DebugOptions GetDebugOptionsFromFlags();
+
+}  // namespace legacy_flags
+}  // namespace xla
+
+#endif  // THIRD_PARTY_TENSORFLOW_COMPILER_XLA_LEGACY_FLAGS_DEBUG_OPTIONS_FLAGS_H_