Merge branch 'windows/build' into windows/online

test=develop
7 years ago · 326a773586
parent cc319f64cb 8443961a4f
commit 326a773586
2 changed files with 3 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -135,6 +135,8 @@ if (WIN32)
            "Disable AVX when compiling for Windows" FORCE)
    set(WITH_DSO OFF CACHE STRING
            "Disable DSO when compiling for Windows" FORCE)
+    set(WITH_MKL OFF CACHE STRING
+            "Disable MKL when compiling for Windows" FORCE)
 endif()

 set(THIRD_PARTY_PATH "${CMAKE_BINARY_DIR}/third_party" CACHE STRING
--- a/paddle/fluid/operators/CMakeLists.txt
+++ b/paddle/fluid/operators/CMakeLists.txt
@ -32,9 +32,7 @@ if (WITH_GPU AND TENSORRT_FOUND)
    add_subdirectory(tensorrt)
 endif()

-if (NOT WIN32)
-    register_operators(EXCLUDES warpctc_op)
-endif()
+register_operators(EXCLUDES warpctc_op)

 # warpctc_cudnn need cudnn 7 above
 if (WITH_GPU AND NOT WIN32)