Skip to content

Commit

Permalink
Merge branch 'develop' into fix48
Browse files Browse the repository at this point in the history
  • Loading branch information
co63oc committed Jan 6, 2025
2 parents 49c0b86 + 05f74bb commit 9bbc71b
Show file tree
Hide file tree
Showing 342 changed files with 8,347 additions and 5,295 deletions.
40 changes: 17 additions & 23 deletions .github/workflows/CheckPRTemplate.yml
Original file line number Diff line number Diff line change
@@ -1,49 +1,43 @@
name: Check PR Template

on:
pull_request_target:
pull_request:
branches: [develop]
types: [opened, synchronize, reopened, edited]

jobs:
check:
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- name: Clone paddle
uses: actions/checkout@v4
with:
ref: refs/pull/${{ github.event.pull_request.number }}/merge

- name: Cache python dependencies
uses: actions/cache@v4
- name: Setup Python
uses: actions/setup-python@v5
with:
path: ~/.cache/pip
key: checkpr_pip
python-version: '3.13'
cache: 'pip'

- name: Get commit message
id: get_commit_message
- name: Install dependencies
run: |
PR_BRANCH_SHA="${{ github.event.pull_request.head.sha }}"
git fetch origin $PR_BRANCH_SHA --depth=1
COMMIT_MESSAGE=$(git log -1 --format=%B $PR_BRANCH_SHA)
echo "commit_message=$COMMIT_MESSAGE" >> $GITHUB_ENV
pip install httpx
- name: Check PR Template
env:
AGILE_PULL_ID: ${{ github.event.pull_request.number }}
GITHUB_API_TOKEN: ${{ secrets.PADDLE_GITHUB_API_TOKEN }}
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git checkout -b test
pip install httpx pymysql PyGithub
python tools/CheckPRTemplate.py;EXCODE=$?
python tools/CheckPRTemplate.py; EXCODE=$?
echo "EXCODE: $EXCODE"
echo "ipipe_log_param_EXCODE: $EXCODE"
set +x
if [[ "$EXCODE" != "0" ]];then
echo -e "######################################################"
echo -e "If you encounter a situation where the PR template does not match the error message, please use the following link to update your PR: [ https://raw.githubusercontent.com/PaddlePaddle/Paddle/develop/.github/PULL_REQUEST_TEMPLATE.md ]"
echo -e "##ReferenceDocumentation: ##"
echo -e "[ https://github.com/PaddlePaddle/Paddle/wiki/PULL-REQUEST-TEMPLATE--REFERENCE ]"
echo -e "[ https://github.com/PaddlePaddle/Paddle/wiki/paddle_ci_manual ]"
echo -e "######################################################"
echo -e "######################################################"
echo -e "If you encounter a situation where the PR template does not match the error message, please use the following link to update your PR: [ https://raw.githubusercontent.com/PaddlePaddle/Paddle/develop/.github/PULL_REQUEST_TEMPLATE.md ]"
echo -e "##ReferenceDocumentation: ##"
echo -e "[ https://github.com/PaddlePaddle/Paddle/wiki/PULL-REQUEST-TEMPLATE--REFERENCE ]"
echo -e "[ https://github.com/PaddlePaddle/Paddle/wiki/paddle_ci_manual ]"
echo -e "######################################################"
fi
44 changes: 44 additions & 0 deletions .github/workflows/Codestyle-Check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Codestyle-Check

on:
pull_request:
branches: [ "develop" ]

jobs:
pre-commit:
if: github.repository_owner == 'PaddlePaddle'
runs-on: ubuntu-latest
env:
PR_ID: ${{ github.event.pull_request.number }}
BRANCH: develop

steps:
- name: Checkout base repo
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.base.ref }}
fetch-depth: 1000

- name: Merge pr
run: |
git fetch origin pull/${PR_ID}/merge
git checkout -b test FETCH_HEAD
- name: Setup python3.12
uses: actions/setup-python@v5
with:
python-version: '3.12'
cache: 'pip'

