Skip to content

Commit 201c71f

Browse files
committed
merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into npu test=document_fix
2 parents fe97500 + 181e2e3 commit 201c71f

31 files changed

+45
-617
lines changed

cmake/external/xpu.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set(XPU_XFA_LIB_NAME "libxpu_flash_attention.so")
3030
set(XPU_XPUDNN_LIB_NAME "libxpu_dnn.so")
3131

3232
if(NOT DEFINED XPU_XHPC_BASE_DATE)
33-
set(XPU_XHPC_BASE_DATE "dev/20250405")
33+
set(XPU_XHPC_BASE_DATE "dev/20250412")
3434
endif()
3535
set(XPU_XCCL_BASE_VERSION "3.0.2.5") # For XRE5
3636
if(NOT DEFINED XPU_XFT_BASE_VERSION)
@@ -46,7 +46,7 @@ if(NOT DEFINED XPU_XRE_BASE_VERSION)
4646
endif()
4747

4848
if(WITH_XPU_XRE5)
49-
set(XPU_XPTI_BASE_VERSION "0.1.0")
49+
set(XPU_XPTI_BASE_VERSION "0.2.0")
5050
else()
5151
set(XPU_XPTI_BASE_VERSION "0.0.1")
5252
endif()

paddle/cinn/ir/group_schedule/tactic/tile_broadcast_tactic.cc

+2
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ bool IsElementwiseOrBroadcast(const ir::Store& dst, const ir::Load& src) {
206206

207207
bool CheckAllElementwiseOrBroadcast(ir::IRSchedule* sch) {
208208
for (auto& block : sch->GetAllBlocks()) {
209+
if (ir::analyzer::IsReductionSBlock(block)) return false;
209210
ir::Expr store = ir::analyzer::GetStoreOfSBlock(block);
210211
auto* store_node = store.As<ir::Store>();
211212
for (auto& load : CollectLoads(store_node->value)) {
@@ -564,6 +565,7 @@ void TileBroadcastTactic::Apply(ir::IRSchedule* sch,
564565
block_size = CalcNumWarps(preserved_size_ >> 5);
565566
if (block_size == -1) {
566567
applied_layout_ = BroadcastLayout::Invalid;
568+
return;
567569
}
568570
block_size = std::clamp(block_size << 5, 128, 1024);
569571
}

paddle/fluid/framework/op_version_proto.cc

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ const std::unordered_map<std::string, uint32_t>& GetLegacyOpVersions() {
6161
{"depthwise_conv2d_transpose", 1},
6262
{"conv2d", 1},
6363
{"lamb", 1},
64-
{"send_and_recv", 1},
6564
{"gaussian_random", 1},
6665
{"unique_consecutive", 1},
6766
{"conv3d", 1},

paddle/fluid/operators/collective/c_allgather_op.cc

-78
This file was deleted.

paddle/fluid/operators/collective/c_allgather_op.h

-59
This file was deleted.

0 commit comments

Comments
 (0)