Skip to content

Commit 3959411

Browse files
committed
merge code of upstream
2 parents 1dce426 + 1301ea6 commit 3959411

File tree

216 files changed

+12933
-947
lines changed

Some content is hidden

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

216 files changed

+12933
-947
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: GitHub Actions Demo
2+
run-name: ${{ github.actor }} is testing out GitHub Actions 🚀
3+
on: [push]
4+
jobs:
5+
Explore-GitHub-Actions:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
9+
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
10+
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
11+
- name: Check out repository code
12+
uses: actions/checkout@v4
13+
- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
14+
- run: echo "🖥️ The workflow is now ready to test your code on the runner."
15+
- name: List files in the repository
16+
run: |
17+
ls ${{ github.workspace }}
18+
- run: echo "🍏 This job's status is ${{ job.status }}."

.gitmodules

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
11
[submodule "competition/IJCAI_2024_CAR"]
22
path = competition/IJCAI_2024_CAR
33
url = https://atomgit.com/paddlenumberone/ijcai_car.git
4+
[submodule "ppsci/externals/Open3D"]
5+
path = ppsci/externals/Open3D
6+
url = https://github.com/PFCCLab/Open3D.git
7+
[submodule "ppsci/externals/deepali"]
8+
path = ppsci/externals/deepali
9+
url = https://github.com/PFCCLab/deepali.git
10+
[submodule "ppsci/externals/paddle_harmonics"]
11+
path = ppsci/externals/paddle_harmonics
12+
url = https://github.com/PFCCLab/paddle_harmonics.git
13+
[submodule "ppsci/externals/neuraloperator"]
14+
path = ppsci/externals/neuraloperator
15+
url = https://github.com/PFCCLab/neuraloperator.git
16+
[submodule "ppsci/externals/tensorly"]
17+
path = ppsci/externals/tensorly
18+
url = https://github.com/tensorly/tensorly.git
19+
[submodule "ppsci/externals/warp"]
20+
path = ppsci/externals/warp
21+
url = https://github.com/NVIDIA/warp.git
22+
[submodule "ppsci/externals/paddle_scatter"]
23+
path = ppsci/externals/paddle_scatter
24+
url = https://github.com/PFCCLab/paddle_scatter

deploy/python_infer/base.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Predictor:
3838
Args:
3939
pdmodel_path (Optional[str]): Path to the PaddlePaddle model file. Defaults to None.
4040
pdiparams_path (Optional[str]): Path to the PaddlePaddle model parameters file. Defaults to None.
41-
device (Literal["gpu", "cpu", "npu", "xpu"], optional): Device to use for inference. Defaults to "cpu".
41+
device (Literal["cpu", "gpu", "npu", "xpu", "sdaa"], optional): Device to use for inference. Defaults to "cpu".
4242
engine (Literal["native", "tensorrt", "onnx", "mkldnn"], optional): Inference engine to use. Defaults to "native".
4343
precision (Literal["fp32", "fp16", "int8"], optional): Precision to use for inference. Defaults to "fp32".
4444
onnx_path (Optional[str], optional): Path to the ONNX model file. Defaults to None.
@@ -54,7 +54,7 @@ def __init__(
5454
pdmodel_path: Optional[str] = None,
5555
pdiparams_path: Optional[str] = None,
5656
*,
57-
device: Literal["gpu", "cpu", "npu", "xpu"] = "cpu",
57+
device: Literal["cpu", "gpu", "npu", "xpu", "sdaa"] = "cpu",
5858
engine: Literal["native", "tensorrt", "onnx", "mkldnn"] = "native",
5959
precision: Literal["fp32", "fp16", "int8"] = "fp32",
6060
onnx_path: Optional[str] = None,
@@ -214,9 +214,9 @@ def _create_onnx_predictor(
214214
return predictor, config
215215

216216
def _check_device(self, device: str):
217-
if device not in ["gpu", "cpu", "npu", "xpu"]:
217+
if device not in ["cpu", "gpu", "npu", "xpu", "sdaa"]:
218218
raise ValueError(
219-
"Inference only supports 'gpu', 'cpu', 'npu' and 'xpu' devices, "
219+
"Inference only supports 'gpu', 'cpu', 'npu', 'xpu' and 'sdaa' devices, "
220220
f"but got {device}."
221221
)
222222

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ mkdocs-include-markdown-plugin
99
mkdocs-material
1010
mkdocs-material-extensions
1111
mkdocs-video
12-
mkdocstrings
12+
mkdocstrings==0.27.0
1313
mkdocstrings-python
1414
numpy>=1.20.0,<2.0.0
1515
pyyaml

docs/zh/api/arch.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
- FNO1d
2222
- Generator
2323
- HEDeepONets
24+
- KAN
2425
- LorenzEmbedding
2526
- MLP
2627
- ModelList
@@ -37,5 +38,8 @@
3738
- USCNN
3839
- LNO
3940
- TGCN
41+
- RegDGCNN
42+
- RegPointNet
43+
- IFMMLP
4044
show_root_heading: true
4145
heading_level: 3

docs/zh/api/data/dataset.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,7 @@
3232
- MOlFLOWDataset
3333
- CGCNNDataset
3434
- PEMSDataset
35+
- DrivAerNetDataset
36+
- DrivAerNetPlusPlusDataset
37+
- IFMMoeDataset
3538
show_root_heading: true

docs/zh/api/lr_scheduler.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
- OneCycleLR
1414
- Piecewise
1515
- Step
16+
- ReduceOnPlateau
1617
show_root_heading: true
1718
heading_level: 3

docs/zh/api/metric.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@
1313
- MeanL2Rel
1414
- MSE
1515
- RMSE
16+
- MaxAE
17+
- R2Score
1618
show_root_heading: true
1719
heading_level: 3

docs/zh/api/optimizer.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
- OptimizerList
1212
- RMSProp
1313
- SGD
14+
- SOAP
1415
show_root_heading: true
1516
heading_level: 3

docs/zh/api/visualize.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- VisualizerWeather
1616
- save_plot_from_1d_dict
1717
- save_plot_from_3d_dict
18+
- save_vtp_from_dict
1819
- save_vtu_from_dict
1920
- save_vtu_to_mesh
2021
show_root_heading: true

0 commit comments

Comments
 (0)