Skip to content

【Hackathon 10th Spring No.51】support gcc15 #79199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swgu98 merged 13 commits into from
Jun 23, 2026
Merged

【Hackathon 10th Spring No.51】support gcc15 #79199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5d9e162
support gcc15
gouzil May 31, 2026
b9c350a
feat update coverage ci and add install gcc15
gouzil Jun 4, 2026
d6ae12e
Merge branch 'develop' of github.com:gouzil/Paddle into feat/support_…
gouzil Jun 4, 2026
59e4001
ci rm git build
gouzil Jun 4, 2026
eb40c6d
fix Coverage git
gouzil Jun 5, 2026
6ae79bc
Merge branch 'develop' of github.com:gouzil/Paddle into feat/support_…
gouzil Jun 5, 2026
00bcc74
update docker file
gouzil Jun 5, 2026
5e4d158
clean docker py3.9
gouzil Jun 6, 2026
9c80e54
Fix coverage Docker GCC 15 PPA setup
gouzil Jun 6, 2026
a5acea8
fix fa gcc 15 build error
gouzil Jun 7, 2026
d8413d9
Merge remote-tracking branch 'upstream/develop' into feat/support_gcc15
gouzil Jun 13, 2026
e68f108
clean include
gouzil Jun 14, 2026
8c4fac7
Revert coverage CI dockerfile changes
gouzil Jun 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions cmake/external/flashattn.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,19 @@ else()
endif()

set(FLASHATTN_CMAKE_CUDA_FLAGS "-Xfatbin -compress-all")
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION
VERSION_GREATER_EQUAL 15.0)
# GCC 15 diagnoses template-body lookup failures in the vendored CUTLASS
# v2.9.0 matrix.h before the affected helpers are instantiated. Keep this
# warning local to FlashAttention until CUTLASS is upgraded or patched.
if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
set(FLASHATTN_CMAKE_CUDA_FLAGS
"${FLASHATTN_CMAKE_CUDA_FLAGS} -Xcompiler=-Wno-template-body")
else()
set(FLASHATTN_CMAKE_CUDA_FLAGS
"${FLASHATTN_CMAKE_CUDA_FLAGS} -Wno-template-body")
endif()
endif()
set(FA_NVCC_ARCH_BIN "")
foreach(arch ${NVCC_ARCH_BIN})
string(STRIP ${arch} arch)
Expand Down
1 change: 1 addition & 0 deletions paddle/fluid/inference/api/paddle_analysis_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#pragma once

#include <cassert>
#include <cstdint>
#include <map>
#include <memory>
#include <string>
Expand Down
1 change: 1 addition & 0 deletions paddle/fluid/inference/api/paddle_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/

#include <cassert>
#include <cstdint>
#include <map>
#include <memory>
#include <string>
Expand Down
1 change: 1 addition & 0 deletions paddle/fluid/inference/api/paddle_inference_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ limitations under the License. */
#pragma once

#include <cassert>
#include <cstdint>
#include <map>
#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/pybind/sot/eval_frame.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ static PyObject *_custom_eval_frame(PyThreadState *tstate,
#if PY_3_13_PLUS
frame_proxy->locals = f_locals;
#endif
PyObject *arg = frame_proxy;
PyObject *arg = (PyObject *)frame_proxy;

@risemeup1111 risemeup1111 May 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 优先级：P2

这里把 PyInterpreterFrameProxy_New(frame) 返回的新引用显式作为 PyObject* 传给 callback，但 PyObject_CallOneArg 不会接管参数引用，后续成功和异常路径也没有释放 frame_proxy。SOT 打开后每个被拦截的 frame 都会走这里，长时间运行会持续泄漏 proxy 对象。请在 callback 返回后统一释放 Py3.11+ 分支创建的参数引用，再进入 result == NULL 的错误处理，例如：

PyObject *result = PyObject_CallOneArg(callback, arg);
#if PY_3_11_PLUS
Py_DECREF(arg);
#endif
if (result == NULL) {
  ...
}

#else
PyObject *arg = frame;
#endif
Expand Down
1 change: 1 addition & 0 deletions paddle/phi/kernels/strings/unicode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ limitations under the License. */

#pragma once

#include <cstdint>
#include <cstring>
#include <memory>

Expand Down
20 changes: 19 additions & 1 deletion tools/dockerfile/build_scripts/install_gcc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,26 @@ elif [ "$1" == "gcc121" ]; then
cd .. && mkdir temp_gcc121 && cd temp_gcc121 && \
../gcc-12.1.0/configure --prefix=/usr/local/gcc-12.1 --enable-checking=release --enable-languages=c,c++ --disable-multilib && \
make -j8 && make install
cd .. && rm -rf temp_gcc122 gcc-12.1.0 gcc-12.1.0.tar.gz
cd .. && rm -rf temp_gcc121 gcc-12.1.0 gcc-12.1.0.tar.gz
cp ${lib_so_6} ${lib_so_6}.bak && rm -f ${lib_so_6} &&
ln -s /usr/local/gcc-12.1/lib64/libstdc++.so.6 ${lib_so_6} && \
cp /usr/local/gcc-12.1/lib64/libstdc++.so.6.0.30 ${lib_path}
elif [ "$1" == "gcc152" ]; then
GCC_VERSION=${GCC_VERSION:-15.2.0}
GCC_MAJOR_MINOR=$(echo ${GCC_VERSION} | cut -d. -f1,2)
GCC_PREFIX=/usr/local/gcc-${GCC_MAJOR_MINOR}
GCC_ARCHIVE=gcc-${GCC_VERSION}.tar.xz
wget -q https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/${GCC_ARCHIVE}
tar -xf ${GCC_ARCHIVE} && \
cd gcc-${GCC_VERSION} && \
unset LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \
./contrib/download_prerequisites && \
cd .. && mkdir temp_gcc152 && cd temp_gcc152 && \
../gcc-${GCC_VERSION}/configure --prefix=${GCC_PREFIX} --enable-checking=release --enable-languages=c,c++ --disable-multilib && \
make -j$(nproc) && make install
cd .. && rm -rf temp_gcc152 gcc-${GCC_VERSION} ${GCC_ARCHIVE}

This comment was marked as outdated.

Sign in to view

cp ${lib_so_6} ${lib_so_6}.bak && rm -f ${lib_so_6} &&
ln -s ${GCC_PREFIX}/lib64/libstdc++.so.6 ${lib_so_6} && \
cp ${GCC_PREFIX}/lib64/libstdc++.so.6.* ${lib_path}

fi

This comment was marked as outdated.

Sign in to view