projects / platform / upstream / tensorflow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4d59a8 926fc13)
Merge branch 'master' into tensorrt
authorSami Kama <samikama@users.noreply.github.com>
Fri, 9 Feb 2018 00:44:57 +0000 (16:44 -0800)
committerGitHub <noreply@github.com>
Fri, 9 Feb 2018 00:44:57 +0000 (16:44 -0800)
1  2 
configure.py patch | diff1 | diff2 | blob | history
tensorflow/contrib/BUILD patch | diff1 | diff2 | blob | history
tensorflow/contrib/cmake/python_modules.txt patch | diff1 | diff2 | blob | history
tensorflow/tensorflow.bzl patch | diff1 | diff2 | blob | history

diff --cc configure.py
Simple merge
diff --cc tensorflow/contrib/BUILD
Simple merge
diff --cc tensorflow/contrib/cmake/python_modules.txt
index 3bae1ed,7eb880a..f0e3477
--- 1/tensorflow/contrib/cmake/python_modules.txt
--- 2/tensorflow/contrib/cmake/python_modules.txt
+++ b/tensorflow/contrib/cmake/python_modules.txt
@@@ -408,9 -415,7 +415,10 @@@ tensorflow/contrib/summar
  tensorflow/contrib/tensorboard
  tensorflow/contrib/tensorboard/plugins
  tensorflow/contrib/tensorboard/plugins/projector
- # TODO(sami): Add cmake implementations
+ tensorflow/contrib/tensorboard/plugins/trace
++# TODO(sami): Add cmake implementations.
 +# tensorflow/contrib/tensorrt/python
 +# tensorflow/contrib/tensorrt/python/ops
  tensorflow/contrib/tensor_forest
  tensorflow/contrib/tensor_forest/client
  tensorflow/contrib/tensor_forest/hybrid
diff --cc tensorflow/tensorflow.bzl
Simple merge
Domain: Machine Learning / ML Framework;