Skip to content

Commit abdfd76

Browse files
committed
Fix compiling error when cinn is not enabled.
1 parent dee0925 commit abdfd76

File tree

6 files changed

+10
-34
lines changed

6 files changed

+10
-34
lines changed

paddle/fluid/pir/dialect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ set(op_dialect_deps
309309
phi
310310
common
311311
pir
312-
ap_pir
313312
type_info
314313
string_helper
315314
global_utils

paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/ap_infer_sym.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ bool ApTrivialFusionBeginOpInferSymbolicShape(
3333
return true;
3434
#else
3535
PADDLE_THROW(phi::errors::Unimplemented(
36-
"ap_facade is not implemented when cinn is not enabled."));
36+
"ap_trivial_fusion_begin is not implemented when cinn is not enabled."));
3737
return false;
3838
#endif
3939
}
@@ -47,7 +47,7 @@ bool ApTrivialFusionEndOpInferSymbolicShape(
4747
return true;
4848
#else
4949
PADDLE_THROW(phi::errors::Unimplemented(
50-
"ap_facade is not implemented when cinn is not enabled."));
50+
"ap_trivial_fusion_end is not implemented when cinn is not enabled."));
5151
return false;
5252
#endif
5353
}

paddle/phi/kernels/CMakeLists.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,11 @@ endif()
242242
# Remove AP kernel when CINN is not enabled.
243243
if(NOT WITH_CINN)
244244
list(REMOVE_ITEM kernel_cu "gpu/ap_facade_kernel.cu"
245-
"gpu/ap_variadic_kernel.cu")
245+
"gpu/ap_trivial_fusion_begin_kernel.cu"
246+
"gpu/ap_trivial_fusion_end_kernel.cu" "gpu/ap_variadic_kernel.cu")
246247
list(REMOVE_ITEM kernel_gpu "gpu/ap_facade_kernel.cu"
247-
"gpu/ap_variadic_kernel.cu")
248+
"gpu/ap_trivial_fusion_begin_kernel.cu"
249+
"gpu/ap_trivial_fusion_end_kernel.cu" "gpu/ap_variadic_kernel.cu")
248250
endif()
249251

250252
set(cc_search_pattern

paddle/phi/kernels/gpu/ap_facade_kernel.cu

-9
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <mutex>
16-
#include <unordered_map>
17-
#include "glog/logging.h"
18-
#include "jitify.hpp" // NOLINT
1915
#include "paddle/common/enforce.h"
20-
2116
#include "paddle/phi/backends/gpu/gpu_context.h"
22-
#include "paddle/phi/backends/gpu/gpu_device_function.h"
2317
#include "paddle/phi/core/dense_tensor.h"
2418
#include "paddle/phi/core/kernel_registry.h"
25-
#include "paddle/phi/kernels/funcs/elementwise_base.h"
26-
#include "paddle/phi/kernels/impl/activation_grad_impl.h"
27-
#include "paddle/phi/kernels/impl/activation_impl.h"
2819

2920
namespace phi {
3021

paddle/phi/kernels/gpu/ap_trivial_fusion_begin_kernel.cu

+2-10
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <mutex>
16-
#include <unordered_map>
17-
#include "glog/logging.h"
18-
#include "jitify.hpp" // NOLINT
1915
#include "paddle/common/enforce.h"
20-
2116
#include "paddle/phi/backends/gpu/gpu_context.h"
22-
#include "paddle/phi/backends/gpu/gpu_device_function.h"
17+
#include "paddle/phi/core/dense_tensor.h"
2318
#include "paddle/phi/core/kernel_registry.h"
24-
#include "paddle/phi/kernels/funcs/elementwise_base.h"
25-
#include "paddle/phi/kernels/impl/activation_grad_impl.h"
26-
#include "paddle/phi/kernels/impl/activation_impl.h"
2719

2820
namespace phi {
2921

@@ -33,7 +25,7 @@ void ApTrivialFusionBeginKernel(
3325
const paddle::optional<std::vector<const DenseTensor*>>& xs,
3426
DenseTensor* out) {
3527
PADDLE_THROW(common::errors::Unimplemented(
36-
"[DEAD CODE] pd_op.ap_trivial_fusion_begin has no kernel registered."));
28+
"pd_op.ap_trivial_fusion_begin has no kernel registered."));
3729
}
3830

3931
} // namespace phi

paddle/phi/kernels/gpu/ap_trivial_fusion_end_kernel.cu

+2-10
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <mutex>
16-
#include <unordered_map>
17-
#include "glog/logging.h"
18-
#include "jitify.hpp" // NOLINT
1915
#include "paddle/common/enforce.h"
20-
2116
#include "paddle/phi/backends/gpu/gpu_context.h"
22-
#include "paddle/phi/backends/gpu/gpu_device_function.h"
17+
#include "paddle/phi/core/dense_tensor.h"
2318
#include "paddle/phi/core/kernel_registry.h"
24-
#include "paddle/phi/kernels/funcs/elementwise_base.h"
25-
#include "paddle/phi/kernels/impl/activation_grad_impl.h"
26-
#include "paddle/phi/kernels/impl/activation_impl.h"
2719

2820
namespace phi {
2921

@@ -33,7 +25,7 @@ void ApTrivialFusionEndKernel(
3325
const paddle::optional<std::vector<const DenseTensor*>>& xs,
3426
DenseTensor* out) {
3527
PADDLE_THROW(common::errors::Unimplemented(
36-
"[DEAD CODE] pd_op.ap_trivial_fusion_end has no kernel registered."));
28+
"pd_op.ap_trivial_fusion_end has no kernel registered."));
3729
}
3830

3931
} // namespace phi

0 commit comments

Comments
 (0)