Skip to content

Commit 24edd0d

Browse files
Merge branch 'devel' into xpu
2 parents fde2735 + 55fd75f commit 24edd0d

85 files changed

Lines changed: 3809 additions & 321 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.

.devcontainer/build_cxx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cmake -D ENABLE_TENSORFLOW=ON \
1313
-D ENABLE_PYTORCH=ON \
1414
-D ENABLE_PADDLE=ON \
1515
-D CMAKE_INSTALL_PREFIX=${SCRIPT_PATH}/../dp/ \
16-
-D LAMMPS_VERSION=stable_22Jul2025_update1 \
16+
-D LAMMPS_VERSION=stable_22Jul2025_update2 \
1717
-D CMAKE_BUILD_TYPE=Debug \
1818
-D BUILD_TESTING:BOOL=TRUE \
1919
-D TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ updates:
55
schedule:
66
interval: "weekly"
77
target-branch: "devel"
8+
- package-ecosystem: "pip"
9+
directory: "/"
10+
schedule:
11+
interval: "weekly"
12+
target-branch: "devel"

.github/workflows/build_cc.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,13 @@ jobs:
2929
- variant: clang
3030
dp_variant: clang
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
- uses: actions/setup-python@v6
3434
with:
3535
python-version: '3.11'
3636
- uses: lukka/get-cmake@latest
3737
- run: python -m pip install uv
38-
- run: source/install/uv_with_retry.sh pip install --system tensorflow
39-
- run: source/install/uv_with_retry.sh pip install --system 'torch==2.8.*' --index-url https://download.pytorch.org/whl/cpu
38+
- run: source/install/uv_with_retry.sh pip install --system --group pin_tensorflow_cpu --group pin_pytorch_cpu --torch-backend cpu
4039
- run: |
4140
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.0-1_all.deb \
4241
&& sudo dpkg -i cuda-keyring_1.0-1_all.deb \

.github/workflows/build_wheel.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
platform_id: manylinux_aarch64
5858
dp_variant: cpu
5959
steps:
60-
- uses: actions/checkout@v5
60+
- uses: actions/checkout@v6
6161
with:
6262
# https://github.com/pypa/setuptools_scm/issues/480
6363
fetch-depth: 0
@@ -73,7 +73,7 @@ jobs:
7373
rm -rf .git
7474
if: matrix.dp_pkg_name == 'deepmd-kit-cu11'
7575
- name: Build wheels
76-
uses: pypa/cibuildwheel@v3.2
76+
uses: pypa/cibuildwheel@v3.3
7777
env:
7878
CIBW_BUILD_VERBOSITY: 1
7979
CIBW_ARCHS: all
@@ -90,7 +90,7 @@ jobs:
9090
name: Build source distribution
9191
runs-on: ubuntu-latest
9292
steps:
93-
- uses: actions/checkout@v5
93+
- uses: actions/checkout@v6
9494
with:
9595
fetch-depth: 0
9696
- name: Build sdist
@@ -131,7 +131,7 @@ jobs:
131131
steps:
132132
- name: Delete huge unnecessary tools folder
133133
run: rm -rf /opt/hostedtoolcache
134-
- uses: actions/checkout@v5
134+
- uses: actions/checkout@v6
135135
- uses: actions/download-artifact@v6
136136
with:
137137
path: source/install/docker/dist

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout repository
33-
uses: actions/checkout@v5
33+
uses: actions/checkout@v6
3434
- uses: actions/setup-python@v6
3535
with:
3636
python-version: '3.11'
@@ -43,8 +43,8 @@ jobs:
4343
&& sudo dpkg -i cuda-keyring_1.0-1_all.deb \
4444
&& sudo apt-get update \
4545
&& sudo apt-get -y install cuda-cudart-dev-12-2 cuda-nvcc-12-2
46-
python -m pip install tensorflow
47-
python -m pip install 'torch==2.8.*' --index-url https://download.pytorch.org/whl/cpu
46+
python -m pip install uv
47+
uv pip install --system --group pin_tensorflow_cpu --group pin_pytorch_cpu --torch-backend cpu
4848
env:
4949
DEBIAN_FRONTEND: noninteractive
5050
# Initializes the CodeQL tools for scanning.

.github/workflows/copilot-setup-steps.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
# If you do not check out your code, Copilot will do this for you.
3131
steps:
3232
- name: Checkout code
33-
uses: actions/checkout@v5
33+
uses: actions/checkout@v6
3434

3535
- name: Set up Python
3636
uses: actions/setup-python@v6
@@ -49,10 +49,7 @@ jobs:
4949
run: echo "VIRTUAL_ENV=$PWD/venv" >> $GITHUB_ENV && echo "$PWD/venv/bin" >> $GITHUB_PATH
5050

