In copy_weights_to_flat_buf_views() explicitly construct tuple (#43244)

malfet · facebook-github-bot · commit e41ca2d9fa11 · 2020-08-18T19:31:51.000-07:00
Summary: In some versions of GCC, tuple constructor from initializer list is marked as explicit, which results in the following compilation error: ``` /var/lib/jenkins/workspace/aten/src/ATen/native/cudnn/RNN.cpp: In function 'std::tuple<at::Tensor, std::vector<at::Tensor, std::allocator<at::Tensor> > > at::native::cudnn_rnn::copy_weights_to_flat_buf_views(at::TensorList, int64_t, int64_t, int64_t, int64_t, int64_t, bool, bool, cudnnDataType_t, const c10::TensorOptions&, bool, bool, bool)': /var/lib/jenkins/workspace/aten/src/ATen/native/cudnn/RNN.cpp:687:35: error: converting to 'std::tuple<at::Tensor, std::vector<at::Tensor, std::allocator<at::Tensor> > >' from initializer list would use explicit constructor 'constexpr std::tuple<_T1, _T2>::tuple(_U1&&, _U2&&) [with _U1 = at::Tensor&; _U2 = std::vector<at::Tensor>&; <template-parameter-2-3> = void; _T1 = at::Tensor; _T2 = std::vector<at::Tensor>]' return {weight_buf, params_arr}; ``` This regression was introduced by #42385 Fixes #{issue number} Pull Request resolved: #43244 Reviewed By: pbelevich Differential Revision: D23205656 Pulled By: malfet fbshipit-source-id: 51470386ad95290c7c99d733fc1fe655aa27d009
diff --git a/aten/src/ATen/native/cudnn/RNN.cpp b/aten/src/ATen/native/cudnn/RNN.cpp
@@ -684,7 +684,7 @@ namespace cudnn_rnn {
       }
     }
 
-    return {weight_buf, params_arr};
+    return std::make_tuple(weight_buf, params_arr);
   }
 
 } // namespace cudnn_rnn

Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,7 @@ namespace cudnn_rnn {`
`684`	`684`	`}`
`685`	`685`	`}`
`686`	`686`
`687`		`- return {weight_buf, params_arr};`
	`687`	`+ return std::make_tuple(weight_buf, params_arr);`
`688`	`688`	`}`
`689`	`689`
`690`	`690`	`} // namespace cudnn_rnn`