From 3fcfcd51fbb951f9f96269b62fb528fa6dd0a720 Mon Sep 17 00:00:00 2001
From: sneaxiy <32832641+sneaxiy@users.noreply.github.com>
Date: Thu, 2 Jun 2022 18:24:23 +0800
Subject: [PATCH] Fix bug of CUDAGraph kernel parameter comparation (#43163)

* fix cuda graph sizeof

* fix tuple type
---
 paddle/fluid/platform/device/gpu/cuda/cuda_graph.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/paddle/fluid/platform/device/gpu/cuda/cuda_graph.h b/paddle/fluid/platform/device/gpu/cuda/cuda_graph.h
index 8f84f26adb..083478ed7e 100644
--- a/paddle/fluid/platform/device/gpu/cuda/cuda_graph.h
+++ b/paddle/fluid/platform/device/gpu/cuda/cuda_graph.h
@@ -60,17 +60,18 @@ template <typename Return, typename... FuncArgs,
           Return (*kernel_fn)(FuncArgs...)>
 struct IsSameKernelHelper<Return (*)(FuncArgs...), kernel_fn> {
  private:
+  using FuncArgsTuple = decltype(std::make_tuple(std::declval<FuncArgs>()...));
+
   template <typename TupleT, size_t IDX, bool IsEnd /*=false*/>
   struct Impl {
     static bool Compare(const CUDAKernelParams &params, const TupleT &args) {
-      using CompareT = typename std::tuple_element<IDX, TupleT>::type;
+      using CompareT = typename std::tuple_element<IDX, FuncArgsTuple>::type;
       if (!IsBitwiseEqual<CompareT>(params.As<CompareT>(IDX),
                                     std::get<IDX>(args))) {
         return false;
       }
 
-      constexpr auto NewIsEnd =
-          (IDX + 1 == sizeof(std::tuple_size<TupleT>::value));
+      constexpr auto NewIsEnd = (IDX + 1 == std::tuple_size<TupleT>::value);
       return Impl<TupleT, IDX + 1, NewIsEnd>::Compare(params, args);
     }
   };
@@ -83,8 +84,6 @@ struct IsSameKernelHelper<Return (*)(FuncArgs...), kernel_fn> {
   };
 
  public:
-  using FuncArgsTuple = decltype(std::make_tuple(std::declval<FuncArgs>()...));
-
   template <typename... Args>
   static bool Compare(const CUDAKernelParams &params, Args... args) {
     constexpr auto kNumArgs = sizeof...(FuncArgs);
-- 
GitLab