diff --git a/cmake/cuda.cmake b/cmake/cuda.cmake
index 03c73786a6c31868b1893bfcb319e43e37db1a3d..2a5588a46bfd74ceadb1ac9e817427d90adef19b 100644
--- a/cmake/cuda.cmake
+++ b/cmake/cuda.cmake
@@ -169,9 +169,9 @@ set(CUDA_PROPAGATE_HOST_FLAGS OFF)
 
 # Release/Debug flags set by cmake. Such as -O3 -g -DNDEBUG etc.
 # So, don't set these flags here.
+#list(APPEND CUDA_NVCC_FLAGS "-std=c++14")
 if (NOT WIN32) # windows msvc2015 support c++11 natively. 
 # -std=c++11 -fPIC not recoginize by msvc, -Xcompiler will be added by cmake.
-list(APPEND CUDA_NVCC_FLAGS "-std=c++11")
 list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -fPIC")
 endif(NOT WIN32)
 
diff --git a/cmake/flags.cmake b/cmake/flags.cmake
index e69ba70e78de2ce8b6f65f2128f8d5a86140d195..3dffacdacbdb18a2f3fbc670234022dddf360e06 100644
--- a/cmake/flags.cmake
+++ b/cmake/flags.cmake
@@ -136,7 +136,7 @@ else(NOT WIN32)
 set(COMMON_FLAGS
     "/w") #disable all warnings
 set(GPU_COMMON_FLAGS
-    /w) #disable all warnings
+    -w) #disable all warnings
 
 endif(NOT WIN32)
 
@@ -160,7 +160,7 @@ if(UNIX AND NOT APPLE)
   set(LINUX TRUE)
 endif(UNIX AND NOT APPLE)
 
-
+set(GPU_COMMON_FLAGS -std=c++11 ${GPU_COMMON_FLAGS})
 foreach(flag ${COMMON_FLAGS})
     safe_set_cflag(CMAKE_C_FLAGS ${flag})
     safe_set_cxxflag(CMAKE_CXX_FLAGS ${flag})
diff --git a/paddle/fluid/framework/eigen.h b/paddle/fluid/framework/eigen.h
index e23472cef2fab28296e2d016b6da24569cca6f9b..d381e50dea26d1eecb8cd17af6f1a942bd906c18 100644
--- a/paddle/fluid/framework/eigen.h
+++ b/paddle/fluid/framework/eigen.h
@@ -17,6 +17,7 @@ limitations under the License. */
 #define GLOG_NO_ABBREVIATED_SEVERITIES
 
 #include "paddle/fluid/framework/tensor.h"
