Merge pull request tensorflow#728 from ageron/master.

.gitignore

@@ -6,6 +6,7 @@ node_modules
 /bazel-tensorflow
 /bazel-testlogs
 /bazel-tf
+/tensorflow/contrib/cmake/build
 /third_party/gpus/cuda/bin
 /third_party/gpus/cuda/cuda.config
 /third_party/gpus/cuda/include

tensorflow/contrib/cmake/CMakeLists.txt

@@ -0,0 +1,62 @@
+# Minimum CMake required
+cmake_minimum_required(VERSION 2.8)
+
+# Project
+project(tensorflow C CXX)
+
+# Actual source is the ../../.. directory
+get_filename_component(tf_contrib_source_dir ${tensorflow_SOURCE_DIR} PATH)
+get_filename_component(tf_tf_source_dir ${tf_contrib_source_dir} PATH)
+get_filename_component(tensorflow_source_dir ${tf_tf_source_dir} PATH)
+
+# [CLEANUP] Not sure if this is needed (copied from Protobuf)
+# CMake policies
+cmake_policy(SET CMP0022 NEW)
+
+# Options
+option(tensorflow_VERBOSE "Enable for verbose output" OFF)
+option(tensorflow_BUILD_TESTS "Build tests" ON)
+
+#Threads: defines CMAKE_THREAD_LIBS_INIT and adds -pthread compile option for
+# targets that link ${CMAKE_THREAD_LIBS_INIT}.
+find_package (Threads)
+
+# [CLEANUP] Remove when done
+# For debugging
+function(SHOW_VARIABLES)
+    get_cmake_property(_variableNames VARIABLES)
+    foreach (_variableName ${_variableNames})
+        message(STATUS "${_variableName}=${${_variableName}}")
+    endforeach()
+endfunction()
+
+# External dependencies
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/external)
+
+# Location where external projects will be downloaded
+set (DOWNLOAD_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/downloads"
+     CACHE PATH "Location where external projects will be downloaded.")
+mark_as_advanced(DOWNLOAD_LOCATION)
+
+# External dependencies
+include(png)
+include(jpeg)
+include(re2)
+include(eigen)
+
+# Let's get to work!
+include(tf_core_framework.cmake)
+include(tf_stream_executor.cmake)
+include(tf_core_cpu.cmake)
+include(tf_models.cmake)
+include(tf_core_ops.cmake)
+include(tf_core_direct_session.cmake)
+include(tf_core_kernels.cmake)
+include(tf_cc_ops.cmake)
+include(tf_tutorials.cmake)
+
+if (tensorflow_BUILD_TESTS)
+  include(tests.cmake)
+endif (tensorflow_BUILD_TESTS)
+
+include(install.cmake)

tensorflow/contrib/cmake/README.md

