Merge changes from github.

Change: 132733397
lnianhong · Sep 10, 2016 · 54a7178 · 54a7178
1 parent f51e196
commit 54a7178
Show file tree

Hide file tree

Showing 65 changed files with 1,155 additions and 117 deletions.
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -1,4 +1,5 @@
-GitHub issues are for bugs / installation problems / feature requests.  
+NOTE: Only file GitHub issues for bugs and feature requests.  All other topics will be closed.
+
 For general support from the community, see [StackOverflow](https://stackoverflow.com/questions/tagged/tensorflow).
 To make bugs and feature requests more easy to find and organize, we close issues that are deemed
 out of scope for GitHub Issues and point people to StackOverflow.
@@ -7,6 +8,8 @@ For bugs or installation issues, please provide the following information.
 The more information you provide, the more easily we will be able to offer
 help and advice.
 
+### What related GitHub issues or StackOverflow threads have you found by searching the web for your problem?
+
 ### Environment info
 Operating System:
 
@@ -15,21 +18,19 @@ Installed version of CUDA and cuDNN:
 
 If installed from binary pip package, provide:
 
-1. Which pip package you installed.
+1. A link to the pip package you installed:
 2. The output from `python -c "import tensorflow; print(tensorflow.__version__)"`.
 
 If installed from source, provide 
 
 1. The commit hash (`git rev-parse HEAD`)
 2. The output of `bazel version`
 
-### Steps to reproduce
-1.
-2.
-3.
+### If possible, provide a minimal reproducible example (We usually don't have time to read hundreds of lines of your code)
+
+
+### What other attempted solutions have you tried?
 
-### What have you tried?
-1.
 
 ### Logs or other output that would be helpful
-(If logs are large, please upload as attachment).
+(If logs are large, please upload as attachment or provide link).
diff --git a/RELEASE.md b/RELEASE.md
@@ -125,7 +125,7 @@ answered questions, and were part of inspiring discussions.
 * Allow building against cuDNN 5 (not incl. RNN/LSTM support) 
 * Added instructions and binaries for ProtoBuf library with fast serialization and without 64MB limit
 * Added special functions
-* `bool`-strictness: Tensors have to be explictly compared to `None`
+* `bool`-strictness: Tensors have to be explicitly compared to `None`
 * Shape strictness: all fed values must have a shape that is compatible with the tensor they are replacing
 * Exposed `tf.while_loop` (deprecated `control_flow_ops.While`)
 * run() now takes RunOptions and RunMetadata, which enable timing stats

diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -38,6 +38,8 @@ set (DOWNLOAD_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/downloads"
      CACHE PATH "Location where external projects will be downloaded.")
 mark_as_advanced(DOWNLOAD_LOCATION)
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 # External dependencies
 include(gif)
 include(png)
@@ -48,6 +50,8 @@ include(jsoncpp)
 include(boringssl)
 include(farmhash)
 include(highwayhash)
+include(protobuf)
+include(grpc)
 
 # Let's get to work!
 include(tf_core_framework.cmake)
@@ -57,10 +61,12 @@ include(tf_core_cpu.cmake)
 include(tf_models.cmake)
 include(tf_core_ops.cmake)
 include(tf_core_direct_session.cmake)
+include(tf_core_distributed_runtime.cmake)
 include(tf_core_kernels.cmake)
 include(tf_cc_ops.cmake)
 include(tf_tutorials.cmake)
 include(tf_tools.cmake)
+include(tf_python.cmake)
 
 if (tensorflow_BUILD_TESTS)
   include(tests.cmake)

diff --git a/tensorflow/contrib/cmake/external/boringssl.cmake b/tensorflow/contrib/cmake/external/boringssl.cmake
@@ -27,5 +27,6 @@ ExternalProject_Add(boringssl
     CMAKE_CACHE_ARGS
         -DCMAKE_BUILD_TYPE:STRING=Release
         -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+	-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
 )
 
diff --git a/tensorflow/contrib/cmake/external/farmhash.cmake b/tensorflow/contrib/cmake/external/farmhash.cmake
@@ -27,6 +27,7 @@ ExternalProject_Add(farmhash
         ${farmhash_BUILD}/configure
         --prefix=${farmhash_INSTALL}
         --enable-shared=yes
+	CXXFLAGS=-fPIC
 )
 
 # put farmhash includes in the directory where they are expected

diff --git a/tensorflow/contrib/cmake/external/gif.cmake b/tensorflow/contrib/cmake/external/gif.cmake
@@ -10,6 +10,8 @@ set(gif_HEADERS
     "${gif_INSTALL}/include/gif_lib.h"
 )
 
+set(ENV{CFLAGS} "$ENV{CFLAGS} -fPIC")
+
 ExternalProject_Add(gif
     PREFIX gif
     URL ${gif_URL}
@@ -20,6 +22,7 @@ ExternalProject_Add(gif
     INSTALL_COMMAND $(MAKE) install
     CONFIGURE_COMMAND
     ${CMAKE_CURRENT_BINARY_DIR}/gif/src/gif/configure
+    --with-pic
     --prefix=${gif_INSTALL}
     --enable-shared=yes
 )

diff --git a/tensorflow/contrib/cmake/external/grpc.cmake b/tensorflow/contrib/cmake/external/grpc.cmake
@@ -0,0 +1,27 @@
+include (ExternalProject)
+
+set(GRPC_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/include)
+set(GRPC_URL https://github.com/grpc/grpc.git)
+set(GRPC_BUILD ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc)
+set(GRPC_TAG 3bc78cd0b5bd784a235c01612d634b1ec5f8fb97)
+set(GRPC_LIBRARIES
+    ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/libgrpc++_unsecure.a
+    ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/libgrpc_unsecure.a
+    ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/libgpr.a)
+
+ExternalProject_Add(grpc
+    PREFIX grpc
+    DEPENDS protobuf
+    GIT_REPOSITORY ${GRPC_URL}
+    GIT_TAG ${GRPC_TAG}
+    DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
+    BUILD_IN_SOURCE 1
+    PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/grpc/CMakeLists.txt ${GRPC_BUILD}
+    INSTALL_COMMAND ""
+    CMAKE_CACHE_ARGS
+        -DCMAKE_BUILD_TYPE:STRING=Release
+        -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+        -DPROTOBUF_INCLUDE_DIRS:STRING=${PROTOBUF_INCLUDE_DIRS}
+	-DPROTOBUF_LIBRARIES:STRING=${PROTOBUF_LIBRARIES}
+)
+
diff --git a/tensorflow/contrib/cmake/external/highwayhash.cmake b/tensorflow/contrib/cmake/external/highwayhash.cmake
@@ -19,7 +19,7 @@ set(highwayhash_HEADERS
 ExternalProject_Add(highwayhash
     PREFIX highwayhash
     GIT_REPOSITORY ${highwayhash_URL}
-    GIT_TAG ${highwayhash_HASH}
+    GIT_TAG ${highwayhash_TAG}
     DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
     BUILD_IN_SOURCE 1
     BUILD_COMMAND $(MAKE)

diff --git a/tensorflow/contrib/cmake/external/jpeg.cmake b/tensorflow/contrib/cmake/external/jpeg.cmake
@@ -44,7 +44,6 @@ if (WIN32)
     )
 
 else()
-
     ExternalProject_Add(jpeg
         PREFIX jpeg
         URL ${jpeg_URL}
@@ -57,6 +56,7 @@ else()
             ${jpeg_BUILD}/configure
             --prefix=${jpeg_INSTALL}
             --enable-shared=yes
+	    CFLAGS=-fPIC
     )
 
 endif()

diff --git a/tensorflow/contrib/cmake/external/jsoncpp.cmake b/tensorflow/contrib/cmake/external/jsoncpp.cmake
@@ -25,5 +25,6 @@ ExternalProject_Add(jsoncpp
     CMAKE_CACHE_ARGS
         -DCMAKE_BUILD_TYPE:STRING=Release
         -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+	-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
 )
 
diff --git a/tensorflow/contrib/cmake/external/png.cmake b/tensorflow/contrib/cmake/external/png.cmake
@@ -22,6 +22,7 @@ ExternalProject_Add(png
         -DCMAKE_BUILD_TYPE:STRING=Release
         -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
         -DCMAKE_INSTALL_PREFIX:STRING=${png_INSTALL}
+	-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
 )
 
 ## put png includes in the directory where they are expected

diff --git a/tensorflow/contrib/cmake/external/protobuf.cmake b/tensorflow/contrib/cmake/external/protobuf.cmake
@@ -0,0 +1,22 @@
+include (ExternalProject)
+
+set(PROTOBUF_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/src)
+set(PROTOBUF_URL https://github.com/google/protobuf/releases/download/v3.0.0/protobuf-cpp-3.0.0.zip)
+set(PROTOBUF_HASH SHA256=e886ea7d08267fc3d866ac42d6dd7461ae11c491836adef6f34c04cad0be3078)
+set(PROTOBUF_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/libprotobuf.a)
+set(PROTOBUF_PROTOC_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/protoc)
+
+ExternalProject_Add(protobuf
+    PREFIX protobuf
+    URL ${PROTOBUF_URL}
+    DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
+    BUILD_IN_SOURCE 1
+    SOURCE_DIR ${CMAKE_BINARY_DIR}/protobuf/src/protobuf
+    CONFIGURE_COMMAND ${CMAKE_COMMAND} cmake/ -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+    INSTALL_COMMAND ""
+    CMAKE_CACHE_ARGS
+        -DCMAKE_BUILD_TYPE:STRING=Release
+        -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+	-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+)
+
diff --git a/tensorflow/contrib/cmake/external/re2.cmake b/tensorflow/contrib/cmake/external/re2.cmake
@@ -14,6 +14,8 @@ set(re2_INCLUDES ${re2_BUILD})
 # For the rest, we'll just add the build dir as an include dir.
 set(re2_HEADERS
     "${re2_BUILD}/re2/re2.h"
+    "${re2_BUILD}/re2/stringpiece.h"
+    "${re2_BUILD}/re2/variadic_function.h"
 )
 
 ExternalProject_Add(re2
@@ -26,19 +28,20 @@ ExternalProject_Add(re2
     CMAKE_CACHE_ARGS
         -DCMAKE_BUILD_TYPE:STRING=Release
         -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+        -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
 )
 
 ## put re2 includes in the directory where they are expected
 add_custom_target(re2_create_destination_dir
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${re2_INCLUDE_DIR}
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${re2_INCLUDE_DIR}/re2
     DEPENDS re2)
 
 add_custom_target(re2_copy_headers_to_destination
     DEPENDS re2_create_destination_dir)
 
 foreach(header_file ${re2_HEADERS})
     add_custom_command(TARGET re2_copy_headers_to_destination PRE_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${header_file} ${re2_INCLUDE_DIR})
+    COMMAND ${CMAKE_COMMAND} -E copy ${header_file} ${re2_INCLUDE_DIR}/re2)
 endforeach()
 
 ADD_LIBRARY(re2_lib STATIC IMPORTED