提交 326a7735 编写于 作者: P peizhilin

Merge branch 'windows/build' into windows/online

test=develop
...@@ -135,6 +135,8 @@ if (WIN32) ...@@ -135,6 +135,8 @@ if (WIN32)
"Disable AVX when compiling for Windows" FORCE) "Disable AVX when compiling for Windows" FORCE)
set(WITH_DSO OFF CACHE STRING set(WITH_DSO OFF CACHE STRING
"Disable DSO when compiling for Windows" FORCE) "Disable DSO when compiling for Windows" FORCE)
set(WITH_MKL OFF CACHE STRING
"Disable MKL when compiling for Windows" FORCE)
endif() endif()
set(THIRD_PARTY_PATH "${CMAKE_BINARY_DIR}/third_party" CACHE STRING set(THIRD_PARTY_PATH "${CMAKE_BINARY_DIR}/third_party" CACHE STRING
......
...@@ -32,9 +32,7 @@ if (WITH_GPU AND TENSORRT_FOUND) ...@@ -32,9 +32,7 @@ if (WITH_GPU AND TENSORRT_FOUND)
add_subdirectory(tensorrt) add_subdirectory(tensorrt)
endif() endif()
if (NOT WIN32) register_operators(EXCLUDES warpctc_op)
register_operators(EXCLUDES warpctc_op)
endif()
# warpctc_cudnn need cudnn 7 above # warpctc_cudnn need cudnn 7 above
if (WITH_GPU AND NOT WIN32) if (WITH_GPU AND NOT WIN32)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册