Merge branch 'develop' into dev_model

Author: ZcwDev

.gitmodules

@@ -1,3 +1,24 @@
 [submodule "competition/IJCAI_2024_CAR"]
 	path = competition/IJCAI_2024_CAR
 	url = https://atomgit.com/paddlenumberone/ijcai_car.git
+[submodule "ppsci/externals/Open3D"]
+	path = ppsci/externals/Open3D
+	url = https://github.com/PFCCLab/Open3D.git
+[submodule "ppsci/externals/deepali"]
+	path = ppsci/externals/deepali
+	url = https://github.com/PFCCLab/deepali.git
+[submodule "ppsci/externals/paddle_harmonics"]
+	path = ppsci/externals/paddle_harmonics
+	url = https://github.com/PFCCLab/paddle_harmonics.git
+[submodule "ppsci/externals/neuraloperator"]
+	path = ppsci/externals/neuraloperator
+	url = https://github.com/PFCCLab/neuraloperator.git
+[submodule "ppsci/externals/tensorly"]
+	path = ppsci/externals/tensorly
+	url = https://github.com/tensorly/tensorly.git
+[submodule "ppsci/externals/warp"]
+	path = ppsci/externals/warp
+	url = https://github.com/NVIDIA/warp.git
+[submodule "ppsci/externals/paddle_scatter"]
+	path = ppsci/externals/paddle_scatter
+	url = https://github.com/PFCCLab/paddle_scatter

README.md

@@ -38,7 +38,7 @@ class Predictor:
     Args:
         pdmodel_path (Optional[str]): Path to the PaddlePaddle model file. Defaults to None.
         pdiparams_path (Optional[str]): Path to the PaddlePaddle model parameters file. Defaults to None.
-        device (Literal["gpu", "cpu", "npu", "xpu"], optional): Device to use for inference. Defaults to "cpu".
+        device (Literal["cpu", "gpu", "npu", "xpu", "sdaa"], optional): Device to use for inference. Defaults to "cpu".
         engine (Literal["native", "tensorrt", "onnx", "mkldnn"], optional): Inference engine to use. Defaults to "native".
         precision (Literal["fp32", "fp16", "int8"], optional): Precision to use for inference. Defaults to "fp32".
         onnx_path (Optional[str], optional): Path to the ONNX model file. Defaults to None.
@@ -54,7 +54,7 @@ def __init__(
         pdmodel_path: Optional[str] = None,
         pdiparams_path: Optional[str] = None,
         *,
-        device: Literal["gpu", "cpu", "npu", "xpu"] = "cpu",
+        device: Literal["cpu", "gpu", "npu", "xpu", "sdaa"] = "cpu",
         engine: Literal["native", "tensorrt", "onnx", "mkldnn"] = "native",
         precision: Literal["fp32", "fp16", "int8"] = "fp32",
         onnx_path: Optional[str] = None,
@@ -214,9 +214,9 @@ def _create_onnx_predictor(
         return predictor, config
 
     def _check_device(self, device: str):
-        if device not in ["gpu", "cpu", "npu", "xpu"]:
+        if device not in ["cpu", "gpu", "npu", "xpu", "sdaa"]:
             raise ValueError(
-                "Inference only supports 'gpu', 'cpu', 'npu' and 'xpu' devices, "
+                "Inference only supports 'gpu', 'cpu', 'npu', 'xpu' and 'sdaa' devices, "
                 f"but got {device}."
             )
 

deploy/python_infer/base.py

@@ -9,7 +9,7 @@ mkdocs-include-markdown-plugin
 mkdocs-material
 mkdocs-material-extensions
 mkdocs-video
-mkdocstrings
+mkdocstrings==0.27.0
 mkdocstrings-python
 numpy>=1.20.0,<2.0.0
 pyyaml

docs/index.md

@@ -37,5 +37,8 @@
         - USCNN
         - LNO
         - TGCN
+        - RegDGCNN
+        - RegPointNet
+        - IFMMLP
       show_root_heading: true
       heading_level: 3

docs/requirements.txt

@@ -32,4 +32,7 @@
         - MOlFLOWDataset
         - CGCNNDataset
         - PEMSDataset
+        - DrivAerNetDataset
+        - DrivAerNetPlusPlusDataset
+        - IFMMoeDataset
       show_root_heading: true

docs/zh/api/arch.md

@@ -13,5 +13,6 @@
         - OneCycleLR
         - Piecewise
         - Step
+        - ReduceOnPlateau
       show_root_heading: true
       heading_level: 3

docs/zh/api/data/dataset.md

@@ -13,5 +13,7 @@
         - MeanL2Rel
         - MSE
         - RMSE
+        - MaxAE
+        - R2Score
       show_root_heading: true
       heading_level: 3

docs/zh/api/lr_scheduler.md

@@ -11,5 +11,6 @@
         - OptimizerList
         - RMSProp
         - SGD
+        - SOAP
       show_root_heading: true
       heading_level: 3