[CINN][new hardware] HIP second: op register (#65329)

DongBaiYue · web-flow · commit 485f2ec97e12 · 2024-06-21T13:05:38.000+08:00
diff --git a/paddle/cinn/hlir/op/broadcast.cc b/paddle/cinn/hlir/op/broadcast.cc
@@ -561,7 +561,7 @@ CINN_REGISTER_HELPER(broadcast_ops) {
                 MakeOpFunction(cinn::hlir::op::InferDtypeForBroadcast))
       .set_attr("generate_equations",
                 MakeOpFunction(cinn::hlir::op::GenerateEquationsForBroadcastTo))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForBroadcastTo))
 #endif
diff --git a/paddle/cinn/hlir/op/elementwise.cc b/paddle/cinn/hlir/op/elementwise.cc
@@ -1829,7 +1829,7 @@ CINN_REGISTER_HELPER(elementwise_ops) {
                 MakeOpFunction(cinn::hlir::op::InferDtypeForElementwise))
       .set_attr("generate_equations",
                 MakeOpFunction(cinn::hlir::op::GenerateEquationsForElementwise))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForElementwise))
 #endif
@@ -1847,7 +1847,7 @@ CINN_REGISTER_HELPER(elementwise_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForConstScalar))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForConstScalar))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForConstScalar))
 #endif
@@ -1881,7 +1881,7 @@ CINN_REGISTER_HELPER(elementwise_ops) {
       .set_attr(
           "generate_equations",
           MakeOpFunction(cinn::hlir::op::GenerateEquationsForFillConstant))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForFillConstant))
 #endif
@@ -1899,7 +1899,7 @@ CINN_REGISTER_HELPER(elementwise_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForAssignValue))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForAssignValue))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForAssignValue))
 #endif
diff --git a/paddle/cinn/hlir/op/nn.cc b/paddle/cinn/hlir/op/nn.cc
@@ -2518,7 +2518,7 @@ CINN_REGISTER_HELPER(nn_ops) {
       .set_attr("inferdtype", MakeOpFunction(cinn::hlir::op::InferDtypeForRelu))
       .set_attr("generate_equations",
                 MakeOpFunction(cinn::hlir::op::GenerateEquationsForRelu))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForUnary))
 #endif
@@ -2538,7 +2538,7 @@ CINN_REGISTER_HELPER(nn_ops) {
           "CINNStrategySymbolic", cinn::hlir::op::StrategyForRelu6Symbolic)
       .set_attr("infershape", MakeOpFunction(cinn::hlir::op::InferShapeForRelu))
       .set_attr("inferdtype", MakeOpFunction(cinn::hlir::op::InferDtypeForRelu))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForUnary))
 #endif
@@ -2556,7 +2556,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForConv2d))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForConv2d))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForConv2d))
 #endif
@@ -2576,7 +2576,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForConv2dNCHWc))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForConv2dNCHWc))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForConv2dNCHWc))
 #endif
@@ -2594,7 +2594,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForConv2d))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForConv2d))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForConv2d))
 #endif
@@ -2620,7 +2620,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForBatchNorm))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForBatchNorm))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForBatchNorm))
 #endif
@@ -2637,7 +2637,7 @@ CINN_REGISTER_HELPER(nn_ops) {
       .set_attr("infershape",
                 MakeOpFunction(cinn::hlir::op::InferShapeForPool1d))
       .set_attr("inferdtype", MakeOpFunction(cinn::hlir::op::InferDtypeForPool))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForPool))
 #endif
@@ -2655,7 +2655,7 @@ CINN_REGISTER_HELPER(nn_ops) {
       .set_attr("infershape",
                 MakeOpFunction(cinn::hlir::op::InferShapeForPool2d))
       .set_attr("inferdtype", MakeOpFunction(cinn::hlir::op::InferDtypeForPool))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForPool))
 #endif
@@ -2674,7 +2674,7 @@ CINN_REGISTER_HELPER(nn_ops) {
       .set_attr("infershape",
                 MakeOpFunction(cinn::hlir::op::InferShapeForPool3d))
       .set_attr("inferdtype", MakeOpFunction(cinn::hlir::op::InferDtypeForPool))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForPool))
 #endif
@@ -2692,7 +2692,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForSoftmax))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForSoftmax))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForSoftmax))
 #endif
@@ -2710,7 +2710,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForDropoutInfer))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForDropoutInfer))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForUnary))
 #endif
@@ -2730,7 +2730,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForSelect))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForSelect))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForUnary))
 #endif
diff --git a/paddle/cinn/hlir/op/transform.cc b/paddle/cinn/hlir/op/transform.cc
@@ -2202,7 +2202,7 @@ CINN_REGISTER_HELPER(transform_ops) {
           "over the last two dimensions of the input "
           "tensors X and Y.")
       .set_num_inputs(2)
-#ifdef CINN_WITH_CUDA
+#ifdef CINN_WITH_CUDA || defined(CINN_WITH_HIP)
       .set_num_outputs(1)
 #else
       .set_num_outputs(2)
@@ -2213,7 +2213,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForMatMul))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForMatMul))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForMatMul))
 #endif
@@ -2233,7 +2233,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForSplit))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForSplit))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForSplit))
 #endif
@@ -2255,7 +2255,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForConcat))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForConcat))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForConcat))
 #endif
@@ -2275,7 +2275,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForReverse))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForLayoutTransform))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForReverse))
 #endif
@@ -2295,7 +2295,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForTranspose))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForLayoutTransform))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForTranspose))
 #endif
@@ -2313,7 +2313,7 @@ CINN_REGISTER_HELPER(transform_ops) {
           "CINNStrategy", cinn::hlir::op::StrategyForMul)
       .set_attr("infershape", MakeOpFunction(cinn::hlir::op::InferShapeForMul))
       .set_attr("inferdtype", MakeOpFunction(cinn::hlir::op::InferDtypeForMul))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForMul))
 #endif
@@ -2361,7 +2361,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForLayoutTransform))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForLayoutTransform))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForLayoutTransform))
 #endif
@@ -2381,7 +2381,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForSlice))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForSlice))
-#ifndef CINN_WITH_CUDA
+#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForSlice))
 #endif
