Fix

PaddlePaddle · Jul 2, 2024 · 4e2e315 · 4e2e315
1 parent d5d5c17
commit 4e2e315
Show file tree

Hide file tree

Showing 15 changed files with 1,285 additions and 1,269 deletions.
diff --git a/paddle/fluid/operators/fused/CMakeLists.txt b/paddle/fluid/operators/fused/CMakeLists.txt
@@ -12,13 +12,11 @@ register_operators(
   fused_feedforward_op
   fused_multi_transformer_op
   fused_multi_transformer_int8_op
-  resnet_unit_op
   fused_gemm_epilogue_op
   resnet_basic_block_op)
 
 if(WITH_XPU)
   op_library(resnet_basic_block_op)
-  op_library(resnet_unit_op)
   op_library(fused_gemm_epilogue_op)
   op_library(fused_attention_op)
   op_library(fused_feedforward_op)
@@ -46,10 +44,6 @@ if(WITH_GPU OR WITH_ROCM)
     op_library(fused_multi_transformer_op)
     op_library(fused_multi_transformer_int8_op)
   endif()
-  # resnet_unit needs cudnn 8.0 above
-  if((NOT WITH_ROCM) AND (NOT ${CUDNN_VERSION} VERSION_LESS 8000))
-    op_library(resnet_unit_op)
-  endif()
 
   if(CUDA_VERSION GREATER_EQUAL 11.6)
     op_library(fused_gemm_epilogue_op)

diff --git a/paddle/fluid/operators/fused/resnet_unit_op.cc b/paddle/fluid/operators/fused/resnet_unit_op.cc
diff --git a/paddle/fluid/operators/fused/resnet_unit_op.cu b/paddle/fluid/operators/fused/resnet_unit_op.cu
diff --git a/paddle/fluid/operators/fused/resnet_unit_op_xpu.cc b/paddle/fluid/operators/fused/resnet_unit_op_xpu.cc