From 91706d3b5181c38fb158b4c6aecd620d7c6a3df3 Mon Sep 17 00:00:00 2001
From: zhaoyuchen2018 <45989343+zhaoyuchen2018@users.noreply.github.com>
Date: Thu, 9 Jan 2020 23:05:39 +0800
Subject: [PATCH] [cherry-pick] Fix windows build no kernel issue, test=develop
 (#22105) (#22184)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

windows conv_fusion failed as no kernel， explicit declare lambda

Signed-off-by: zhaoyuchen <zhaoyuchen01@baidu.com>
---
 paddle/fluid/operators/conv_fusion_op.cu | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/paddle/fluid/operators/conv_fusion_op.cu b/paddle/fluid/operators/conv_fusion_op.cu
index 17edccb4ea9..d84050fec8f 100644
--- a/paddle/fluid/operators/conv_fusion_op.cu
+++ b/paddle/fluid/operators/conv_fusion_op.cu
@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
+#include <array>
 #include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/operators/conv_cudnn_helper.h"
 #include "paddle/fluid/operators/conv_cudnn_op_cache.h"
 #include "paddle/fluid/operators/conv_op.h"
 #include "paddle/fluid/operators/math/padding.h"
@@ -208,7 +208,8 @@ class CUDNNConvFusionOpKernel : public framework::OpKernel<T> {
           workspace_size_limit, &algo));
       VLOG(3) << "cuDNN forward algo " << algo;
     } else {
-      auto search_func = [&]() {
+      std::function<cudnnConvolutionFwdAlgo_t()> search_func =
+          [&]() -> cudnnConvolutionFwdAlgo_t {
         int returned_algo_count;
         std::array<cudnnConvolutionFwdAlgoPerf_t, kNUM_CUDNN_FWD_ALGS>
             fwd_perf_stat;
-- 
GitLab