Skip to content

[Docker] Update dockerfile & refine aneurysm #789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 27, 2024
Merged

[Docker] Update dockerfile & refine aneurysm #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
89c251c
Merge pull request #44 from PaddlePaddle/develop
HydrogenSulfate Feb 22, 2024
b4e59a6
Merge pull request #45 from PaddlePaddle/develop
HydrogenSulfate Feb 23, 2024
f67cc71
Merge branch 'PaddlePaddle:develop' into develop
HydrogenSulfate Feb 23, 2024
61b1ab9
Merge branch 'develop' of https://github.com/HydrogenSulfate/PaddleSc…
HydrogenSulfate Feb 26, 2024
6aee31a
update pymesh package and dockerfile for python3.9
HydrogenSulfate Feb 27, 2024
cd83702
refine aneurysm code for export and inference
HydrogenSulfate Feb 27, 2024
685c379
install requirements.txt before executing setup.py for pymesh
HydrogenSulfate Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion docs/zh/install_setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions examples/aneurysm/aneurysm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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__":
Expand Down