Merge branch 'develop' of https://github.com/HydrogenSulfate/PaddleSc…

…ience into develop
PaddlePaddle · Feb 29, 2024 · 835ea6a · 835ea6a
2 parents 61b1ab9 + 7e0cf12
commit 835ea6a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -42,7 +42,8 @@ RUN cd /src && \
     ls /src && \
     tar -xvf pymesh.tar.xz && \
     cd pymesh && \
-    python3 setup.py install && \
+    python3 -m pip install -r python/requirements.txt && \
+    python3 setup.py install --user && \
     rm -rf /src
 
 ENV PATH="$PATH:/usr/lib/x86_64-linux-gnu/"

diff --git a/docs/zh/install_setup.md b/docs/zh/install_setup.md
@@ -107,7 +107,7 @@ pybind11、pysdf、PyMesh 四个依赖库（上述**1.1 从 docker 镜像启动*
     如未安装，可按照下列命令下载、解压 cmake 包，并添加到 `PATH` 变量中即可完成安装。
 
     ``` sh
-    wget -nc https://cmake.org/files/v3.23/cmake-3.23.0-linux-x86_64.tar.gz
+    wget -nc https://paddle-org.bj.bcebos.com/paddlescience/cmake-3.23.0-linux-x86_64.tar.gz
     tar -zxvf cmake-3.23.0-linux-x86_64.tar.gz
     rm -f cmake-3.23.0-linux-x86_64.tar.gz
     PATH=$PWD/cmake-3.23.0-linux-x86_64/bin:$PATH

diff --git a/examples/aneurysm/aneurysm.py b/examples/aneurysm/aneurysm.py
@@ -340,7 +340,6 @@ def export(cfg: DictConfig):
     # initialize solver
     solver = ppsci.solver.Solver(
         model,
-        output_dir=cfg.output_dir,
         pretrained_model_path=cfg.INFER.pretrained_model_path,
     )
     # export model
@@ -401,7 +400,9 @@ def main(cfg: DictConfig):
     elif cfg.mode == "infer":
         inference(cfg)
     else:
-        raise ValueError(f"cfg.mode should in ['train', 'eval'], but got '{cfg.mode}'")
+        raise ValueError(
+            f"cfg.mode should in ['train', 'eval', 'export', 'infer'], but got '{cfg.mode}'"
+        )
 
 
 if __name__ == "__main__":