some not so useful adjust

test=develop

paddle/fluid/platform/cpu_info.cc

@@ -14,10 +14,6 @@ limitations under the License. */
 
 #include "paddle/fluid/platform/cpu_info.h"
 
-#if defined(_WIN32)
-#define NOMINMAX  // msvc max/min macro conflict with std::min/max
-#endif
-
 #ifdef PADDLE_WITH_XBYAK
 #include "xbyak/xbyak.h"
 #include "xbyak/xbyak_util.h"
@@ -27,7 +23,7 @@ limitations under the License. */
 #include <sys/sysctl.h>
 #include <sys/types.h>
 #elif defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX  // msvc max/min macro conflict with std::min/max
 #include <windows.h>
 #else
 #include <unistd.h>

paddle/fluid/platform/port.h

@@ -37,10 +37,6 @@
 #define GOOGLE_GLOG_DLL_DECL
 #include <io.h>  // _popen, _pclose
 #include <stdio.h>
-#ifdef _WINSOCKAPI_
-/* Prevent inclusion of winsock.h in windows.h */
-#define WIN32_LEAN_AND_MEAN
-#endif
 #include <windows.h>
 #include <numeric>  // std::accumulate in msvc
 #ifndef S_ISDIR     // windows port for sys/stat.h

python/setup.py.in

@@ -174,8 +174,7 @@ else:
         package_data['paddle.libs'] += ['openblas' + ext_name]
 
 if '${WITH_MKLDNN}' == 'ON':
-    if '${CMAKE_BUILD_TYPE}' == 'Release':
+    if '${CMAKE_BUILD_TYPE}' == 'Release' AND os.name != 'nt':
-        if os.name != 'nt':
         # only change rpath in Release mode.
         # TODO(typhoonzero): use install_name_tool to patch mkl libs once
         # we can support mkl on mac.