- name: Install dependencies
run: |
pip install pre-commit==2.17.0 cpplint==1.6.0 clang-format==13.0.0
- name: Check pre-commit
env:
SKIP_CLANG_TIDY_CHECK: "ON"
run: |
set +e
bash -x tools/codestyle/pre_commit.sh;EXCODE=$?
exit $EXCODE
14 changes: 10 additions & 4 deletions .github/workflows/PR-CI-Clone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,21 @@ jobs:
# Don't run on forked repos.
if: github.repository_owner == 'PaddlePaddle'
runs-on: ubuntu-latest
env:
PR_ID: ${{ github.event.pull_request.number }}
COMMIT_ID: ${{ github.event.pull_request.head.sha }}
BRANCH: develop
steps:
- name: Clone paddle
uses: actions/checkout@v4
with:
submodules: 'recursive'
ref: refs/pull/${{ github.event.pull_request.number }}/merge
fetch-depth: 1000

- name: Merge pr
run: |
git fetch origin pull/${PR_ID}/merge
git checkout -b test FETCH_HEAD
- name: Cache bos client
id: cache_bos_client
Expand All @@ -41,10 +50,7 @@ jobs:
WORK: "/home/runner/work/Paddle"
AK: ${{ secrets.AK }}
SK: ${{ secrets.SK }}
PR_ID: ${{ github.event.pull_request.number }}
COMMIT_ID: ${{ github.event.pull_request.head.sha }}
run: |
git checkout -b test
cd $WORK
tar -zcf Paddle-action.tar.gz Paddle
python -m pip install bce-python-sdk==0.8.74
Expand Down
124 changes: 10 additions & 114 deletions _typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,70 +4,43 @@ extend-exclude = [
"third_party",
"patches",
"build",
"test/dataset/imikolov_test.py",
# Skip `intermidiate` check in these files
"test/cpp/eager/task_tests/CMakeLists.txt",
"test/cpp/eager/task_tests/hook_test_intermidiate.cc",
]

[default]
# Ignore 1-3 letter words, refer to https://github.com/crate-ci/typos/issues/1079
extend-ignore-words-re = ["^[a-zA-Z]{1,3}$"]

[default.extend-words]
# PaddlePaddle specific words
anc = 'anc'
arange = "arange"
astroid = 'astroid'
ba = 'ba'
cacl = 'cacl'
CANN = 'CANN'
Clas = 'Clas'
clen = 'clen'
cll = 'cll'
datas = 'datas'
dota = 'dota'
dout = "dout"
eles = 'eles'
entrys = 'entrys'
feeded = 'feeded'
grad = "grad"
Halfs = 'Halfs'
hge = 'hge'
kinf = 'kinf'
kow = 'kow'
lod = "lod"
Nce = "Nce"
Nd = "Nd"
ot = 'ot'
pash = 'pash'
UE = "UE"
unpacket = "unpacket"

