Fix the mkl build script on windows

test=develop

Fix the mkl build script on windows
test=develop
fa135bbf · peizhilin · b601f2de · fa135bbf · fa135bbf · fa135bbf
6 changed file
--- a/cmake/external/mklml.cmake
+++ b/cmake/external/mklml.cmake
@@ -44,40 +44,36 @@ else()
 endif()
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${MKLML_ROOT}/lib")

-if(WIN32)
-    MESSAGE(WARNING
-    "Please download the MKLML and and put it at " ${THIRD_PARTY_PATH}/install/mklml)
-else()
-    SET(MKLML_PROJECT       "extern_mklml")
-    IF((NOT DEFINED MKLML_VER) OR (NOT DEFINED MKLML_URL))
-      MESSAGE(STATUS "use pre defined download url")
-      SET(MKLML_VER "mklml_lnx_2019.0.20180710" CACHE STRING "" FORCE)
-      SET(MKLML_URL "http://paddlepaddledeps.cdn.bcebos.com/${MKLML_VER}.tgz" CACHE STRING "" FORCE)
+IF((NOT DEFINED MKLML_VER) OR (NOT DEFINED MKLML_URL))
+    MESSAGE(STATUS "use pre defined download url")
+    if(WIN32)
+        SET(MKLML_VER "mklml_win_2019.0.1.20180928" CACHE STRING "" FORCE)
+        SET(MKLML_URL "https://github.com/intel/mkl-dnn/releases/download/v0.17/${MKLML_VER}.zip" CACHE STRING "" FORCE)
+    else()
+        SET(MKLML_VER "mklml_lnx_2019.0.20180710" CACHE STRING "" FORCE)
+        SET(MKLML_URL "http://paddlepaddledeps.cdn.bcebos.com/${MKLML_VER}.tgz" CACHE STRING "" FORCE)
    ENDIF()
-    MESSAGE(STATUS "MKLML_VER: ${MKLML_VER}, MKLML_URL: ${MKLML_URL}")
-    SET(MKLML_SOURCE_DIR    "${THIRD_PARTY_PATH}/mklml")
-    SET(MKLML_DOWNLOAD_DIR  "${MKLML_SOURCE_DIR}/src/${MKLML_PROJECT}")
-
-    FILE(WRITE ${MKLML_DOWNLOAD_DIR}/CMakeLists.txt
-      "PROJECT(MKLML)\n"
-      "cmake_minimum_required(VERSION 3.0)\n"
-      "install(DIRECTORY ${MKLML_VER}/include ${MKLML_VER}/lib \n"
-      "        DESTINATION ${MKLML_DST_DIR})\n")
-
-    ExternalProject_Add(
-        ${MKLML_PROJECT}
-        ${EXTERNAL_PROJECT_LOG_ARGS}
-        PREFIX                ${MKLML_SOURCE_DIR}
-        DOWNLOAD_DIR          ${MKLML_DOWNLOAD_DIR}
-        DOWNLOAD_COMMAND      wget --no-check-certificate ${MKLML_URL} -c -q -O ${MKLML_VER}.tgz
-                              && tar zxf ${MKLML_VER}.tgz
-        DOWNLOAD_NO_PROGRESS  1
-        UPDATE_COMMAND        ""
-        CMAKE_ARGS            -DCMAKE_INSTALL_PREFIX=${MKLML_INSTALL_ROOT}
-        CMAKE_CACHE_ARGS      -DCMAKE_INSTALL_PREFIX:PATH=${MKLML_INSTALL_ROOT}
-    )
 endif()

+SET(MKLML_PROJECT       "extern_mklml")
+MESSAGE(STATUS "MKLML_VER: ${MKLML_VER}, MKLML_URL: ${MKLML_URL}")
+SET(MKLML_SOURCE_DIR    "${THIRD_PARTY_PATH}/mklml")
+SET(MKLML_DOWNLOAD_DIR  "${MKLML_SOURCE_DIR}/src/${MKLML_PROJECT}")
+
+ExternalProject_Add(
+    ${MKLML_PROJECT}
+    ${EXTERNAL_PROJECT_LOG_ARGS}
+    PREFIX                 ${MKLML_SOURCE_DIR}
+    URL                    ${MKLML_URL}
+    DOWNLOAD_DIR          ${MKLML_DOWNLOAD_DIR}
+    DOWNLOAD_NO_PROGRESS  1
+    CONFIGURE_COMMAND     ""
+    BUILD_COMMAND         ""
+    UPDATE_COMMAND ""
+    INSTALL_COMMAND
+        ${CMAKE_COMMAND} -E copy_directory ${MKLML_DOWNLOAD_DIR}/include ${MKLML_INC_DIR} &&
+        ${CMAKE_COMMAND} -E copy_directory ${MKLML_DOWNLOAD_DIR}/lib ${MKLML_LIB_DIR}
+)

 INCLUDE_DIRECTORIES(${MKLML_INC_DIR})


