Skip to content

Commit 4c61898

Browse files
authored
Merge branch 'master' into 0330-default-pf
Signed-off-by: Duo <50307526+iProzd@users.noreply.github.com>
2 parents 7d8a307 + 57f870f commit 4c61898

337 files changed

Lines changed: 47954 additions & 7093 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Discussion Templates
2+
3+
This directory contains GitHub Discussion category forms for DeePMD-kit.
4+
5+
## Active template
6+
7+
- `q-a.yml`**Q&A**
8+
9+
## Notes
10+
11+
- The filename must match the discussion category slug exactly.
12+
- GitHub Discussion forms only support a limited set of top-level keys, such as `title`, `labels`, and `body`.
13+
- This Q&A template is intentionally lightweight; most fields are optional and should be filled only when relevant.
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
title: "[Q&A] "
2+
labels: ["question"]
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
Use this form for Q&A discussions.
8+
9+
This template is intentionally lightweight.
10+
**Only fill the technical fields below if they are relevant to your question.**
11+
12+
If your question is about using DeePMD-kit or diagnosing a problem, version info and a minimal reproducible example can help others answer faster.
13+
- type: textarea
14+
id: question
15+
attributes:
16+
label: Question
17+
description: Please describe your question clearly.
18+
placeholder: What would you like to ask?
19+
value:
20+
validations:
21+
required: true
22+
- type: input
23+
id: version
24+
attributes:
25+
label: DeePMD-kit Version
26+
description: "If applicable: `dp --version`."
27+
placeholder: "e.g., 2.2.7"
28+
validations:
29+
required: false
30+
- type: input
31+
id: backend-version
32+
attributes:
33+
label: Backend and its version
34+
description: "If applicable: the backend and its version will be printed when running DeePMD-kit, e.g. TensorFlow v2.15.0."
35+
placeholder: "e.g., TensorFlow v2.15.0"
36+
validations:
37+
required: false
38+
- type: textarea
39+
id: other-version
40+
attributes:
41+
label: Python Version, CUDA Version, GCC Version, LAMMPS Version, etc
42+
description: "If applicable, specify your platform or environment details."
43+
placeholder:
44+
value:
45+
validations:
46+
required: false
47+
- type: textarea
48+
id: details
49+
attributes:
50+
label: Details
51+
description: "If applicable, add more context such as what you are trying to do, what you have tried, and where you got stuck."
52+
placeholder:
53+
value:
54+
validations:
55+
required: false
56+
- type: textarea
57+
id: reproducible-example
58+
attributes:
59+
label: Reproducible Example, Input Files, and Commands
60+
description: |
61+
If applicable, provide a minimal reproducible example.
62+
For software-usage questions, this is often the fastest way to get a useful answer.
63+
placeholder: |
64+
Commands:
65+
```bash
66+
dp train input.json
67+
```
68+
69+
Input / config:
70+
```json
71+
{
72+
"model": {}
73+
}
74+
```
75+
76+
Expected behavior:
77+
...
78+
79+
Actual behavior / error message:
80+
...
81+
value:
82+
validations:
83+
required: false
84+
- type: textarea
85+
id: further
86+
attributes:
87+
label: Further Information, Files, and Links
88+
description: Put any additional information here, including links to docs, papers, related issues, screenshots, or external resources.
89+
placeholder:
90+
value:
91+
validations:
92+
required: false

.github/labeler.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ C:
3030
LAMMPS:
3131
- changed-files:
3232
- any-glob-to-any-file: source/lmp/**/*
33-
Gromacs:
34-
- changed-files:
35-
- any-glob-to-any-file: source/gmx/**/*
3633
i-PI:
3734
- changed-files:
3835
- any-glob-to-any-file: source/ipi/**/*

.github/workflows/build_wheel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
ls dist/packages > package_list.txt
172172
dumb-pypi --output-dir dist --packages-url ../../packages --package-list package_list.txt --title "DeePMD-kit Developed Packages"
173173
- name: Upload Pages artifact
174-
uses: actions/upload-pages-artifact@v4
174+
uses: actions/upload-pages-artifact@v5
175175
with:
176176
path: dist
177177
deploy_pypi_index:

.github/workflows/package_c.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Test C library
5555
run: ./source/install/docker_test_package_c.sh
5656
- name: Release
57-
uses: softprops/action-gh-release@v2
57+
uses: softprops/action-gh-release@v3
5858
if: startsWith(github.ref, 'refs/tags/')
5959
with:
6060
files: ${{ matrix.filename }}

