From bc9b2e27dec8262f7dd047040f8ddbb42a0c3e18 Mon Sep 17 00:00:00 2001 From: geyuqiang Date: Thu, 6 Nov 2025 11:17:57 +0800 Subject: [PATCH 01/11] fix protobuf checkout error in CI --- backends/iluvatar_gpu/cmake/external/protobuf.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backends/iluvatar_gpu/cmake/external/protobuf.cmake b/backends/iluvatar_gpu/cmake/external/protobuf.cmake index 8f1dc67f0a4..e6925ed57f9 100755 --- a/backends/iluvatar_gpu/cmake/external/protobuf.cmake +++ b/backends/iluvatar_gpu/cmake/external/protobuf.cmake @@ -293,7 +293,8 @@ function(build_protobuf TARGET_NAME) SOURCE_DIR ${SOURCE_DIR} UPDATE_COMMAND "" PATCH_COMMAND - COMMAND cd ${SOURCE_DIR} && git checkout ${PROTOBUF_TAG} + COMMAND cd ${SOURCE_DIR} && git fetch --all --tags && git checkout + ${PROTOBUF_TAG} DEPENDS zlib CONFIGURE_COMMAND ${CMAKE_COMMAND} ${SOURCE_DIR}/cmake ${OPTIONAL_ARGS} From 1644b2535cf1675cf10fee3740887a222686c01a Mon Sep 17 00:00:00 2001 From: geyuqiang Date: Thu, 6 Nov 2025 19:20:49 +0800 Subject: [PATCH 02/11] check status --- backends/iluvatar_gpu/build_paddle.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/backends/iluvatar_gpu/build_paddle.sh b/backends/iluvatar_gpu/build_paddle.sh index 79c1787998f..f1356621ece 100644 --- a/backends/iluvatar_gpu/build_paddle.sh +++ b/backends/iluvatar_gpu/build_paddle.sh @@ -38,6 +38,16 @@ fi pushd ${CURRENT_DIR}/../../ git submodule update --init --recursive --force +echo "=== Submodule init successfully ===" +popd + +# 进入 protobuf 目录并打印 git 状态和日志 +pushd ${CURRENT_DIR}/../../Paddle/third_party/protobuf +echo "=== Protobuf Git Status ===" +git status +echo "" +echo "=== Protobuf Git Log (last 5 commits) ===" +git log --oneline -5 popd bash clean_paddle.sh From 03ed82483877acbebcae683ec3298397728adc11 Mon Sep 17 00:00:00 2001 From: geyuqiang Date: Thu, 6 Nov 2025 19:43:08 +0800 Subject: [PATCH 03/11] restore protobuf --- backends/iluvatar_gpu/cmake/external/protobuf.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backends/iluvatar_gpu/cmake/external/protobuf.cmake b/backends/iluvatar_gpu/cmake/external/protobuf.cmake index e6925ed57f9..8f1dc67f0a4 100755 --- a/backends/iluvatar_gpu/cmake/external/protobuf.cmake +++ b/backends/iluvatar_gpu/cmake/external/protobuf.cmake @@ -293,8 +293,7 @@ function(build_protobuf TARGET_NAME) SOURCE_DIR ${SOURCE_DIR} UPDATE_COMMAND "" PATCH_COMMAND - COMMAND cd ${SOURCE_DIR} && git fetch --all --tags && git checkout - ${PROTOBUF_TAG} + COMMAND cd ${SOURCE_DIR} && git checkout ${PROTOBUF_TAG} DEPENDS zlib CONFIGURE_COMMAND ${CMAKE_COMMAND} ${SOURCE_DIR}/cmake ${OPTIONAL_ARGS} From 92680a5dab39c3197f9e82ad72d9fffc7f7a4712 Mon Sep 17 00:00:00 2001 From: geyuqiang Date: Thu, 6 Nov 2025 20:12:14 +0800 Subject: [PATCH 04/11] check protobuf tag --- backends/iluvatar_gpu/build_paddle.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backends/iluvatar_gpu/build_paddle.sh b/backends/iluvatar_gpu/build_paddle.sh index f1356621ece..4dfa35c38e6 100644 --- a/backends/iluvatar_gpu/build_paddle.sh +++ b/backends/iluvatar_gpu/build_paddle.sh @@ -48,6 +48,12 @@ git status echo "" echo "=== Protobuf Git Log (last 5 commits) ===" git log --oneline -5 +echo "=== Protobuf Git tag check v21.12 ===" +git tag | grep v21.12 +echo "=== Protobuf Git fetch tag ===" +git fetch --tags +echo "=== Protobuf Git tag check v21.12 after fetch ===" +git tag | grep v21.12 popd bash clean_paddle.sh From d6ece1be99bf37af26d70d969f59cbafa61daeb8 Mon Sep 17 00:00:00 2001 From: geyuqiang Date: Thu, 6 Nov 2025 20:54:33 +0800 Subject: [PATCH 05/11] skip git checkout in protobuf --- backends/iluvatar_gpu/build_paddle.sh | 9 +-------- backends/iluvatar_gpu/cmake/external/protobuf.cmake | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/backends/iluvatar_gpu/build_paddle.sh b/backends/iluvatar_gpu/build_paddle.sh index 4dfa35c38e6..230e6cdd485 100644 --- a/backends/iluvatar_gpu/build_paddle.sh +++ b/backends/iluvatar_gpu/build_paddle.sh @@ -41,20 +41,13 @@ git submodule update --init --recursive --force echo "=== Submodule init successfully ===" popd -# 进入 protobuf 目录并打印 git 状态和日志 +# check protobuf git status and log pushd ${CURRENT_DIR}/../../Paddle/third_party/protobuf echo "=== Protobuf Git Status ===" git status echo "" echo "=== Protobuf Git Log (last 5 commits) ===" git log --oneline -5 -echo "=== Protobuf Git tag check v21.12 ===" -git tag | grep v21.12 -echo "=== Protobuf Git fetch tag ===" -git fetch --tags -echo "=== Protobuf Git tag check v21.12 after fetch ===" -git tag | grep v21.12 -popd bash clean_paddle.sh diff --git a/backends/iluvatar_gpu/cmake/external/protobuf.cmake b/backends/iluvatar_gpu/cmake/external/protobuf.cmake index 8f1dc67f0a4..730179c79f9 100755 --- a/backends/iluvatar_gpu/cmake/external/protobuf.cmake +++ b/backends/iluvatar_gpu/cmake/external/protobuf.cmake @@ -293,7 +293,7 @@ function(build_protobuf TARGET_NAME) SOURCE_DIR ${SOURCE_DIR} UPDATE_COMMAND "" PATCH_COMMAND - COMMAND cd ${SOURCE_DIR} && git checkout ${PROTOBUF_TAG} + COMMAND cd ${SOURCE_DIR} DEPENDS zlib CONFIGURE_COMMAND ${CMAKE_COMMAND} ${SOURCE_DIR}/cmake ${OPTIONAL_ARGS} From 81b394d3a08f39a5d59bb3a9138046c41a9f19cd Mon Sep 17 00:00:00 2001 From: geyuqiang Date: Thu, 6 Nov 2025 21:19:32 +0800 Subject: [PATCH 06/11] check HEAD --- backends/iluvatar_gpu/cmake/external/protobuf.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backends/iluvatar_gpu/cmake/external/protobuf.cmake b/backends/iluvatar_gpu/cmake/external/protobuf.cmake index 730179c79f9..469e9c1c173 100755 --- a/backends/iluvatar_gpu/cmake/external/protobuf.cmake +++ b/backends/iluvatar_gpu/cmake/external/protobuf.cmake @@ -293,7 +293,10 @@ function(build_protobuf TARGET_NAME) SOURCE_DIR ${SOURCE_DIR} UPDATE_COMMAND "" PATCH_COMMAND - COMMAND cd ${SOURCE_DIR} + COMMAND + cd ${SOURCE_DIR} && echo + "Current protobuf commit: $(git rev-parse HEAD)" && git checkout + f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c DEPENDS zlib CONFIGURE_COMMAND ${CMAKE_COMMAND} ${SOURCE_DIR}/cmake ${OPTIONAL_ARGS} From f451cbccd3e9b9d3a07352905c7aa2d40b2558f7 Mon Sep 17 00:00:00 2001 From: geyuqiang Date: Fri, 7 Nov 2025 15:09:44 +0800 Subject: [PATCH 07/11] try download code --- .github/workflows/_IXUCA.yml | 3 +++ backends/iluvatar_gpu/cmake/external/protobuf.cmake | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/_IXUCA.yml b/.github/workflows/_IXUCA.yml index c8587a6d129..46ab9b20aae 100644 --- a/.github/workflows/_IXUCA.yml +++ b/.github/workflows/_IXUCA.yml @@ -72,6 +72,9 @@ jobs: git remote add upstream https://github.com/PaddlePaddle/PaddleCustomDevice.git git merge ${BRANCH} --no-edit git --no-pager log --pretty=oneline -5' + cd Paddle/third_party/protobuf/ + git log --oneline -5 + git tag v21.12 - name: Check bypass id: check-bypass diff --git a/backends/iluvatar_gpu/cmake/external/protobuf.cmake b/backends/iluvatar_gpu/cmake/external/protobuf.cmake index 469e9c1c173..8f1dc67f0a4 100755 --- a/backends/iluvatar_gpu/cmake/external/protobuf.cmake +++ b/backends/iluvatar_gpu/cmake/external/protobuf.cmake @@ -293,10 +293,7 @@ function(build_protobuf TARGET_NAME) SOURCE_DIR ${SOURCE_DIR} UPDATE_COMMAND "" PATCH_COMMAND - COMMAND - cd ${SOURCE_DIR} && echo - "Current protobuf commit: $(git rev-parse HEAD)" && git checkout - f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c + COMMAND cd ${SOURCE_DIR} && git checkout ${PROTOBUF_TAG} DEPENDS zlib CONFIGURE_COMMAND ${CMAKE_COMMAND} ${SOURCE_DIR}/cmake ${OPTIONAL_ARGS} From d73b49cbc428ede72742760e97f74ca74d6d1870 Mon Sep 17 00:00:00 2001 From: geyuqiang Date: Fri, 7 Nov 2025 15:19:36 +0800 Subject: [PATCH 08/11] fix yml --- .github/workflows/_IXUCA.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_IXUCA.yml b/.github/workflows/_IXUCA.yml index 46ab9b20aae..d30b3c4e102 100644 --- a/.github/workflows/_IXUCA.yml +++ b/.github/workflows/_IXUCA.yml @@ -84,6 +84,7 @@ jobs: workflow-name: ixuca - name: RUN IXUCA + id: run-ixuca if: steps.check-bypass.outputs.can-skip != 'true' run: | docker exec -t ${{ env.container_name }} /bin/bash -c ' @@ -97,9 +98,13 @@ jobs: if [ $change_numbers -ne $change_backend ]; then echo "Common file changed, continue to run IXUCA FULL CI test ..." + echo "should_skip=false" >> $GITHUB_OUTPUT elif [ $change_ixuca_only -eq 0 ] ; then echo "NO IXUCA backend changes found, skip IXUCA FULL CI ...." + echo "should_skip=true" >> $GITHUB_OUTPUT exit 0 + else + echo "should_skip=false" >> $GITHUB_OUTPUT fi export PATH=/usr/local/corex-4.3.0/bin:$PATH @@ -109,8 +114,8 @@ jobs: python3 -m pip install --pre paddlepaddle -i https://www.paddlepaddle.org.cn/packages/nightly/cpu/ python3 -m pip install parameterized' - - name: Build and Install Paddle - if: steps.check-bypass.outputs.can-skip != 'true' + - name: Build and Install paddle_iluvatar_gpu + if: steps.check-bypass.outputs.can-skip != 'true' && steps.run-ixuca.outputs.should_skip != 'true' run: | docker exec -t ${{ env.container_name }} /bin/bash -c ' cd /workspace/PaddleCustomDevice/backends/iluvatar_gpu @@ -120,7 +125,7 @@ jobs: bash install_paddle.sh' - name: Run Tests - if: steps.check-bypass.outputs.can-skip != 'true' + if: steps.check-bypass.outputs.can-skip != 'true' && steps.run-ixuca.outputs.should_skip != 'true' run: | docker exec -t ${{ env.container_name }} /bin/bash -c ' cd /workspace/PaddleCustomDevice/backends/iluvatar_gpu/tests From 613166997bc459dd491efcc2121efc4163c55ba3 Mon Sep 17 00:00:00 2001 From: geyuqiang Date: Fri, 7 Nov 2025 18:59:09 +0800 Subject: [PATCH 09/11] modified clone --- .github/workflows/_Clone-linux.yml | 2 ++ .github/workflows/_IXUCA.yml | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_Clone-linux.yml b/.github/workflows/_Clone-linux.yml index ace1d9a49c6..5ca07be8776 100644 --- a/.github/workflows/_Clone-linux.yml +++ b/.github/workflows/_Clone-linux.yml @@ -62,6 +62,8 @@ jobs: git merge --no-edit ${BRANCH} git submodule sync git submodule update --init --recursive --force + cd Paddle/third_party/protobuf + git fetch --tags - name: Download bos client env: diff --git a/.github/workflows/_IXUCA.yml b/.github/workflows/_IXUCA.yml index d30b3c4e102..c310d994001 100644 --- a/.github/workflows/_IXUCA.yml +++ b/.github/workflows/_IXUCA.yml @@ -72,9 +72,6 @@ jobs: git remote add upstream https://github.com/PaddlePaddle/PaddleCustomDevice.git git merge ${BRANCH} --no-edit git --no-pager log --pretty=oneline -5' - cd Paddle/third_party/protobuf/ - git log --oneline -5 - git tag v21.12 - name: Check bypass id: check-bypass From 8b397a2427b9408fa29180d246eb0141975bde1b Mon Sep 17 00:00:00 2001 From: geyuqiang Date: Fri, 7 Nov 2025 19:25:44 +0800 Subject: [PATCH 10/11] fix directory --- .github/workflows/_Clone-linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/_Clone-linux.yml b/.github/workflows/_Clone-linux.yml index 5ca07be8776..f45de3f4023 100644 --- a/.github/workflows/_Clone-linux.yml +++ b/.github/workflows/_Clone-linux.yml @@ -64,6 +64,7 @@ jobs: git submodule update --init --recursive --force cd Paddle/third_party/protobuf git fetch --tags + cd - - name: Download bos client env: From ffca9d04778edf5ea67bb9a660c0acfa985c1bf5 Mon Sep 17 00:00:00 2001 From: geyuqiang Date: Fri, 7 Nov 2025 20:15:42 +0800 Subject: [PATCH 11/11] fix shell --- .github/workflows/_Clone-linux.yml | 4 +++- backends/iluvatar_gpu/build_paddle.sh | 10 +--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/_Clone-linux.yml b/.github/workflows/_Clone-linux.yml index f45de3f4023..253af1884bc 100644 --- a/.github/workflows/_Clone-linux.yml +++ b/.github/workflows/_Clone-linux.yml @@ -64,7 +64,9 @@ jobs: git submodule update --init --recursive --force cd Paddle/third_party/protobuf git fetch --tags - cd - + cd ../pybind + git fetch --tags + cd ../../.. - name: Download bos client env: diff --git a/backends/iluvatar_gpu/build_paddle.sh b/backends/iluvatar_gpu/build_paddle.sh index 230e6cdd485..8d9f8a78204 100644 --- a/backends/iluvatar_gpu/build_paddle.sh +++ b/backends/iluvatar_gpu/build_paddle.sh @@ -38,16 +38,8 @@ fi pushd ${CURRENT_DIR}/../../ git submodule update --init --recursive --force -echo "=== Submodule init successfully ===" popd - -# check protobuf git status and log -pushd ${CURRENT_DIR}/../../Paddle/third_party/protobuf -echo "=== Protobuf Git Status ===" -git status -echo "" -echo "=== Protobuf Git Log (last 5 commits) ===" -git log --oneline -5 +echo "=== Submodule init successfully ===" bash clean_paddle.sh