5151
- name: Install base dependencies
52-
run: uv pip install tensorflow-cpu
53-
54-
- name: Install PyTorch
55-
run: uv pip install torch --index-url https://download.pytorch.org/whl/cpu
52+
run: uv pip install --group pin_tensorflow_cpu --group pin_pytorch_cpu --torch-backend cpu
5653

5754
- name: Build Python package
5855
run: uv pip install -e .[cpu,test]

.github/workflows/package_c.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,17 @@ jobs:
2828
tensorflow_version: ">=2.5.0,<2.15"
2929
filename: libdeepmd_c_cu11.tar.gz
3030
steps:
31-
- uses: actions/checkout@v5
31+
- name: Free Disk Space (Ubuntu)
32+
uses: insightsengineering/disk-space-reclaimer@v1
33+
with:
34+
tools-cache: true
35+
android: true
36+
dotnet: true
37+
haskell: true
38+
large-packages: true
39+
swap-storage: true
40+
docker-images: true
41+
- uses: actions/checkout@v6
3242
with:
3343
fetch-depth: 0
3444
- name: Package C library
@@ -56,7 +66,7 @@ jobs:
5666
needs: [build_c]
5767
runs-on: ubuntu-22.04
5868
steps:
59-
- uses: actions/checkout@v5
69+
- uses: actions/checkout@v6
6070
- name: Download artifact
6171
uses: actions/download-artifact@v6
6272
with:

.github/workflows/test_cc.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
matrix:
2020
check_memleak: [true, false]
2121
steps:
22-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2323
- uses: actions/setup-python@v6
2424
with:
2525
python-version: '3.11'
@@ -28,10 +28,9 @@ jobs:
2828
- run: python -m pip install uv
2929
- name: Install Python dependencies
3030
run: |
31-
source/install/uv_with_retry.sh pip install --system tensorflow-cpu~=2.18.0 jax==0.5.0
31+
source/install/uv_with_retry.sh pip install --system --group pin_tensorflow_cpu --group pin_pytorch_cpu --group pin_jax --torch-backend cpu
3232
export TENSORFLOW_ROOT=$(python -c 'import importlib.util,pathlib;print(pathlib.Path(importlib.util.find_spec("tensorflow").origin).parent)')
3333
source/install/uv_with_retry.sh pip install --system -e .[cpu,test,lmp,jax] mpi4py mpich
34-
source/install/uv_with_retry.sh pip install --system 'torch==2.8.*' --index-url https://download.pytorch.org/whl/cpu
3534
- name: Convert models
3635
run: source/tests/infer/convert-models.sh
3736
# https://github.com/actions/runner-images/issues/9491

.github/workflows/test_cuda.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- name: Make sudo and git work
2727
run: apt-get update && apt-get install -y sudo git
28-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2929
- uses: actions/setup-python@v6
3030
with:
3131
python-version: '3.11'
@@ -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 "tensorflow~=2.18.0rc2" "torch~=2.7.0" "jax[cuda12]==0.5.0"
46+
- run: source/install/uv_with_retry.sh pip install --system --group pin_tensorflow_gpu --group pin_pytorch_gpu --group pin_jax "jax[cuda12]"
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: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,16 @@ jobs:
2222
python: ["3.9", "3.12"]
2323

2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
- uses: actions/setup-python@v6
2727
with:
2828
python-version: ${{ matrix.python }}
2929
- run: python -m pip install -U uv
3030
- run: |
31-
source/install/uv_with_retry.sh pip install --system openmpi tensorflow-cpu~=2.18.0
32-
source/install/uv_with_retry.sh pip install --system torch -i https://download.pytorch.org/whl/cpu
31+
source/install/uv_with_retry.sh pip install --system openmpi --group pin_tensorflow_cpu --group pin_pytorch_cpu --torch-backend cpu
3332
export TENSORFLOW_ROOT=$(python -c 'import importlib.util,pathlib;print(pathlib.Path(importlib.util.find_spec("tensorflow").origin).parent)')
3433
export PYTORCH_ROOT=$(python -c 'import torch;print(torch.__path__[0])')
35-
source/install/uv_with_retry.sh pip install --system -e .[test,jax] mpi4py "jax==0.5.0;python_version>='3.10'"
34+
source/install/uv_with_retry.sh pip install --system -e .[test,jax] mpi4py --group pin_jax
3635
source/install/uv_with_retry.sh pip install --system -U setuptools
3736
source/install/uv_with_retry.sh pip install --system horovod --no-build-isolation
3837
source/install/uv_with_retry.sh pip install --system --pre "paddlepaddle" -i https://www.paddlepaddle.org.cn/packages/stable/cpu/

0 commit comments

Comments
 (0)