@@ -0,0 +1,257 @@
+This directory contains *CMake* files that can be used to build TensorFlow
+core library.
+
+You need to have [CMake](http://www.cmake.org) and [Git](http://git-scm.com)
+installed on your computer before proceeding.
+
+Most of the instructions will be given to the *Сommand Prompt*, but the same
+actions can be performed using appropriate GUI tools.
+
+Environment Setup
+=================
+
+Open the appropriate *Command Prompt* from the *Start* menu.
+
+For example *VS2013 x64 Native Tools Command Prompt*:
+
+    C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64>
+
+Change to your working directory:
+
+    C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64>cd C:\Path\to
+    C:\Path\to>
+
+Where *C:\Path\to* is the path to your real working directory.
+
+Create a folder where Tensorflow headers/libraries/binaries will be installed
+after they are built:
+
+    C:\Path\to>mkdir install
+
+If *cmake* command is not available from *Command Prompt*, add it to system
+*PATH* variable:
+
+    C:\Path\to>set PATH=%PATH%;C:\Program Files (x86)\CMake\bin
+
+If *git* command is not available from *Command Prompt*, add it to system
+*PATH* variable:
+
+    C:\Path\to>set PATH=%PATH%;C:\Program Files\Git\cmd
+
+Good. Now you are ready to continue.
+
+Getting Sources
+===============
+
+You can get the latest stable source packages from the
+[releases](https://github.com/tensorflow/tensorflow/releases) page.
+Or you can type:
+
+    C:\Path\to> git clone --recursive -b [release_tag] https://github.com/tensorflow/tensorflow.git
+
+Where *[release_tag]* is a git tag like *v0.6.0* or a branch name like *master*
+if you want to get the latest code.
+
+Go to the project folder:
+
+    C:\Path\to>cd tensorflow
+    C:\Path\to\tensorflow>
+
+Now go to *tensorflow\contrib\cmake* folder in Tensorflow's contrib sources:
+
+    C:\Path\to\tensorflow>cd tensorflow\contrib\cmake
+    C:\Path\to\tensorflow\tensorflow\contrib\cmake>
+
+Good. Now you are ready to configure *CMake*.
+
+CMake Configuration
+===================
+
+*CMake* supports a lot of different
+[generators](http://www.cmake.org/cmake/help/latest/manual/cmake-generators.7.html)
+for various native build systems. We are only interested in
+[Makefile](http://www.cmake.org/cmake/help/latest/manual/cmake-generators.7.html#makefile-generators)
+and
+[Visual Studio](http://www.cmake.org/cmake/help/latest/manual/cmake-generators.7.html#visual-studio-generators)
+generators.
+
+We will use shadow building to separate the temporary files from the Tensorflow
+source code.
+
+Create a temporary *build* folder and change your working directory to it:
+
+     C:\Path\to\tensorflow\tensorflow\contrib\cmake>mkdir build & cd build
+     C:\Path\to\tensorflow\tensorflow\contrib\cmake\build>
+
+The *Makefile* generator can build the project in only one configuration, so
+you need to build a separate folder for each configuration.
+
+To start using a *Release* configuration:
+
+     [...]\contrib\cmake\build>mkdir release & cd release
+     [...]\contrib\cmake\build\release>cmake -G "NMake Makefiles" ^
+     -DCMAKE_BUILD_TYPE=Release ^
+     -DCMAKE_INSTALL_PREFIX=../../../../../../install ^
+     ../..
+
+It will generate *nmake* *Makefile* in current directory.
+
+To use *Debug* configuration:
+
+     [...]\contrib\cmake\build>mkdir debug & cd debug
+     [...]\contrib\cmake\build\debug>cmake -G "NMake Makefiles" ^
+     -DCMAKE_BUILD_TYPE=Debug ^
+     -DCMAKE_INSTALL_PREFIX=../../../../../../install ^
+     ../..
+
+It will generate *nmake* *Makefile* in current directory.
+
+To create *Visual Studio* solution file:
+
+     [...]\contrib\cmake\build>mkdir solution & cd solution
+     [...]\contrib\cmake\build\solution>cmake -G "Visual Studio 12 2013 Win64" ^
+     -DCMAKE_INSTALL_PREFIX=../../../../../../install ^
+     ../..
+
+It will generate *Visual Studio* solution file *tensorflow.sln* in current
+directory.
+
+If the *gmock* directory does not exist, and/or you do not want to build
+Tensorflow unit tests, you need to add *cmake* command argument
+`-Dtensorflow_BUILD_TESTS=OFF` to disable testing.
+
+Compiling
+=========
+
+To compile tensorflow:
+
+     [...]\contrib\cmake\build\release>nmake
+
+or
+
+     [...]\contrib\cmake\build\debug>nmake
+
+And wait for the compilation to finish.
+
+If you prefer to use the IDE:
+
+  * Open the generated tensorflow.sln file in Microsoft Visual Studio.
+  * Choose "Debug" or "Release" configuration as desired.
+  * From the Build menu, choose "Build Solution".
+
+And wait for the compilation to finish.
+
+Testing
+=======
+
+To run unit-tests:
+
+     [...]\contrib\cmake\build\release>nmake check
+
+or
+
+     [...]\contrib\cmake\build\debug>nmake check
+
+You can also build project *check* from Visual Studio solution.
+Yes, it may sound strange, but it works.
+
+You should see an output similar to:
+
+     Running main() from gmock_main.cc
+     [==========] Running 1546 tests from 165 test cases.
+     
+     ...
+     
+     [==========] 1546 tests from 165 test cases ran. (2529 ms total)
+     [  PASSED  ] 1546 tests.
+
+To run specific tests:
+
+     C:\Path\to\tensorflow>tensorflow\contrib\cmake\build\release\tests.exe ^
+     --gtest_filter=AnyTest*
+     Running main() from gmock_main.cc
+     Note: Google Test filter = AnyTest*
+     [==========] Running 3 tests from 1 test case.
+     [----------] Global test environment set-up.
+     [----------] 3 tests from AnyTest
+     [ RUN      ] AnyTest.TestPackAndUnpack
+     [       OK ] AnyTest.TestPackAndUnpack (0 ms)
+     [ RUN      ] AnyTest.TestPackAndUnpackAny
+     [       OK ] AnyTest.TestPackAndUnpackAny (0 ms)
+     [ RUN      ] AnyTest.TestIs
+     [       OK ] AnyTest.TestIs (0 ms)
+     [----------] 3 tests from AnyTest (1 ms total)
+     
+     [----------] Global test environment tear-down
+     [==========] 3 tests from 1 test case ran. (2 ms total)
+     [  PASSED  ] 3 tests.
+
+Note that the tests must be run from the source folder.
+
+If all tests are passed, safely continue.
+
+Installing
+==========
+
+To install Tensorflow to the specified *install* folder:
+
+     [...]\contrib\cmake\build\release>nmake install
+
+or
+
+     [...]\contrib\cmake\build\debug>nmake install
+
+You can also build project *INSTALL* from Visual Studio solution.
+It sounds not so strange and it works.
+
+This will create the following folders under the *install* location:
+  * bin - that contains tensorflow binaries;
+  * include - that contains C++ headers and Tensorflow *.proto files;
+  * lib - that contains linking libraries and *CMake* configuration files for
+    *tensorflow* package.
+
+Now you can if needed:
+  * Copy the contents of the include directory to wherever you want to put
+    headers.
+  * Copy binaries wherever you put build tools (probably somewhere in your
+    PATH).
+  * Copy linking libraries libtensorflow[d].lib wherever you put libraries.
+
+To avoid conflicts between the MSVC debug and release runtime libraries, when
+compiling a debug build of your application, you may need to link against a
+debug build of libtensorflowd.lib with "d" postfix.  Similarly, release builds
+should link against release libtensorflow.lib library.
+
+DLLs vs. static linking
+=======================
+
+Static linking is now the default for the Tensorflow Buffer libraries.  Due to
+issues with Win32's use of a separate heap for each DLL, as well as binary
+compatibility issues between different versions of MSVC's STL library, it is
+recommended that you use static linkage only.  However, it is possible to
+build libtensorflow as DLLs if you really want.  To do this, do the following:
+
+  * Add an additional flag `-Dtensorflow_BUILD_SHARED_LIBS=ON` when invoking
+    cmake
+  * Follow the same steps as described in the above section.
+  * When compiling your project, make sure to `#define TENSORFLOW_USE_DLLS`.
+
+When distributing your software to end users, we strongly recommend that you
+do NOT install libtensorflow.dll to any shared location.
+Instead, keep these libraries next to your binaries, in your application's
+own install directory.  C++ makes it very difficult to maintain binary
+compatibility between releases, so it is likely that future versions of these
+libraries will *not* be usable as drop-in replacements.
+
+If your project is itself a DLL intended for use by third-party software, we
+recommend that you do NOT expose Tensorflow objects in your library's
+public interface, and that you statically link them into your library.
+
+Notes on Compiler Warnings
+==========================
+
+The following warnings have been disabled while building the tensorflow
+libraries and binaries.  You may have to disable some of them in your own
+project as well, or live with them.
+
+* [TODO]

tensorflow/contrib/cmake/external/eigen.cmake

@@ -0,0 +1,34 @@
+#new_http_archive(
+#  name = "eigen_archive",
+#  url = "https://bitbucket.org/eigen/eigen/get/...",
+#  sha256 = "...",
+#  build_file = "eigen.BUILD",
+#)
+
+include (ExternalProject)
+
+set(eigen_archive_hash "ed4c9730b545")
+
+set(eigen_INCLUDE_DIRS
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}/external/eigen_archive
+    ${CMAKE_CURRENT_BINARY_DIR}/external/eigen_archive/eigen-eigen-${eigen_archive_hash}
+    ${tensorflow_source_dir}/third_party/eigen3
+)
+set(eigen_URL https://bitbucket.org/eigen/eigen/get/${eigen_archive_hash}.tar.gz)
+set(eigen_HASH SHA256=3d9eceb8a2add299e37b1f32759157cc2574f7684936c151552a5ae3f33aebd5)
+set(eigen_BUILD ${CMAKE_CURRENT_BINARY_DIR}/eigen/src/eigen)
+set(eigen_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/eigen/install)
+
+ExternalProject_Add(eigen
+    PREFIX eigen
+    URL ${eigen_URL}
+    URL_HASH ${eigen_HASH}
+    DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
+    INSTALL_DIR "${eigen_INSTALL}"
+    CMAKE_CACHE_ARGS
+        -DCMAKE_BUILD_TYPE:STRING=Release
+        -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+        -DCMAKE_INSTALL_PREFIX:STRING=${eigen_INSTALL}
+        -DINCLUDE_INSTALL_DIR:STRING=${CMAKE_CURRENT_BINARY_DIR}/external/eigen_archive/eigen-eigen-${eigen_archive_hash}
+)