Commit 91a01285 authored by Patrick Nguyen's avatar Patrick Nguyen
Browse files

Merge commit for internal changes

Resolved Conflicts:
	tensorflow/compiler/aot/tfcompile_main.cc
	tensorflow/compiler/xla/legacy_flags/debug_options_flags.cc
	tensorflow/compiler/xla/literal_util_test.cc
	tensorflow/compiler/xla/service/cpu/simple_orc_jit.cc
	tensorflow/compiler/xla/service/hlo_graph_dumper.cc
	tensorflow/compiler/xla/service/instruction_fusion.cc
	tensorflow/compiler/xla/tests/BUILD
	tensorflow/compiler/xla/tests/reduce_precision_test.cc
	tensorflow/compiler/xla/tools/BUILD
	tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc
	tensorflow/compiler/xla/xla.proto
	tensorflow/contrib/boosted_trees/BUILD
	tensorflow/contrib/boosted_trees/lib/learner/stochastic/handlers/sparse-quantized-feature-column-handler.cc
	tensorflow/contrib/boosted_trees/python/kernel_tests/prediction_ops_test.py
	tensorflow/contrib/learn/python/learn/experiment.py
	tensorflow/core/grappler/costs/virtual_scheduler.cc
	tensorflow/core/grappler/costs/virtual_scheduler_test.cc
	tensorflow/core/grappler/optimizers/constant_folding.cc
	tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
	tensorflow/core/kernels/scatter_nd_op.cc
	tensorflow/core/kernels/tile_functor.h
	tensorflow/core/kernels/tile_functor_cpu.cc
	tensorflow/core/kernels/tile_functor_gpu.cu.cc
	tensorflow/docs_src/api_guides/python/math_ops.md
	tensorflow/docs_src/programmers_guide/debugger.md
	tensorflow/examples/learn/BUILD
	tensorflow/examples/learn/README.md
	tensorflow/examples/learn/examples_test.sh
	tensorflow/examples/tutorials/mnist/mnist_deep.py
	tensorflow/python/debug/README.md
	tensorflow/python/kernel_tests/cwise_ops_test.py
	tensorflow/python/ops/math_ops.py
	tensorflow/tools/docker/README.md
parents 7049f8c8 d0360669
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment