Skip to content

Commit fbebdb1

Browse files
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into move_cinn_tests_part2
2 parents 1d3a46f + c1bc55f commit fbebdb1

File tree

556 files changed

+12838
-8011
lines changed

Some content is hidden

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

556 files changed

+12838
-8011
lines changed

.github/workflows/CheckPRTemplate.yml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Check PR Template
2+
3+
on:
4+
pull_request:
5+
branches: [develop]
6+
types: [opened, synchronize, reopened, edited]
7+
8+
jobs:
9+
check:
10+
runs-on: ubuntu-latest
11+
permissions:
12+
contents: read
13+
steps:
14+
- name: Clone paddle
15+
uses: actions/checkout@v4
16+
17+
- name: Setup Python
18+
uses: actions/setup-python@v5
19+
with:
20+
python-version: '3.13'
21+
cache: 'pip'
22+
23+
- name: Install dependencies
24+
run: |
25+
pip install httpx
26+
27+
- name: Check PR Template
28+
env:
29+
AGILE_PULL_ID: ${{ github.event.pull_request.number }}
30+
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
run: |
32+
python tools/CheckPRTemplate.py; EXCODE=$?
33+
echo "EXCODE: $EXCODE"
34+
echo "ipipe_log_param_EXCODE: $EXCODE"
35+
set +x
36+
if [[ "$EXCODE" != "0" ]];then
37+
echo -e "######################################################"
38+
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 ]"
39+
echo -e "##ReferenceDocumentation: ##"
40+
echo -e "[ https://github.com/PaddlePaddle/Paddle/wiki/PULL-REQUEST-TEMPLATE--REFERENCE ]"
41+
echo -e "[ https://github.com/PaddlePaddle/Paddle/wiki/paddle_ci_manual ]"
42+
echo -e "######################################################"
43+
fi

.github/workflows/Codestyle-Check.yml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Codestyle-Check
2+
3+
on:
4+
pull_request:
5+
branches: [ "develop" ]
6+
7+
jobs:
8+
pre-commit:
9+
if: github.repository_owner == 'PaddlePaddle'
10+
runs-on: ubuntu-latest
11+
env:
12+
PR_ID: ${{ github.event.pull_request.number }}
13+
BRANCH: develop
14+
15+
steps:
16+
- name: Checkout base repo
17+
uses: actions/checkout@v4
18+
with:
19+
ref: ${{ github.event.pull_request.base.ref }}
20+
fetch-depth: 1000
21+
22+
- name: Merge pr
23+
run: |
24+
git config --global user.name "PaddleCI"
25+
git config --global user.email "paddle_ci@example.com"
26+
git fetch origin pull/${PR_ID}/head
27+
git checkout -b test FETCH_HEAD
28+
git merge --no-edit ${BRANCH}
29+
30+
- name: Setup python3.8
31+
uses: actions/setup-python@v5
32+
with:
33+
python-version: '3.8'
34+
cache: 'pip'
35+
36+
- name: Check pre-commit
37+
run: |
38+
pip --disable-pip-version-check install --upgrade pip
39+
set +e
40+
bash -x tools/codestyle/pre_commit.sh;EXCODE=$?
41+
echo "ipipe_log_param_EXCODE: $EXCODE"
42+
exit $EXCODE

