Merge branch 'develop' into b68

Author: co63oc

paddle/phi/backends/dynload/nvtx.h

@@ -14,6 +14,9 @@ limitations under the License. */
 #pragma once
 #ifndef _WIN32
 #include <cuda.h>
+#ifndef NVTX_SUPPRESS_V2_DEPRECATION_WARNING
+#define NVTX_SUPPRESS_V2_DEPRECATION_WARNING
+#endif
 #include <nvToolsExt.h>
 
 #include <mutex>  // NOLINT

paddle/phi/kernels/abs_grad_kernel.h

@@ -20,13 +20,13 @@
 namespace phi {
 
 template <typename T, typename Context>
-void AbsGradKernel(const Context& ctx,
+void AbsGradKernel(const Context& dev_ctx,
                    const DenseTensor& x,
                    const DenseTensor& dout,
                    DenseTensor* dx);
 
 template <typename T, typename Context>
-void AbsDoubleGradKernel(const Context& ctx,
+void AbsDoubleGradKernel(const Context& dev_ctx,
                          const DenseTensor& x,
                          const DenseTensor& ddx,
                          DenseTensor* ddout);

paddle/phi/kernels/abs_kernel.h

@@ -20,6 +20,6 @@
 namespace phi {
 
 template <typename T, typename Context>
-void AbsKernel(const Context& ctx, const DenseTensor& x, DenseTensor* out);
+void AbsKernel(const Context& dev_ctx, const DenseTensor& x, DenseTensor* out);
 
 }  // namespace phi

paddle/phi/kernels/assert_kernel.cc

@@ -22,7 +22,7 @@
 namespace phi {
 
 template <typename T, typename Context>
-void AssertKernel(const Context& ctx,
+void AssertKernel(const Context& dev_ctx,
                   const DenseTensor& cond,
                   const std::vector<const DenseTensor*>& data,
                   int64_t summarize) {

paddle/phi/kernels/assert_kernel.h

@@ -19,7 +19,7 @@
 namespace phi {
 
 template <typename T, typename Context>
-void AssertKernel(const Context& ctx,
+void AssertKernel(const Context& dev_ctx,
                   const DenseTensor& cond,
                   const std::vector<const DenseTensor*>& data,
                   int64_t summarize);

paddle/phi/kernels/atan2_grad_kernel.h

@@ -19,7 +19,7 @@
 namespace phi {
 
 template <typename T, typename Context>
-void Atan2GradKernel(const Context& ctx,
+void Atan2GradKernel(const Context& dev_ctx,
                      const DenseTensor& x,
                      const DenseTensor& y,
                      const DenseTensor& out_grad,

paddle/phi/kernels/atan2_kernel.h

@@ -19,7 +19,7 @@
 namespace phi {
 
 template <typename T, typename Context>
-void Atan2Kernel(const Context& ctx,
+void Atan2Kernel(const Context& dev_ctx,
                  const DenseTensor& x,
                  const DenseTensor& y,
                  DenseTensor* out);

paddle/phi/kernels/bernoulli_kernel.h

@@ -28,7 +28,7 @@ namespace phi {
  * @param  out   A Tensor filled with random binary number
  */
 template <typename T, typename Context>
-void BernoulliKernel(const Context& ctx,
+void BernoulliKernel(const Context& dev_ctx,
                      const DenseTensor& x,
                      DenseTensor* out);
 

paddle/phi/kernels/binomial_kernel.h

@@ -29,7 +29,7 @@ namespace phi {
  * @param  out          A Tensor filled with returned random value
  */
 template <typename T, typename Context>
-void BinomialiKernel(const Context& ctx,
+void BinomialiKernel(const Context& dev_ctx,
                      const DenseTensor& count,
                      const DenseTensor& prob,
                      DenseTensor* out);

paddle/phi/kernels/bmm_grad_kernel.h

@@ -19,7 +19,7 @@
 namespace phi {
 
 template <typename T, typename Context>
-void BmmGradKernel(const Context& ctx,
+void BmmGradKernel(const Context& dev_ctx,
                    const DenseTensor& x,
                    const DenseTensor& y,
                    const DenseTensor& out_grad,