diff options
| author |  Tang, Wenyi <twytwy12345@live.com> | 2018-04-18 03:17:48 +0800 |
|---|---|---|
| committer |  Derek Murray <derek.murray@gmail.com> | 2018-04-17 12:17:48 -0700 |
| commit | f67aa59c264a0ca84d2ff2e7a551d16136af6e56 (patch) | |
| tree | 307ec19bcb087b433f31ff766785bfe8f9b433f0 /tensorflow/core/graph/mkl_tfconversion_pass.h | |
| parent | f1b892b608a3e2b5fa8a16c03ac3c3ca6293ad65 (diff) | |
Complement cmake script to compile tensorflow with mkl and mkldnn on Windows (#16936)
* Add build batch for windows
* Automaticaly find python, cuda, mkl runtimes in PATH
* auto select cmake generator
* Add external library mkldnn. Add options for mkl and mkldnn
* fix syntax error in make.bat
* Fix errorlevel syntex bug in make.bat
* Add /arch:avx2 flags to enable avx2 on windows
* Revert to keep `tensprflow_WIN_CPU_SIMD_OPTIONS` unchanged, add an option `tensorflow_ENABLE_MKL_SUPPORT` to include MKL compilation. Still specify SIMD flags by setting `tensorflow_WIN_CPU_SIMD_OPTIONS` to such as '/arch:AVX2'
* Fix a mistake of CUDA path in make.bat
* resolve conflict in mkl_cpu_allocator.h
* Improve error detection
* Use where /Q to detect cmd environment
* fix "ELSE IF" the syntax error in make.bat
* update README.md, wrap windows based codes by #ifdef _WIN32
* unistd.h is not needed in mkl_cpu_allocator.h any more in master branch
* Remove inline of kMaxLimitStr, which causes compile error in VS2015
* Add static_cast in to fix compile error
* remove make.bat
* Removed make.bat description part
Diffstat (limited to 'tensorflow/core/graph/mkl_tfconversion_pass.h')
| -rw-r--r-- | tensorflow/core/graph/mkl_tfconversion_pass.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass.h b/tensorflow/core/graph/mkl_tfconversion_pass.h index 0562d8b3cd..84e50ee6e0 100644 --- a/tensorflow/core/graph/mkl_tfconversion_pass.h +++ b/tensorflow/core/graph/mkl_tfconversion_pass.h @@ -24,6 +24,10 @@ limitations under the License. #include <memory> #include "tensorflow/core/graph/graph.h" +#ifdef _WIN32 +typedef unsigned int uint; +#endif + namespace tensorflow { // Interface to invoke the pass for unit test // |