.github/workflows/PR-CI-Clone.yml

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Clone
2+
3+
on:
4+
pull_request_target:
5+
branches: [ "develop" ]
6+
7+
permissions:
8+
contents: read
9+
10+
jobs:
11+
Clone:
12+
# Don't run on forked repos.
13+
if: github.repository_owner == 'PaddlePaddle'
14+
runs-on: ubuntu-latest
15+
env:
16+
PR_ID: ${{ github.event.pull_request.number }}
17+
COMMIT_ID: ${{ github.event.pull_request.head.sha }}
18+
BRANCH: develop
19+
steps:
20+
- name: Clone paddle
21+
uses: actions/checkout@v4
22+
with:
23+
submodules: 'recursive'
24+
fetch-depth: 1000
25+
26+
- name: Merge pr
27+
run: |
28+
git config --global user.name "PaddleCI"
29+
git config --global user.email "paddle_ci@example.com"
30+
git fetch origin pull/${PR_ID}/head
31+
git checkout -b test FETCH_HEAD
32+
git merge --no-edit ${BRANCH}
33+
34+
- name: Cache bos client
35+
id: cache_bos_client
36+
uses: actions/cache@v4
37+
with:
38+
path: |
39+
/home/runner/work/Paddle/bos_upload.py
40+
~/.cache/pip
41+
key: bos_client_pip
42+
43+
- name: Download bos client
44+
env:
45+
WORK: "/home/runner/work/Paddle"
46+
if: steps.cache_bos_client.outputs.cache-hit != 'true'
47+
run: |
48+
cd $WORK
49+
wget -q --no-proxy -O bos_upload.py https://paddle-docker-tar.cdn.bcebos.com/bos_upload.py --no-check-certificate
50+
51+
- name: Push paddle-action.tar.gz to bos
52+
env:
53+
WORK: "/home/runner/work/Paddle"
54+
AK: ${{ secrets.AK }}
55+
SK: ${{ secrets.SK }}
56+
run: |
57+
cd $WORK
58+
tar -zcf Paddle-action.tar.gz Paddle
59+
python -m pip install bce-python-sdk==0.8.74
60+
python bos_upload.py Paddle-action.tar.gz xly-devops/PR/Paddle/${PR_ID}/${COMMIT_ID}

_typos.toml

+5-124
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extend-exclude = [
44
"third_party",
55
"patches",
66
"build",
7-
"test/dataset/imikolov_test.py"
7+
"test/dataset/imikolov_test.py",
88
]
99

1010
[default.extend-words]
@@ -20,7 +20,11 @@ clen = 'clen'
2020
cll = 'cll'
2121
dout = "dout"
2222
eles = 'eles'
23+
entrys = 'entrys'
24+
FUL = 'FUL'
2325
grad = "grad"
26+
Halfs = 'Halfs'
27+
hge = 'hge'
2428
kinf = 'kinf'
2529
kow = 'kow'
2630
lod = "lod"
@@ -32,27 +36,9 @@ UE = "UE"
3236
unpacket = "unpacket"
3337

