Skip to content
Permalink
Browse files

Merge changes from github.

PiperOrigin-RevId: 178185697
  • Loading branch information...
caisq authored and tensorflower-gardener committed Dec 7, 2017
1 parent 8ad62af commit fe8406149feec453250905965a14285465cd2063
Showing with 8,798 additions and 1,219 deletions.
  1. +1 −1 AUTHORS
  2. +1 −0 CONTRIBUTING.md
  3. +22 −0 configure.py
  4. +12 −0 tensorflow/cc/gradients/nn_grad.cc
  5. +7 −0 tensorflow/cc/gradients/nn_grad_test.cc
  6. +2 −2 tensorflow/compiler/xla/service/cpu/disassembler.h
  7. +1 −1 tensorflow/compiler/xla/service/hlo_instruction.h
  8. +1 −0 tensorflow/contrib/BUILD
  9. +1 −0 tensorflow/contrib/__init__.py
  10. +0 −2 tensorflow/contrib/cloud/BUILD
  11. +449 −0 tensorflow/contrib/cmake/python_modules.txt
  12. +19 −0 tensorflow/contrib/cmake/python_protos.txt
  13. +5 −0 tensorflow/contrib/cmake/python_protos_cc.txt
  14. +1 −0 tensorflow/contrib/cmake/tf_core_ops.cmake
  15. +51 −484 tensorflow/contrib/cmake/tf_python.cmake
  16. +2 −0 tensorflow/contrib/cmake/tf_tests.cmake
  17. +3 −0 tensorflow/contrib/data/python/kernel_tests/BUILD
  18. +18 −0 tensorflow/contrib/distributions/BUILD
  19. +2 −0 tensorflow/contrib/distributions/__init__.py
  20. +320 −0 tensorflow/contrib/distributions/python/kernel_tests/half_normal_test.py
  21. +171 −0 tensorflow/contrib/distributions/python/ops/half_normal.py
  22. +4 −3 tensorflow/contrib/distributions/python/ops/mixture_same_family.py
  23. +1 −0 tensorflow/contrib/eager/python/examples/spinn/BUILD
  24. +1 −1 tensorflow/contrib/framework/python/ops/variables.py
  25. +45 −44 tensorflow/contrib/layers/python/layers/layers.py
  26. +2 −2 tensorflow/contrib/learn/python/learn/estimators/estimator.py
  27. +14 −3 tensorflow/contrib/lite/README.md
  28. +7 −0 tensorflow/contrib/lite/download_dependencies.sh
  29. +5 −1 tensorflow/contrib/lite/examples/ios/camera/CameraExampleViewController.mm
  30. +1 −0 tensorflow/contrib/lite/examples/ios/simple/AppDelegate.mm
  31. +2 −0 tensorflow/contrib/lite/examples/ios/simple/ios_image_load.mm
  32. +1 −0 tensorflow/contrib/lite/python/BUILD
  33. +5,417 −0 tensorflow/contrib/lite/schema/schema_generated.h
  34. +5 −0 tensorflow/contrib/lite/toco/tflite/BUILD
  35. +1 −0 tensorflow/contrib/lite/tools/benchmark_model.cc
  36. +9 −2 tensorflow/contrib/makefile/download_dependencies.sh
  37. +4 −4 tensorflow/contrib/model_pruning/python/layers/core_layers.py
  38. +113 −0 tensorflow/contrib/periodic_resample/BUILD
  39. +27 −0 tensorflow/contrib/periodic_resample/__init__.py
  40. +26 −0 tensorflow/contrib/periodic_resample/kernels/periodic_resample_op.cc
  41. +230 −0 tensorflow/contrib/periodic_resample/kernels/periodic_resample_op.h
  42. +88 −0 tensorflow/contrib/periodic_resample/ops/array_ops.cc
  43. +20 −0 tensorflow/contrib/periodic_resample/python/__init__.py
  44. +101 −0 tensorflow/contrib/periodic_resample/python/kernel_tests/periodic_resample_op_test.py
  45. +30 −0 tensorflow/contrib/periodic_resample/python/ops/periodic_resample_op.py
  46. +0 −1 tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
  47. +4 −8 tensorflow/contrib/tpu/profiler/pip_package/cloud_tpu_profiler/main.py
  48. +1 −1 tensorflow/contrib/tpu/profiler/pip_package/setup.py
  49. +4 −2 tensorflow/contrib/verbs/BUILD
  50. +70 −28 tensorflow/contrib/verbs/rdma.cc
  51. +25 −4 tensorflow/contrib/verbs/rdma.h
  52. +51 −0 tensorflow/contrib/verbs/rdma_mgr.cc
  53. +4 −1 tensorflow/contrib/verbs/rdma_mgr.h
  54. +19 −27 tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
  55. +3 −2 tensorflow/contrib/verbs/verbs_server_lib.cc
  56. +1 −1 tensorflow/core/common_runtime/pending_counts.h
  57. +1 −1 tensorflow/core/common_runtime/shape_refiner.cc
  58. +1 −1 tensorflow/core/graph/graph_partition.cc
  59. +90 −89 tensorflow/core/graph/mkl_graph_util.h
  60. +1 −1 tensorflow/core/graph/mkl_layout_pass.cc
  61. +1 −1 tensorflow/core/graph/mkl_tfconversion_pass.cc
  62. +1 −1 tensorflow/core/kernels/cwise_op_asinh.cc
  63. +6 −4 tensorflow/core/kernels/cwise_op_bitwise_and.cc
  64. +6 −4 tensorflow/core/kernels/cwise_op_bitwise_or.cc
  65. +6 −4 tensorflow/core/kernels/cwise_op_bitwise_xor.cc
  66. +2 −1 tensorflow/core/kernels/cwise_op_gpu_bitwise_and.cu.cc
  67. +2 −1 tensorflow/core/kernels/cwise_op_gpu_bitwise_or.cu.cc
  68. +2 −1 tensorflow/core/kernels/cwise_op_gpu_bitwise_xor.cu.cc
  69. +31 −11 tensorflow/core/kernels/decode_bmp_op.cc
  70. +3 −4 tensorflow/core/kernels/depthwise_conv_op.cc
  71. +465 −0 tensorflow/core/kernels/dynamic_partition_op_gpu.cu.cc
  72. +1 −1 tensorflow/core/kernels/maxpooling_op.cc
  73. +1 −0 tensorflow/core/kernels/mkl_batch_matmul_op.cc
  74. +40 −38 tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
  75. +44 −42 tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
  76. +42 −40 tensorflow/core/kernels/mkl_conv_ops.cc
  77. +74 −66 tensorflow/core/kernels/mkl_conv_ops.h
  78. +4 −4 tensorflow/core/kernels/shape_ops.h
  79. +1 −0 tensorflow/core/kernels/slice_op.h
  80. +1 −1 tensorflow/core/util/transform_output_iterator.h
  81. +1 −0 tensorflow/docs_src/extend/add_filesys.md
  82. +2 −2 tensorflow/docs_src/extend/estimators.md
  83. +1 −1 tensorflow/docs_src/get_started/input_fn.md
  84. +17 −14 tensorflow/docs_src/install/install_mac.md
  85. +3 −3 tensorflow/docs_src/programmers_guide/datasets.md
  86. +12 −6 tensorflow/docs_src/programmers_guide/saved_model.md
  87. +1 −1 tensorflow/examples/android/README.md
  88. +1 −1 tensorflow/examples/speech_commands/train.py
  89. +17 −0 tensorflow/go/tensor.go
  90. +20 −0 tensorflow/go/tensor_test.go
  91. +1 −1 tensorflow/python/debug/lib/stepper.py
  92. +2 −1 tensorflow/python/estimator/export/export.py
  93. +2 −1 tensorflow/python/estimator/export/export_test.py
  94. +2 −1 tensorflow/python/keras/BUILD
  95. +11 −2 tensorflow/python/keras/_impl/keras/estimator.py
  96. +1 −0 tensorflow/python/kernel_tests/decode_bmp_op_test.py
  97. +26 −0 tensorflow/python/kernel_tests/distributions/special_math_test.py
  98. +192 −5 tensorflow/python/kernel_tests/dynamic_partition_op_test.py
  99. +1 −1 tensorflow/python/ops/bitwise_ops_test.py
  100. +24 −0 tensorflow/python/ops/distributions/special_math.py
  101. +1 −1 tensorflow/python/ops/losses/losses_impl.py
  102. +59 −31 tensorflow/python/platform/tf_logging.py
  103. +7 −0 tensorflow/tools/pip_package/setup.py
  104. +142 −206 tensorflow/workspace.bzl
  105. +1 −0 third_party/repo.bzl