.github/workflows/test_cc.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- run: python -m pip install uv
4545
- name: Install Python dependencies
4646
run: |
47-
source/install/uv_with_retry.sh pip install --system --group pin_tensorflow_cpu --group pin_pytorch_cpu --group pin_jax --torch-backend cpu
47+
source/install/uv_with_retry.sh pip install --system --group pin_tensorflow_cpu --group pin_pytorch_cpu --group pin_jax_cpu --torch-backend cpu
4848
export TENSORFLOW_ROOT=$(python -c 'import importlib.util,pathlib;print(pathlib.Path(importlib.util.find_spec("tensorflow").origin).parent)')
4949
source/install/uv_with_retry.sh pip install --system -e .[cpu,test,lmp,jax] mpi4py mpich
5050
- name: Convert models
@@ -98,7 +98,9 @@ jobs:
9898
ENABLE_JAX: ${{ matrix.enable_tensorflow && '1' || '0' }}
9999
ENABLE_PADDLE: ${{ matrix.enable_paddle && '1' || '0' }}
100100
if: ${{ !matrix.check_memleak }}
101-
- uses: codecov/codecov-action@v5
101+
- name: Upload coverage to Codecov (non-blocking)
102+
uses: codecov/codecov-action@v6
103+
continue-on-error: true
102104
with:
103105
use_oidc: true
104106
permissions:

.github/workflows/test_cuda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
&& sudo apt-get -y install cuda-12-3 libcudnn8=8.9.5.*-1+cuda12.3
4444
if: false # skip as we use nvidia image
4545
- run: python -m pip install -U uv
46-
- run: source/install/uv_with_retry.sh pip install --system --group pin_tensorflow_gpu --group pin_pytorch_gpu --group pin_jax "jax[cuda12]"
46+
- run: source/install/uv_with_retry.sh pip install --system --group pin_tensorflow_gpu --group pin_pytorch_gpu --group pin_jax_gpu
4747
- run: |
4848
export PYTORCH_ROOT=$(python -c 'import torch;print(torch.__path__[0])')
4949
export TENSORFLOW_ROOT=$(python -c 'import importlib.util,pathlib;print(pathlib.Path(importlib.util.find_spec("tensorflow").origin).parent)')

.github/workflows/test_python.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
source/install/uv_with_retry.sh pip install --system openmpi --group pin_tensorflow_cpu --group pin_pytorch_cpu --torch-backend cpu
3232
export TENSORFLOW_ROOT=$(python -c 'import importlib.util,pathlib;print(pathlib.Path(importlib.util.find_spec("tensorflow").origin).parent)')
3333
export PYTORCH_ROOT=$(python -c 'import torch;print(torch.__path__[0])')
34-
source/install/uv_with_retry.sh pip install --system -e .[test,jax] mpi4py --group pin_jax
34+
source/install/uv_with_retry.sh pip install --system -e .[test,jax] mpi4py --group pin_jax_cpu
3535
source/install/uv_with_retry.sh pip install --system --find-links "https://www.paddlepaddle.org.cn/packages/nightly/cpu/paddlepaddle/" --index-url https://pypi.org/simple --trusted-host www.paddlepaddle.org.cn --trusted-host paddlepaddle.org.cn paddlepaddle==3.4.0.dev20260310
3636
env:
3737
# Please note that uv has some issues with finding
@@ -76,7 +76,9 @@ jobs:
7676
name: split-${{ matrix.python }}-${{ matrix.group }}
7777
path: .test_durations_${{ matrix.group }}
7878
include-hidden-files: true
79-
- uses: codecov/codecov-action@v5
79+
- name: Upload coverage to Codecov (non-blocking)
80+
uses: codecov/codecov-action@v6
81+
continue-on-error: true
8082
with:
8183
use_oidc: true
8284
permissions:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ test_dp_test_*.out
6262

6363
# Training and model output files
6464
*.pth
65+
*.pte
66+
*.pt2
6567
*.ckpt*
6668
checkpoint
6769
lcurve.out
@@ -71,3 +73,4 @@ frozen_model.*
7173

7274
# Test system directories
7375
system/
76+
*.expected

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ repos:
2323
- id: check-toml
2424
# Python
2525
- repo: https://github.com/PyCQA/isort
26-
rev: 8.0.1
26+
rev: 9.0.0a3
2727
hooks:
2828
- id: isort
2929
files: \.py$
3030
exclude: ^source/3rdparty
3131
- repo: https://github.com/astral-sh/ruff-pre-commit
3232
# Ruff version.
33-
rev: v0.15.7
33+
rev: v0.15.12
3434
hooks:
3535
- id: ruff
3636
args: ["--fix"]
@@ -62,7 +62,7 @@ repos:
6262
- mdformat-gfm-alerts==2.0.0
6363
# C++
6464
- repo: https://github.com/pre-commit/mirrors-clang-format
65-
rev: v22.1.1
65+
rev: v22.1.4
6666
hooks:
6767
- id: clang-format
6868
exclude: ^(source/3rdparty|source/lib/src/gpu/cudart/.+\.inc|.+\.ipynb$|source/tests/infer/.+\.json$)
@@ -76,7 +76,7 @@ repos:
7676
exclude: ^(source/3rdparty|\.clang-format)
7777
# Shell
7878
- repo: https://github.com/scop/pre-commit-shfmt
79-
rev: v3.12.0-2
79+
rev: v3.13.1-1
8080
hooks:
8181
- id: shfmt
8282
# CMake

0 commit comments

Comments
 (0)