Skip to content

Commit 9821e04

Browse files
ZcwDevZcwDev
committed
merge code of upstream
1 parent 3959411 commit 9821e04

File tree

680 files changed

+152798
-130742
lines changed

Some content is hidden

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

680 files changed

+152798
-130742
lines changed

‎.clang-format

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
# This file is used by clang-format to autoformat paddle source code
2-
#
3-
# The clang-format is part of llvm toolchain.
4-
# It need to install llvm and clang to format source code style.
5-
#
6-
# The basic usage is,
7-
# clang-format -i -style=file PATH/TO/SOURCE/CODE
8-
#
9-
# The -style=file implicit use ".clang-format" file located in one of
10-
# parent directory.
11-
# The -i means inplace change.
12-
#
13-
# The document of clang-format is
14-
# http://clang.llvm.org/docs/ClangFormat.html
15-
# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
16-
---
17-
Language: Cpp
18-
BasedOnStyle: Google
19-
IndentWidth: 2
20-
TabWidth: 2
21-
ContinuationIndentWidth: 4
22-
MaxEmptyLinesToKeep: 2
23-
AccessModifierOffset: -2 # The private/protected/public has no indent in class
24-
Standard: Cpp11
25-
AllowAllParametersOfDeclarationOnNextLine: true
26-
BinPackParameters: false
27-
BinPackArguments: false
28-
...
29-
1+
# This file is used by clang-format to autoformat paddle source code
2+
#
3+
# The clang-format is part of llvm toolchain.
4+
# It need to install llvm and clang to format source code style.
5+
#
6+
# The basic usage is,
7+
# clang-format -i -style=file PATH/TO/SOURCE/CODE
8+
#
9+
# The -style=file implicit use ".clang-format" file located in one of
10+
# parent directory.
11+
# The -i means inplace change.
12+
#
13+
# The document of clang-format is
14+
# http://clang.llvm.org/docs/ClangFormat.html
15+
# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
16+
---
17+
Language: Cpp
18+
BasedOnStyle: Google
19+
IndentWidth: 2
20+
TabWidth: 2
21+
ContinuationIndentWidth: 4
22+
MaxEmptyLinesToKeep: 2
23+
AccessModifierOffset: -2 # The private/protected/public has no indent in class
24+
Standard: Cpp11
25+
AllowAllParametersOfDeclarationOnNextLine: true
26+
BinPackParameters: false
27+
BinPackArguments: false
28+
...
29+

‎.clang_format.hook

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
#!/bin/bash
2-
set -e
3-
4-
readonly VERSION="3.8"
5-
6-
version=$(clang-format -version)
7-
8-
if ! [[ $version == *"$VERSION"* ]]; then
9-
echo "clang-format version check failed."
10-
echo "a version contains '$VERSION' is needed, but get '$version'"
11-
echo "you can install the right version, and make an soft-link to '\$PATH' env"
12-
exit -1
13-
fi
14-
15-
clang-format $@
1+
#!/bin/bash
2+
set -e
3+
4+
readonly VERSION="3.8"
5+
6+
version=$(clang-format -version)
7+
8+
if ! [[ $version == *"$VERSION"* ]]; then
9+
echo "clang-format version check failed."
10+
echo "a version contains '$VERSION' is needed, but get '$version'"
11+
echo "you can install the right version, and make an soft-link to '\$PATH' env"
12+
exit -1
13+
fi
14+
15+
clang-format $@

‎.gitignore