3438
# These words need to be fixed
35-
blokc = 'blokc'
36-
blcok = 'blcok'
37-
bootom = 'bootom'
38-
bondary = 'bondary'
39-
branchs = 'branchs'
40-
cahe = 'cahe'
41-
Caculate = 'Caculate'
42-
caculate = 'caculate'
43-
calcualtion = 'calcualtion'
44-
checkings = 'checkings'
4539
childs = 'childs'
46-
Cound = 'Cound'
47-
coule = 'coule'
48-
craete = 'craete'
49-
craeted = 'craeted'
5040
Creater = 'Creater'
5141
creater = 'creater'
52-
Currenly = 'Currenly'
53-
curent = 'curent'
54-
currnt = 'currnt'
55-
Costum = 'Costum'
5642
dateset = 'dateset'
5743
dota = 'dota'
5844
Datas = 'Datas'
@@ -64,26 +50,6 @@ deciamls = 'deciamls'
6450
decalared = 'decalared'
6551
decompse = 'decompse'
6652
decompositing = 'decompositing'
67-
defalut = 'defalut'
68-
Defaule = 'Defaule'
69-
defaut = 'defaut'
70-
defualt = 'defualt'
71-
defered = 'defered'
72-
Defered = 'Defered'
73-
defind = 'defind'
74-
defeine = 'defeine'
75-
defition = 'defition'
76-
defination = 'defination'
77-
defferent = 'defferent'
78-
differenciation = 'differenciation'
79-
differnt = 'differnt'
80-
diffrent = 'diffrent'
81-
difficults = 'difficults'
82-
dimensinal = 'dimensinal'
83-
dimenstions = 'dimenstions'
84-
dimenstion = 'dimenstion'
85-
dimention = 'dimention'
86-
demension = 'demension'
8753
Direcly = 'Direcly'
8854
direcly = 'direcly'
8955
direcotory = 'direcotory'
@@ -102,38 +68,6 @@ doubel = 'doubel'
10268
dobule = 'dobule'
10369
Dowloading = 'Dowloading'
10470
downsteram = 'downsteram'
105-
effeciently = 'effeciently'
106-
effecient = 'effecient'
107-
elemenents = 'elemenents'
108-
elments = 'elments'
109-
elimate = 'elimate'
110-
alse = 'alse'
111-
embeding = 'embeding'
112-
emited = 'emited'
113-
Enabel = 'Enabel'
114-
enbale = 'enbale'
115-
encouter = 'encouter'
116-
endianess = 'endianess'
117-
enfore = 'enfore'
118-
entrys = 'entrys'
119-
envirnment = 'envirnment'
120-
environnement = 'environnement'
121-
epoches = 'epoches'
122-
EPOCHES = 'EPOCHES'
123-
epslion = 'epslion'
124-
eqaul = 'eqaul'
125-
Errorr = 'Errorr'
126-
exmaple = 'exmaple'
127-
expection = 'expection'
128-
excption = 'excption'
129-
execuate = 'execuate'
130-
exsit = 'exsit'
131-
exsits = 'exsits'
132-
expaned = 'expaned'
133-
epxand = 'epxand'
134-
Expexted = 'Expexted'
135-
expolitation = 'expolitation'
136-
extream = 'extream'
13771
faild = 'faild'
13872
Flase = 'Flase'
13973
featue = 'featue'
@@ -168,41 +102,6 @@ fre = 'fre'
168102
frequence = 'frequence'
169103
fron = 'fron'
170104
fullfill = 'fullfill'
171-
FUL = 'FUL'
172-
funtions = 'funtions'
173-
funcitons = 'funcitons'
174-
Funcitons = 'Funcitons'
175-
funtion = 'funtion'
176-
fuction = 'fuction'
177-
fucntion = 'fucntion'
178-
Fuction = 'Fuction'
179-
Funtion = 'Funtion'
180-
funcion = 'funcion'
181-
Funcion = 'Funcion'
182-
futher = 'futher'
183-
furture = 'furture'
184-
guassian = 'guassian'
185-
gloabl = 'gloabl'
186-
graident = 'graident'
187-
grammer = 'grammer'
188-
grpah = 'grpah'
189-
Greate = 'Greate'
190-
groupped = 'groupped'
191-
gard = 'gard'
192-
GARD = 'GARD'
193-
Halfs = 'Halfs'
194-
hadler = 'hadler'
195-
Hander = 'Hander'
196-
hander = 'hander'
197-
Hanlder = 'Hanlder'
198-
happend = 'happend'
199-
hardward = 'hardward'
200-
hight = 'hight'
201-
hepler = 'hepler'
202-
helpe = 'helpe'
203-
hge = 'hge'
204-
homogenous = 'homogenous'
205-
horizonal = 'horizonal'
206105
identiy = 'identiy'
207106
indentify = 'indentify'
208107
implemention = 'implemention'
@@ -264,24 +163,6 @@ interated = 'interated'
264163
Iteraion = 'Iteraion'
265164
IIT = 'IIT'
266165
iy = 'iy'
267-
lable = 'lable'
268-
lamda = 'lamda'
269-
labmda = 'labmda'
270-
lastest = 'lastest'
271-
Lanuch = 'Lanuch'
272-
lanuch = 'lanuch'
273-
leyer = 'leyer'
274-
learing = 'learing'
275-
Leafs = 'Leafs'
276-
leafs = 'leafs'
277-
levle = 'levle'
278-
linke = 'linke'
279-
lsit = 'lsit'
280-
lits = 'lits'
281-
localy = 'localy'
282-
Localy = 'Localy'
283-
logarithmical = 'logarithmical'
284-
Loggin = 'Loggin'
285166
occured = 'occured'
286167
Ocurred = 'Ocurred'
287168
occures = 'occures'

cmake/cinn.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ cinn_cc_library(
167167
${cinnapi_src}
168168
DEPS
169169
glog
170-
python
171170
${llvm_libs}
172171
param_proto
173172
auto_schedule_proto

cmake/cinn/core.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ function(cinn_cc_library TARGET_NAME)
1919
endif()
2020

2121
if(cinn_cc_library_DEPS)
22+
if("${cinn_cc_library_DEPS};" MATCHES "python;")
23+
list(REMOVE_ITEM cinn_cc_library_DEPS python)
24+
add_dependencies(${TARGET_NAME} python)
25+
endif()
2226
target_link_libraries(${TARGET_NAME} ${cinn_cc_library_DEPS})
2327
add_dependencies(${TARGET_NAME} ${cinn_cc_library_DEPS})
2428
endif()

0 commit comments

Comments
 (0)