remove irrelevant fix for mkl

test=develop

cmake/external/cub.cmake

@@ -32,4 +32,4 @@ endif()
 
 add_dependencies(cub extern_cub)
 
-LIST(APPEND external_project_dependencies cub)
+LIST(APPEND externl_project_dependencies cub)

cmake/external/dlpack.cmake

@@ -28,4 +28,4 @@ endif()
 
 add_dependencies(dlpack extern_dlpack)
 
-LIST(APPEND external_project_dependencies dlpack)
+LIST(APPEND externl_project_dependencies dlpack)

cmake/external/python.cmake

@@ -23,12 +23,9 @@ FIND_PACKAGE(PythonLibs ${PY_VERSION} REQUIRED)
 
 if(WIN32)
     execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c"
-"from distutils import sysconfig as s;import sys;import struct;import sysconfig;
+"from distutils import sysconfig as s;import sys;import struct;
 print(sys.prefix);
 print(s.get_config_var('LDVERSION') or s.get_config_var('VERSION'));
-print(sysconfig.get_platform());
-print(sysconfig.get_config_var('py_version_nodot'));
-print(sysconfig.get_config_var('SOABI'));
 "
             RESULT_VARIABLE _PYTHON_SUCCESS
             OUTPUT_VARIABLE _PYTHON_VALUES
@@ -44,9 +41,6 @@ print(sysconfig.get_config_var('SOABI'));
     string(REGEX REPLACE "\n" ";" _PYTHON_VALUES ${_PYTHON_VALUES})
     list(GET _PYTHON_VALUES 0 PYTHON_PREFIX)
     list(GET _PYTHON_VALUES 1 PYTHON_LIBRARY_SUFFIX)
-    list(GET _PYTHON_VALUES 2 SYS_PLATFORM)
-    list(GET _PYTHON_VALUES 3 PYTHON_SHORT_VERSION_NODOT)
-    list(GET _PYTHON_VALUES 4 PYTHON_SOABI)
 
     # Make sure all directory separators are '/'
     string(REGEX REPLACE "\\\\" "/" PYTHON_PREFIX ${PYTHON_PREFIX})

paddle/fluid/framework/details/all_reduce_op_handle.cc

@@ -50,7 +50,7 @@ void AllReduceOpHandle::RunImpl() {
 
 // FIXME(typhoonzero): If scope0(global scope) have NCCL_ID_VAR,
 // this is a distributed or inter-process call, find a better way.
-#if defined(PADDLE_WITH_CUDA) && !defined(_WIN32)
+#ifdef PADDLE_WITH_CUDA
   if (NoDummyInputSize() == 1 &&
       local_scopes_[0]->FindLocalVar(NCCL_ID_VARNAME) == nullptr) {
 #else

paddle/fluid/platform/dynload/dynamic_loader.cc

@@ -227,6 +227,8 @@ void* GetTensorRtDsoHandle() {
 void* GetMKLMLDsoHandle() {
 #if defined(__APPLE__) || defined(__OSX__)
   return GetDsoHandleFromSearchPath(FLAGS_mklml_dir, "libmklml_intel.dylib");
+#elif defined(_WIN32)
+  return GetDsoHandleFromSearchPath(FLAGS_mklml_dir, "mklml.dll");
 #else
   return GetDsoHandleFromSearchPath(FLAGS_mklml_dir, "libmklml_intel.so");
 #endif