@@ -7,4 +7,4 @@
# The email address is not required for organizations.

Google Inc.
Yuan Tang terrytangyuan@gmail.com
Yuan Tang <terrytangyuan@gmail.com>
@@ -114,6 +114,7 @@ pylint --rcfile=/tmp/pylintrc myfile.py
* [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html)
* [Google JavaScript Style Guide](https://google.github.io/styleguidehttps://github.com/jsguide.html)
* [Google Shell Style Guide](https://google.github.io/styleguide/shell.xml)
* [Google Objective-C Style Guide](http://google.github.io/styleguide/objcguide.html)

#### Running sanity check

@@ -1088,6 +1088,28 @@ def toolkit_exists(toolkit_path):
computecpp_toolkit_path)


def set_trisycl_include_dir(environ_cp):
"""Set TRISYCL_INCLUDE_DIR."""
ask_trisycl_include_dir = ('Please specify the location of the triSYCL '
'include directory. (Use --config=sycl_trisycl '
'when building with Bazel) '
'[Default is %s]: ') % _DEFAULT_TRISYCL_INCLUDE_DIR
while True:
trisycl_include_dir = get_from_env_or_user_or_default(
environ_cp, 'TRISYCL_INCLUDE_DIR', ask_trisycl_include_dir,
_DEFAULT_TRISYCL_INCLUDE_DIR)
if os.path.exists(trisycl_include_dir):
break

print('Invalid triSYCL include directory, %s cannot be found'
% (trisycl_include_dir))

# Set TRISYCL_INCLUDE_DIR
environ_cp['TRISYCL_INCLUDE_DIR'] = trisycl_include_dir
write_action_env_to_bazelrc('TRISYCL_INCLUDE_DIR',
trisycl_include_dir)


def set_trisycl_include_dir(environ_cp):
"""Set TRISYCL_INCLUDE_DIR."""

@@ -196,6 +196,18 @@ Status MaxPoolGradV2Helper(const Scope& scope, const Operation& op,
}
REGISTER_GRADIENT_OP("MaxPoolV2", MaxPoolGradV2Helper);

Status LRNGradHelper(const Scope& scope, const Operation& op,
const std::vector<Output>& grad_inputs,
std::vector<Output>* grad_outputs){
internal::LRNGrad::Attrs grad_attrs;

auto dx = internal::LRNGrad(scope, grad_inputs[0], op.input(0), op.output(0),
grad_attrs);
grad_outputs->push_back(dx);
return scope.status();
}
REGISTER_GRADIENT_OP("LRN", LRNGradHelper);

} // anonymous namespace
} // namespace ops
} // namespace tensorflow
@@ -191,5 +191,12 @@ TEST_F(NNGradTest, MaxPoolGradV2Helper) {
RunTest(x, x_init_value, y, y_shape);
}