# These words need to be fixed
childs = 'childs'
Creater = 'Creater'
creater = 'creater'
dateset = 'dateset'
dota = 'dota'
Datas = 'Datas'
DATAS = 'DATAS'
datas = 'datas'
delt = 'delt'
dealed = 'dealed'
deciamls = 'deciamls'
decalared = 'decalared'
decompse = 'decompse'
decompositing = 'decompositing'
defferent = 'defferent'
differenciation = 'differenciation'
differnt = 'differnt'
diffrent = 'diffrent'
difficults = 'difficults'
dimensinal = 'dimensinal'
dimenstions = 'dimenstions'
dimenstion = 'dimenstion'
dimention = 'dimention'
demension = 'demension'
Direcly = 'Direcly'
direcly = 'direcly'
direcotory = 'direcotory'
direcotry = 'direcotry'
diabled = 'diabled'
diable = 'diable'
distingusih = 'distingusih'
distrubuted = 'distrubuted'
distibuted = 'distibuted'
dito = 'dito'
devide = 'devide'
documention = 'documention'
Expand All @@ -77,17 +50,7 @@ doubel = 'doubel'
dobule = 'dobule'
Dowloading = 'Dowloading'
downsteram = 'downsteram'
faild = 'faild'
Flase = 'Flase'
featue = 'featue'
feeded = 'feeded'
fetchs = 'fetchs'
fileds = 'fileds'
filterd = 'filterd'
fliter = 'fliter'
Fidn = 'Fidn'
Finded = 'Finded'
fisrt = 'fisrt'
Flattend = 'Flattend'
flattend = 'flattend'
flattern = 'flattern'
Expand All @@ -96,7 +59,6 @@ filpped = 'filpped'
flaot = 'flaot'
follwed = 'follwed'
folowing = 'folowing'
fot = 'fot'
formater = 'formater'
formating = 'formating'
foramt = 'foramt'
Expand All @@ -107,35 +69,9 @@ forwad = 'forwad'
forword = 'forword'
founf = 'founf'
framwork = 'framwork'
fre = 'fre'
frequence = 'frequence'
fron = 'fron'
fullfill = 'fullfill'
FUL = 'FUL'
funtions = 'funtions'
funcitons = 'funcitons'
Funcitons = 'Funcitons'
funtion = 'funtion'
fuction = 'fuction'
fucntion = 'fucntion'
Fuction = 'Fuction'
Funtion = 'Funtion'
funcion = 'funcion'
Funcion = 'Funcion'
futher = 'futher'
furture = 'furture'
identiy = 'identiy'
indentify = 'indentify'
implemention = 'implemention'
implementated = 'implementated'
implementd = 'implementd'
impliment = 'impliment'
implment = 'implment'
implicitely = 'implicitely'
Inproper = 'Inproper'
inconsistence = 'inconsistence'
uncorrectly = 'uncorrectly'
Indext = 'Indext'
Indexs = 'Indexs'
indexs = 'indexs'
indiates = 'indiates'
Expand Down Expand Up @@ -166,34 +102,11 @@ insid = 'insid'
insepection = 'insepection'
intall = 'intall'
instanciate = 'instanciate'
Instrution = 'Instrution'
INSTUCTION = 'INSTUCTION'
instuction = 'instuction'
interger = 'interger'
intermidiate = 'intermidiate'
itermediate = 'itermediate'
interal = 'interal'
internel = 'internel'
instrinsics = 'instrinsics'
intristic = 'intristic'
invalied = 'invalied'
Invaid = 'Invaid'
invaild = 'invaild'
invalide = 'invalide'
iteratable = 'iteratable'
interated = 'interated'
Iteraion = 'Iteraion'
IIT = 'IIT'
iy = 'iy'
occured = 'occured'
Ocurred = 'Ocurred'
occures = 'occures'
Fo = 'Fo'
fo = 'fo'
offets = 'offets'
offseted = 'offseted'
OLT = 'OLT'
pn = 'pn'
Operants = 'Operants'
operants = 'operants'
oeprations = 'oeprations'
Expand Down Expand Up @@ -355,10 +268,7 @@ sequnece = 'sequnece'
sequentail = 'sequentail'
serailize = 'serailize'
settting = 'settting'
ser = 'ser'
setted = 'setted'
SEH = 'SEH'
seh = 'seh'
shoule = 'shoule'
shoud = 'shoud'
Singal = 'Singal'
Expand Down Expand Up @@ -428,14 +338,9 @@ Temperary = 'Temperary'
tenosr = 'tenosr'
iterm = 'iterm'
termiante = 'termiante'
ths = 'ths'
thi = 'thi'
Theoritical = 'Theoritical'
ther = 'ther'
thr = 'thr'
thge = 'thge'
Teh = 'Teh'
tne = 'tne'
thouse = 'thouse'
theads = 'theads'
thrads = 'thrads'
Expand All @@ -448,7 +353,6 @@ TOOD = 'TOOD'
tood = 'tood'
TDOD = 'TDOD'
toghether = 'toghether'
Rto = 'Rto'
trainning = 'trainning'
Traning = 'Traning'
transforme = 'transforme'
Expand Down Expand Up @@ -492,7 +396,6 @@ unziped = 'unziped'
udpated = 'udpated'
upgarde = 'upgarde'
uptream = 'uptream'
ues = 'ues'
unsed = 'unsed'
uesd = 'uesd'
usefull = 'usefull'
Expand All @@ -513,27 +416,20 @@ varn = 'varn'
warpped = 'warpped'
warpper = 'warpper'
Warpper = 'Warpper'
vas = 'vas'
wheather = 'wheather'
wether = 'wether'
Wether = 'Wether'
wieghts = 'wieghts'
werid = 'werid'
whe = 'whe'
Wheter = 'Wheter'
whther = 'whther'
whill = 'whill'
whos = 'whos'
wil = 'wil'
wll = 'wll'
wiil = 'wiil'
witk = 'witk'
Wih = 'Wih'
wih = 'wih'
worke = 'worke'
workround = 'workround'
worksapce = 'worksapce'
wrk = 'wrk'
wrappered = 'wrappered'
wraper = 'wraper'
wraping = 'wraping'
Expand Down
Loading

0 comments on commit 9bbc71b

Please sign in to comment.