merge conflict

PaddlePaddle · Nov 1, 2021 · 2b6a565 · 2b6a565 · paddle-bot-old · Nov 1, 2021
1 parent 8ee3572
commit 2b6a565
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 32 deletions.
diff --git a/paddle/fluid/framework/operator.cc b/paddle/fluid/framework/operator.cc
@@ -1764,10 +1764,7 @@ OpKernelType OperatorWithKernel::GetKernelTypeForVar(
 KernelSignature OperatorWithKernel::GetExpectedPtenKernelArgs(
     const ExecutionContext& ctx) const {
   if (!KernelSignatureMap::Instance().Has(Type())) {
-<<<<<<< HEAD
-=======
     // TODO(chenweihang): we can generate this map by proto info in compile time
->>>>>>> b9fdd3bc0f4f22af17a81bb8a50a337b563c876b
     KernelArgsNameMakerByOpProto maker(Info().proto_);
     KernelSignatureMap::Instance().Emplace(
         Type(), std::move(maker.GetKernelSignature()));
@@ -1786,15 +1783,9 @@ pten::KernelContext OperatorWithKernel::BuildPtenKernelContext(
   // 5. kernel input is not DenseTensor
   pten::KernelContext op_kernel_ctx(dev_ctx);
 
-<<<<<<< HEAD
-  auto& input_names = std::get<0>(pt_kernel_signature_->second);
-  auto& attr_names = std::get<1>(pt_kernel_signature_->second);
-  auto& output_names = std::get<2>(pt_kernel_signature_->second);
-=======
   auto& input_names = std::get<0>(pt_kernel_signature_->args);
   auto& attr_names = std::get<1>(pt_kernel_signature_->args);
   auto& output_names = std::get<2>(pt_kernel_signature_->args);
->>>>>>> b9fdd3bc0f4f22af17a81bb8a50a337b563c876b
 
   auto input_defs = pt_kernel_->args_def().input_defs();
   auto attr_defs = pt_kernel_->args_def().attribute_defs();
@@ -1853,11 +1844,7 @@ pten::KernelContext OperatorWithKernel::BuildPtenKernelContext(
       // attribtue type by attr_defs
       if (std::type_index(attr.type()) == std::type_index(typeid(float))) {
         op_kernel_ctx.EmplaceBackAttr(
-<<<<<<< HEAD
-            pten::Scalar(BOOST_GET_CONST(float, attr)));
-=======
             std::move(pten::Scalar(BOOST_GET_CONST(float, attr))));
->>>>>>> b9fdd3bc0f4f22af17a81bb8a50a337b563c876b
       } else {
         PADDLE_THROW(platform::errors::Unimplemented(
             "unsupported cast op attribute `%s` to Scalar when construct "

diff --git a/paddle/pten/hapi/lib/linalg.cc b/paddle/pten/hapi/lib/linalg.cc
@@ -25,10 +25,6 @@ limitations under the License. */
 #include "paddle/pten/core/kernel_context.h"
 #include "paddle/pten/hapi/lib/kernel_dispatch.h"
 #include "paddle/pten/hapi/lib/utils/allocator.h"
-<<<<<<< HEAD
-=======
-#include "paddle/pten/infershape/binary.h"
->>>>>>> b9fdd3bc0f4f22af17a81bb8a50a337b563c876b
 
 namespace paddle {
 namespace experimental {

diff --git a/paddle/pten/kernels/cpu/linalg.cc b/paddle/pten/kernels/cpu/linalg.cc
@@ -21,11 +21,8 @@
 #include "paddle/fluid/operators/math/blas.h"
 #include "paddle/fluid/platform/complex.h"
 
-<<<<<<< HEAD
 #include "paddle/pten/kernels/functions/math/matmul_func.h"
 
-=======
->>>>>>> b9fdd3bc0f4f22af17a81bb8a50a337b563c876b
 namespace pten {
 
 template <typename T>
@@ -88,10 +85,7 @@ PT_REGISTER_KERNEL("dot",
                    int64_t,
                    complex64,
                    complex128) {}
-<<<<<<< HEAD
 
 PT_REGISTER_KERNEL(
     "matmul_v2", CPU, ANY, pten::Matmul, float, double, complex64, complex128) {
 }
-=======
->>>>>>> b9fdd3bc0f4f22af17a81bb8a50a337b563c876b
diff --git a/paddle/pten/kernels/cuda/linalg.cu b/paddle/pten/kernels/cuda/linalg.cu
@@ -16,10 +16,7 @@
 
 #include "paddle/pten/core/kernel_registry.h"
 #include "paddle/pten/kernels/functions/eigen/dot.h"
-<<<<<<< HEAD
 #include "paddle/pten/kernels/functions/math/matmul_func.h"
-=======
->>>>>>> b9fdd3bc0f4f22af17a81bb8a50a337b563c876b
 
 // See Note [ Why still include the fluid headers? ]
 #include "paddle/fluid/platform/complex.h"
@@ -34,7 +31,6 @@ void Dot(const CUDAContext& dev_ctx,
   eigen::Dot<CUDAContext, T>(dev_ctx, x, y, out);
 }
 
-<<<<<<< HEAD
 template <typename T>
 void Matmul(const CUDAContext& dev_ctx,
             const DenseTensor& x,
@@ -56,16 +52,11 @@ void Matmul(const CUDAContext& dev_ctx,
       dev_ctx, x, y, out, transpose_x, transpose_y);
 }
 
-=======
->>>>>>> b9fdd3bc0f4f22af17a81bb8a50a337b563c876b
 }  // namespace pten
 
 PT_REGISTER_MODULE(LinalgCUDA);
 
-<<<<<<< HEAD
 using float16 = paddle::platform::float16;
-=======
->>>>>>> b9fdd3bc0f4f22af17a81bb8a50a337b563c876b
 using complex64 = ::paddle::platform::complex<float>;
 using complex128 = ::paddle::platform::complex<double>;