--- a/paddle/fluid/operators/elementwise/elementwise_mul_mkldnn_op.cc
+++ b/paddle/fluid/operators/elementwise/elementwise_mul_mkldnn_op.cc
@@ -19,6 +19,9 @@ limitations under the License. */
 #include "paddle/fluid/platform/mkldnn_helper.h"

 #include "paddle/fluid/operators/math/jit_kernel.h"
+#if defined(_WIN32) && defined(_WINSOCKAPI_)
+#define _WINSOCK2API_ /* Prevent inclusion of winsock2.h */
+#endif
 #include "xbyak/xbyak.h"
 #include "xbyak/xbyak_util.h"


--- a/paddle/fluid/operators/math/detail/lstm_cpu_kernel.h
+++ b/paddle/fluid/operators/math/detail/lstm_cpu_kernel.h
@@ -17,6 +17,12 @@ limitations under the License. */
 #include "paddle/fluid/operators/math/detail/activation_functions.h"
 #include "paddle/fluid/operators/math/lstm_compute.h"

+#if defined(_WIN32)
+#if defined(__AVX2__) || defined(__AVX__)
+inline __m256 operator+=(__m256 a, __m256 b) { return _mm256_add_ps(a, b); }
+#endif
+#endif
+
 namespace paddle {
 namespace operators {
 namespace math {

--- a/paddle/fluid/operators/math/jit_gen.h
+++ b/paddle/fluid/operators/math/jit_gen.h
@@ -18,6 +18,9 @@ limitations under the License. */
 #include <type_traits>
 #include "paddle/fluid/platform/macros.h"

+#if defined(_WIN32) && defined(_WINSOCKAPI_)
+#define _WINSOCK2API_ /* Prevent inclusion of winsock2.h */
+#endif
 #define XBYAK_USE_MMAP_ALLOCATOR
 #include "xbyak/xbyak.h"
 #include "xbyak/xbyak_util.h"

--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -49,23 +49,12 @@ IF(WIN32)
    # Python would use the .pyd by default under Windows series platform
    set(FLUID_DST_DIR ${PADDLE_BINARY_DIR}/python/paddle/fluid/)
    set(FLUID_CORE ${FLUID_DST_DIR}/core.pyd)
-    if(NOT WITH_MKLDNN)
-        get_filename_component(openblas_refpath ${CBLAS_LIBRARIES} DIRECTORY)
-        add_custom_command(OUTPUT ${FLUID_CORE}
-                COMMAND cmake -E copy $<TARGET_FILE:paddle_pybind> ${FLUID_CORE}
-                COMMAND cmake -E copy ${openblas_refpath}/openblas.dll ${FLUID_DST_DIR}
-                DEPENDS paddle_pybind)
-    else(NOT WITH_MKLDNN)
-        add_custom_command(OUTPUT ${FLUID_CORE}
-                COMMAND cmake -E copy $<TARGET_FILE:paddle_pybind> ${FLUID_CORE}
-                DEPENDS paddle_pybind)
-    endif(NOT WITH_MKLDNN)
 ELSE()
    set(FLUID_CORE ${PADDLE_BINARY_DIR}/python/paddle/fluid/core.so)
-    add_custom_command(OUTPUT ${FLUID_CORE}
-            COMMAND cmake -E copy $<TARGET_FILE:paddle_pybind> ${FLUID_CORE}
-            DEPENDS paddle_pybind)
 ENDIF()
+add_custom_command(OUTPUT ${FLUID_CORE}
+        COMMAND cmake -E copy $<TARGET_FILE:paddle_pybind> ${FLUID_CORE}
+        DEPENDS paddle_pybind)
 add_custom_target(copy_paddle_pybind ALL DEPENDS ${FLUID_CORE})

 IF(WIN32)

--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -166,6 +166,12 @@ if '${WITH_MKL}' == 'ON':
    shutil.copy('${MKLML_SHARED_LIB}', libs_path)
    shutil.copy('${MKLML_SHARED_IOMP_LIB}', libs_path)
    package_data['paddle.libs']+=[('libmklml_intel' if os.name != 'nt' else 'mklml') + ext_name, ('libiomp5' if os.name != 'nt' else 'libiomp5md') + ext_name]
+else:
+    # copy the openblas.dll
+    if os.name == 'nt':
+        shutil.copy('${CBLAS_LIBRARIES}', libs_path)
+        package_data['paddle.libs']+=['openblas' + ext_name]
+
 if '${WITH_MKLDNN}' == 'ON':
    if '${CMAKE_BUILD_TYPE}' == 'Release':
        if os.name != 'nt':