+#include <math_constants.h>
 #include "unsupported/Eigen/CXX11/Tensor"
 
 namespace paddle {
diff --git a/paddle/fluid/framework/ir/node.cc b/paddle/fluid/framework/ir/node.cc
index 03ed6da1046495ade890f1e8e0c34654883254b7..cc7fd23be7914e6867b8326bc79dd972288672ba 100644
--- a/paddle/fluid/framework/ir/node.cc
+++ b/paddle/fluid/framework/ir/node.cc
@@ -18,7 +18,7 @@ namespace paddle {
 namespace framework {
 namespace ir {
 
-constexpr char Node::kControlDepVarName[];
+char Node::kControlDepVarName[];
 int Node::count_ = 0;
 }  // namespace ir
 }  // namespace framework
diff --git a/paddle/fluid/framework/op_registry.h b/paddle/fluid/framework/op_registry.h
index 0e6e74293c30d5f8caa58fe6bfa63657d2669b46..2bd2dd4200449c61e1d6c08fa9fa58323f59b523 100644
--- a/paddle/fluid/framework/op_registry.h
+++ b/paddle/fluid/framework/op_registry.h
@@ -23,6 +23,10 @@ limitations under the License. */
 #include <unordered_map>
 #include <unordered_set>
 
+#if defined(_WIN32)
+#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
+#endif
+
 #include "glog/logging.h"  // For VLOG()
 #include "paddle/fluid/framework/attribute.h"
 #include "paddle/fluid/framework/details/op_registry.h"
diff --git a/paddle/fluid/framework/tensor.h b/paddle/fluid/framework/tensor.h
index 4cf95fa0ae07823289fbf337062190f05e6c6bcf..bb52787b4b077679f1100fc4c24545b1ceb347f2 100644
--- a/paddle/fluid/framework/tensor.h
+++ b/paddle/fluid/framework/tensor.h
@@ -20,6 +20,10 @@ limitations under the License. */
 #include <typeindex>
 #include <vector>
 
+#if defined(_WIN32)
+#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
+#endif
+
 #include "paddle/fluid/framework/data_layout.h"
 #include "paddle/fluid/framework/ddim.h"
 #include "paddle/fluid/memory/memory.h"
diff --git a/paddle/fluid/framework/tensor_util.h b/paddle/fluid/framework/tensor_util.h
index addf71f4dc872b5950d342e5cffd73b485729d64..4457382ade37a12f5f3613fc4113fbf1f6f91124 100644
--- a/paddle/fluid/framework/tensor_util.h
+++ b/paddle/fluid/framework/tensor_util.h
@@ -57,8 +57,8 @@ void TensorToVector(const Tensor& src, const platform::DeviceContext& ctx,
 template <typename T>
 void TesnorToVector(const Tensor& src, std::vector<T>* dst);
 
-// bool TensorContainsNAN(const framework::Tensor& tensor);
-// bool TensorContainsInf(const framework::Tensor& tensor);
+bool TensorContainsNAN(const framework::Tensor& tensor);
+bool TensorContainsInf(const framework::Tensor& tensor);
 
 void TensorToStream(std::ostream& os, const Tensor& tensor,
                     const platform::DeviceContext& dev_ctx);
diff --git a/paddle/fluid/inference/api/helper.h b/paddle/fluid/inference/api/helper.h
index 90c4b56d5363ebaccd64c2cf6b70abad0be4602a..4b64c2dc25213b8d6a3af3c35005b86e3b0c68b4 100644
--- a/paddle/fluid/inference/api/helper.h
+++ b/paddle/fluid/inference/api/helper.h
@@ -14,7 +14,6 @@
 
 #pragma once
 
-#include <sys/time.h>
 #include <algorithm>
 #include <numeric>
 #include <sstream>
diff --git a/paddle/fluid/operators/accuracy_op.h b/paddle/fluid/operators/accuracy_op.h
index 803244dd48efc634bf5e654a35cb3dd572842882..8d3313db9687937db9b6f326348fcb273a615d65 100644
--- a/paddle/fluid/operators/accuracy_op.h
+++ b/paddle/fluid/operators/accuracy_op.h
@@ -14,6 +14,7 @@ limitations under the License. */
 
 #pragma once
 #include <algorithm>
+
 #include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
diff --git a/paddle/fluid/operators/cast_op.h b/paddle/fluid/operators/cast_op.h
index 469fe13774f717f858d5725cad0af40e5d603ece..ea710aaad5cf94aeb0db0d905c13decf742f60f9 100644
--- a/paddle/fluid/operators/cast_op.h
+++ b/paddle/fluid/operators/cast_op.h
@@ -54,17 +54,12 @@ class CastOpKernel : public framework::OpKernel<InT> {
   void Compute(const framework::ExecutionContext& context) const override {
     auto* in = context.Input<framework::Tensor>("X");
     auto* out = context.Output<framework::Tensor>("Out");
-#if !defined(_MSC_VER)
+
     framework::VisitDataType(
         static_cast<framework::proto::VarType::Type>(
             context.Attr<int>("out_dtype")),
         CastOpFunctor<DeviceContext, InT>(
             in, out, context.template device_context<DeviceContext>()));
-#else
-    auto type = static_cast<framework::proto::VarType::Type>(
-        context.Attr<int>("out_dtype"));
-    trans
-#endif  // msvc
   }
 };