switch to 9.2

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)
 

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})

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 {

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

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"

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"

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);

paddle/fluid/inference/api/helper.h

@@ -14,7 +14,6 @@
 
 #pragma once
 
-#include <sys/time.h>
 #include <algorithm>
 #include <numeric>
 #include <sstream>

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 {

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
   }
 };