Lines changed: 134 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,134 @@
1-
# Byte-compiled / optimized / DLL files
2-
__pycache__/
3-
__MACOSX
4-
*.py[cod]
5-
*$py.class
6-
7-
# C extensions
8-
*.so
9-
10-
# Distribution / packaging
11-
.Python
12-
build/
13-
develop-eggs/
14-
dist/
15-
downloads/
16-
eggs/
17-
.eggs/
18-
lib/
19-
lib64/
20-
parts/
21-
sdist/
22-
var/
23-
wheels/
24-
share/python-wheels/
25-
*.egg-info/
26-
.installed.cfg
27-
*.egg
28-
MANIFEST
29-
30-
# PyInstaller
31-
# Usually these files are written by a python script from a template
32-
# before PyInstaller builds the exe, so as to inject date/other infos into it.
33-
*.manifest
34-
*.spec
35-
36-
# Installer logs
37-
pip-log.txt
38-
pip-delete-this-directory.txt
39-
40-
# Unit test / coverage reports
41-
htmlcov/
42-
.tox/
43-
.nox/
44-
.coverage
45-
.coverage.*
46-
.cache
47-
nosetests.xml
48-
coverage.xml
49-
*.cover
50-
.hypothesis/
51-
.pytest_cache/
52-
53-
# Translations
54-
*.mo
55-
*.pot
56-
57-
# Django stuff:
58-
*.log
59-
local_settings.py
60-
db.sqlite3
61-
62-
# Flask stuff:
63-
instance/
64-
.webassets-cache
65-
66-
# Scrapy stuff:
67-
.scrapy
68-
69-
# Sphinx documentation
70-
docs/_build/
71-
72-
# PyBuilder
73-
target/
74-
75-
# Jupyter Notebook
76-
.ipynb_checkpoints
77-
78-
# IPython
79-
profile_default/
80-
ipython_config.py
81-
82-
# pyenv
83-
.python-version
84-
85-
# celery beat schedule file
86-
celerybeat-schedule
87-
88-
# SageMath parsed files
89-
*.sage.py
90-
91-
# Environments
92-
.env
93-
.venv
94-
env/
95-
venv/
96-
ENV/
97-
env.bak/
98-
venv.bak/
99-
100-
# Spyder project settings
101-
.spyderproject
102-
.spyproject
103-
104-
# Rope project settings
105-
.ropeproject
106-
107-
# mkdocs documentation
108-
/site
109-
110-
# mypy
111-
.mypy_cache/
112-
.dmypy.json
113-
dmypy.json
114-
115-
# Pyre type checker
116-
.pyre/
117-
118-
# pycharm
119-
.DS_Store
120-
.idea/
121-
FETCH_HEAD
122-
123-
# vscode
124-
.vscode
125-
126-
# numpy
127-
.npy
128-
129-
# vtk
130-
*.vtk
131-
*.vtu
132-
133-
# auto generated version file by setuptools_scm
134-
ppsci/_version.py
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
__MACOSX
4+
*.py[cod]
5+
*$py.class
6+
7+
# C extensions
8+
*.so
9+
10+
# Distribution / packaging
11+
.Python
12+
build/
13+
develop-eggs/
14+
dist/
15+
downloads/
16+
eggs/
17+
.eggs/
18+
lib/
19+
lib64/
20+
parts/
21+
sdist/
22+
var/
23+
wheels/
24+
share/python-wheels/
25+
*.egg-info/
26+
.installed.cfg
27+
*.egg
28+
MANIFEST
29+
30+
# PyInstaller
31+
# Usually these files are written by a python script from a template
32+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
33+
*.manifest
34+
*.spec
35+
36+
# Installer logs
37+
pip-log.txt
38+
pip-delete-this-directory.txt
39+
40+
# Unit test / coverage reports
41+
htmlcov/
42+
.tox/
43+
.nox/
44+
.coverage
45+
.coverage.*
46+
.cache
47+
nosetests.xml
48+
coverage.xml
49+
*.cover
50+
.hypothesis/
51+
.pytest_cache/
52+
53+
# Translations
54+
*.mo
55+
*.pot
56+
57+
# Django stuff:
58+
*.log
59+
local_settings.py
60+
db.sqlite3
61+
62+
# Flask stuff:
63+
instance/
64+
.webassets-cache
65+
66+
# Scrapy stuff:
67+
.scrapy
68+
69+
# Sphinx documentation
70+
docs/_build/
71+
72+
# PyBuilder
73+
target/
74+
75+
# Jupyter Notebook
76+
.ipynb_checkpoints
77+
78+
# IPython
79+
profile_default/
80+
ipython_config.py
81+
82+
# pyenv
83+
.python-version
84+
85+
# celery beat schedule file
86+
celerybeat-schedule
87+
88+
# SageMath parsed files
89+
*.sage.py
90+
91+
# Environments
92+
.env
93+
.venv
94+
env/
95+
venv/
96+
ENV/
97+
env.bak/
98+
venv.bak/
99+
100+
# Spyder project settings
101+
.spyderproject
102+
.spyproject
103+
104+
# Rope project settings
105+
.ropeproject
106+
107+
# mkdocs documentation
108+
/site
109+
110+
# mypy
111+
.mypy_cache/
112+
.dmypy.json
113+
dmypy.json
114+
115+
# Pyre type checker
116+
.pyre/
117+
118+
# pycharm
119+
.DS_Store
120+
.idea/
121+
FETCH_HEAD
122+
123+
# vscode
124+
.vscode
125+
126+
# numpy
127+
.npy
128+
129+
# vtk
130+
*.vtk
131+
*.vtu
132+
133+
# auto generated version file by setuptools_scm
134+
ppsci/_version.py

‎.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< Updated upstream
12
[submodule "competition/IJCAI_2024_CAR"]
23
path = competition/IJCAI_2024_CAR
34
url = https://atomgit.com/paddlenumberone/ijcai_car.git
@@ -22,3 +23,8 @@
2223
[submodule "ppsci/externals/paddle_scatter"]
2324
path = ppsci/externals/paddle_scatter
2425
url = https://github.com/PFCCLab/paddle_scatter
26+
=======
27+
[submodule "competition/IJCAI_2024_CAR"]
28+
path = competition/IJCAI_2024_CAR
29+
url = https://atomgit.com/paddlenumberone/ijcai_car.git
30+
>>>>>>> Stashed changes

0 commit comments

Comments
 (0)