TEST_F(NNGradTest, LRN){
TensorShape x_shape({1, 1, 2, 1});
auto x = Placeholder(scope_, DT_FLOAT, Placeholder::Shape(x_shape));
auto y = LRN(scope_, x);
RunTest(x, x_shape, y, x_shape);
}

} // namespace
} // namespace tensorflow
@@ -37,7 +37,7 @@ struct DisassemblerResult {
DisassemblerResult(const string& text, size_t code_size_bytes)
: text(text), code_size_bytes(code_size_bytes) {}

// The dissassembled text sections of the object file.
// The disassembled text sections of the object file.
string text;
// The total number of bytes of executable code in the object file.
uint64_t code_size_bytes;
@@ -53,7 +53,7 @@ class Disassembler {
// Returns a DisassemblerResult for the given object file, containing the
// disassembled code.
//
// If we couldnt' retrieve a disassembler for this platform, an error status
// If we couldn't retrieve a disassembler for this platform, an error status
// is returned.
StatusOr<DisassemblerResult> DisassembleObjectFile(
const llvm::object::ObjectFile& object_file) const;
@@ -428,7 +428,7 @@ class HloInstruction {
Status RemoveControlDependencyTo(HloInstruction* instruction);

// Returns the set of control predecessors (successors) of this
// instruction. Control predecessors (sucessors) must execute before (after)
// instruction. Control predecessors (successors) must execute before (after)
// the current instruction.
const std::vector<HloInstruction*>& control_predecessors() const {
return control_predecessors_;
@@ -64,6 +64,7 @@ py_library(
"//tensorflow/contrib/nearest_neighbor:nearest_neighbor_py",
"//tensorflow/contrib/nn:nn_py",
"//tensorflow/contrib/opt:opt_py",
"//tensorflow/contrib/periodic_resample:init_py",
"//tensorflow/contrib/predictor",
"//tensorflow/contrib/quantization:quantization_py",
"//tensorflow/contrib/quantize:quantize_graph",
@@ -55,6 +55,7 @@
from tensorflow.contrib import nccl
from tensorflow.contrib import nn
from tensorflow.contrib import opt
from tensorflow.contrib import periodic_resample
from tensorflow.contrib import predictor
from tensorflow.contrib import quantization
from tensorflow.contrib import quantize
@@ -60,9 +60,7 @@ tf_py_test(
size = "small",
srcs = ["python/ops/bigquery_reader_ops_test.py"],
additional_deps = [
":bigquery_reader_ops_op_lib",
":cloud_py",
"//tensorflow/contrib/cloud/kernels:bigquery_reader_ops",
"//tensorflow/core:protos_all_py",
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
Oops, something went wrong.

0 comments on commit fe84061

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.