Fixing error: "member may not be initialized" due to constexpr at Windows (#48836)

datumbox · facebook-github-bot · commit e429d05015bf · 2020-12-06T10:22:48.000-08:00
Summary: Fixes #48835 Fixes #48716 Pull Request resolved: #48836 Reviewed By: malfet Differential Revision: D25335829 Pulled By: datumbox fbshipit-source-id: 807182e9afa3bb314dbb85bfcd9589a2c319a7db
diff --git a/torch/csrc/jit/ir/ir.cpp b/torch/csrc/jit/ir/ir.cpp
@@ -2061,8 +2061,8 @@ TypePtr NamedValue::type() const {
   }
 }
 
-constexpr Symbol ProfileOp::Kind;
-constexpr Symbol ProfileOptionalOp::Kind;
+const Symbol ProfileOp::Kind = ::c10::prim::profile;
+const Symbol ProfileOptionalOp::Kind = ::c10::prim::profile_optional;
 
 OperatorSet::OperatorSet(std::initializer_list<const char*> sig_literals) {
   for (const char* sig : sig_literals) {
diff --git a/torch/csrc/jit/ir/ir.h b/torch/csrc/jit/ir/ir.h
@@ -1326,7 +1326,7 @@ inline const Graph* Value::owningGraph() const {
 
 /************* All nodes not required to be defined before Graph **************/
 struct ProfileOp : public Node {
-  static constexpr Symbol Kind = ::c10::prim::profile;
+  static const Symbol Kind;
   ProfileOp(Graph* graph, std::function<void(std::vector<IValue>&)> callback)
       : Node(graph, ::c10::prim::profile), callback_(std::move(callback)) {}
 
@@ -1346,7 +1346,7 @@ struct ProfileOp : public Node {
 };
 
 struct TORCH_API ProfileOptionalOp : public Node {
-  static constexpr Symbol Kind = ::c10::prim::profile_optional;
+  static const Symbol Kind;
   ProfileOptionalOp(
       Graph* graph,
       std::function<void(std::vector<IValue>&)> callback)
diff --git a/torch/csrc/jit/serialization/pickler.h b/torch/csrc/jit/serialization/pickler.h
@@ -209,7 +209,7 @@ class TORCH_API Pickler {
   // the left of a '::', its type cannot be deduced by the compiler so one must
   // explicitly instantiate the template, i.e. push<int>(int) works, push(int)
   // does not)
-  static constexpr size_t kBufferSize = 256;
+  static CONSTEXPR_EXCEPT_WIN_CUDA size_t kBufferSize = 256;
   template <typename T>
   void push(typename std::common_type<T>::type value) {
     const char* begin = reinterpret_cast<const char*>(&value);

Original file line number	Diff line number	Diff line change
`@@ -2061,8 +2061,8 @@ TypePtr NamedValue::type() const {`
`2061`	`2061`	`}`
`2062`	`2062`	`}`
`2063`	`2063`
`2064`		`-constexpr Symbol ProfileOp::Kind;`
`2065`		`-constexpr Symbol ProfileOptionalOp::Kind;`
	`2064`	`+const Symbol ProfileOp::Kind = ::c10::prim::profile;`
	`2065`	`+const Symbol ProfileOptionalOp::Kind = ::c10::prim::profile_optional;`
`2066`	`2066`
`2067`	`2067`	`OperatorSet::OperatorSet(std::initializer_list<const char*> sig_literals) {`
`2068`	`2068`	`for (const char* sig : sig_literals) {`