Skip to content

Commit 8cf2c83

Browse files
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into Adding_binary_max_min_div_mod
2 parents 168842f + 888631b commit 8cf2c83

File tree

149 files changed

+3384
-5064
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+3384
-5064
lines changed

cmake/external/cutlass.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include(ExternalProject)
1717
set(CUTLASS_PREFIX_DIR ${THIRD_PARTY_PATH}/cutlass)
1818

1919
set(CUTLASS_REPOSITORY https://github.com/NVIDIA/cutlass.git)
20-
set(CUTLASS_TAG v2.9.1)
20+
set(CUTLASS_TAG v2.10.0)
2121

2222
include_directories("${THIRD_PARTY_PATH}/cutlass/src/extern_cutlass/")
2323
include_directories("${THIRD_PARTY_PATH}/cutlass/src/extern_cutlass/include/")

cmake/external/dgc.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ set(DGC_INCLUDE_DIR
2323
set(DGC_LIBRARIES
2424
"${DGC_INSTALL_DIR}/lib/libdgc.a"
2525
CACHE FILEPATH "dgc library." FORCE)
26-
set(DGC_URL "https://fleet.bj.bcebos.com/dgc/collective_f66ef73.tgz")
26+
set(DGC_URL "https://fleet.bj.bcebos.com/dgc/collective_7369ff.tgz")
2727
include_directories(${DGC_INCLUDE_DIR})
2828

2929
ExternalProject_Add(
3030
extern_dgc
3131
${EXTERNAL_PROJECT_LOG_ARGS}
3232
URL ${DGC_URL}
33-
URL_MD5 "94e6fa1bc97169d0e1aad44570fe3251"
33+
URL_MD5 "ede459281a0f979da8d84f81287369ff"
3434
PREFIX "${DGC_PREFIX_DIR}"
3535
CONFIGURE_COMMAND ""
3636
BUILD_COMMAND make -j${NPROC}

cmake/external/xpu.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set(XPU_RT_LIB_NAME "libxpurt.so")
1010
if(NOT DEFINED XPU_BASE_URL)
1111
set(XPU_BASE_URL_WITHOUT_DATE
1212
"https://baidu-kunlun-product.su.bcebos.com/KL-SDK/klsdk-dev")
13-
set(XPU_BASE_URL "${XPU_BASE_URL_WITHOUT_DATE}/20221124")
13+
set(XPU_BASE_URL "${XPU_BASE_URL_WITHOUT_DATE}/20221201")
1414
else()
1515
set(XPU_BASE_URL "${XPU_BASE_URL}")
1616
endif()

paddle/fluid/framework/ir/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ pass_library(delete_c_identity_op_pass inference)
104104
pass_library(preln_residual_bias_fuse_pass inference)
105105
pass_library(delete_fill_constant_op_pass inference)
106106
pass_library(constant_folding_pass inference)
107+
pass_library(float_to_half_pass inference)
107108
pass_library(conv2d_fusion_layout_transfer_pass inference)
108109
pass_library(simplify_with_basic_ops_pass base)
109110
pass_library(fc_elementwise_layernorm_fuse_pass base)

0 commit comments

Comments
 (0)