Skip to content

Commit e57b632

Browse files
committed
Merge branch 'deepmodeling:develop' into grad
# Conflicts: # tests/09_DeePKS/21_NO_GO_deepks_vdelta_r_1/deepks_hrdelta.csr.ref # tests/09_DeePKS/21_NO_GO_deepks_vdelta_r_1/deepks_hrtot.csr.ref # tests/09_DeePKS/22_NO_GO_deepks_vdelta_r_2/deepks_hrdelta.csr.ref # tests/09_DeePKS/22_NO_GO_deepks_vdelta_r_2/deepks_hrtot.csr.ref # tests/09_DeePKS/23_NO_KP_deepks_vdelta_r_1/deepks_hrdelta.csr.ref # tests/09_DeePKS/23_NO_KP_deepks_vdelta_r_1/deepks_hrtot.csr.ref # tests/09_DeePKS/24_NO_KP_deepks_vdelta_r_2/deepks_hrdelta.csr.ref # tests/09_DeePKS/24_NO_KP_deepks_vdelta_r_2/deepks_hrtot.csr.ref
2 parents 20ba86f + 1cd141d commit e57b632

778 files changed

Lines changed: 29469 additions & 17284 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.

.github/workflows/cuda.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ jobs:
5050
cmake --build build -j4
5151
cmake --install build
5252
53+
- name: Module_LCAO CUDA Unittests
54+
env:
55+
GTEST_COLOR: 'yes'
56+
OMP_NUM_THREADS: '2'
57+
run: |
58+
ctest --test-dir build -V --timeout 1700 -R '^(MODULE_LCAO_tddft_radial_interpolation_cuda_test|MODULE_LCAO_tddft_snap_psibeta_half_test)$'
59+
5360
- name: Test 11_PW_GPU
5461
run: |
5562
cd tests/11_PW_GPU
@@ -74,3 +81,15 @@ jobs:
7481
run: |
7582
cd tests/16_SDFT_GPU
7683
bash ../integrate/Autotest.sh -n 2 -f CASES_GPU.txt
84+
85+
- name: Test 01_PW on GPU
86+
run: |
87+
cd tests/01_PW
88+
find . -name INPUT | while read f; do
89+
if grep -q "^device" "$f"; then
90+
sed -i 's/^device.*/device gpu/' "$f"
91+
else
92+
echo "device gpu" >> "$f"
93+
fi
94+
done
95+
bash ../integrate/Autotest.sh -n 1 -a abacus -f CASES_GPU.txt

.github/workflows/devcontainer.yml

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,90 @@
11
name: Container
22

33
on:
4-
create:
54
push:
65
branches:
76
- develop
87
tags:
9-
- 'v*'
8+
- "v*"
109
workflow_dispatch:
1110

11+
permissions:
12+
contents: read
13+
packages: write
14+
15+
concurrency:
16+
group: container-${{ github.ref }}
17+
cancel-in-progress: ${{ github.ref == 'refs/heads/develop' }}
18+
1219
defaults:
1320
run:
1421
shell: bash
1522

1623
jobs:
1724
build_container_and_push:
25+
name: Build and push (${{ matrix.dockerfile }})
1826
runs-on: X64
19-
if: github.repository_owner == 'deepmodeling'
27+
28+
if: >-
29+
github.repository == 'deepmodeling/abacus-develop' &&
30+
(github.ref == 'refs/heads/develop' ||
31+
startsWith(github.ref, 'refs/tags/v'))
32+
2033
strategy:
2134
matrix:
22-
dockerfile: ["gnu","intel","cuda"]
35+
dockerfile:
36+
- gnu
37+
- intel
38+
- cuda
39+
2340
steps:
24-
- name: Force Clean Workspace
41+
- name: Configure Docker client
2542
run: |
26-
sudo chattr -i -R ${{ github.workspace }} 2>/dev/null || true
27-
sudo chown -R $USER:$USER ${{ github.workspace }}
28-
sudo find ${{ github.workspace }} -mindepth 1 -delete
29-
30-
- name: Checkout
31-
uses: actions/checkout@v7
43+
config_dir="${RUNNER_TEMP}/docker-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${{ matrix.dockerfile }}"
44+
mkdir -p "${config_dir}"
45+
echo "DOCKER_CONFIG=${config_dir}" >> "${GITHUB_ENV}"
3246
33-
- name: Docker meta
47+
- name: Docker metadata
3448
id: meta
3549
uses: docker/metadata-action@v6
3650
with:
3751
images: |
3852
ghcr.io/deepmodeling/abacus-${{ matrix.dockerfile }}
3953
dp-harbor-registry.us-east-1.cr.aliyuncs.com/deepmodeling/abacus-${{ matrix.dockerfile }}
54+
flavor: |
55+
latest=false
4056
tags: |
41-
type=semver,pattern={{version}},enable=${{ github.ref_type == 'tag' }}
57+
type=semver,pattern={{version}},value=${{ github.ref_name }},enable=${{ github.ref_type == 'tag' }}
4258
type=raw,value=latest
4359
44-
- name: Fix Docker Directory Permissions
45-
run: |
46-
sudo mkdir -p /home/runner/.docker
47-
sudo chown -R $USER:$USER /home/runner/.docker
48-
4960
- name: Setup Docker Buildx
5061
uses: docker/setup-buildx-action@v4
5162

5263
- name: Login to GitHub Container Registry
64+
if: github.event_name != 'workflow_dispatch'
5365
uses: docker/login-action@v4
5466
with:
5567
registry: ghcr.io
5668
username: ${{ github.actor }}
5769
password: ${{ secrets.GITHUB_TOKEN }}
5870

5971
- name: Login to Aliyun Registry
72+
if: github.event_name != 'workflow_dispatch'
6073
uses: docker/login-action@v4
6174
with:
6275
registry: dp-harbor-registry.us-east-1.cr.aliyuncs.com
63-
# AliCloud automatically mirrors to registry.dp.tech
76+
# AliCloud automatically mirrors this registry to registry.dp.tech.
6477
username: ${{ secrets.DP_HARBOR_USERNAME }}
6578
password: ${{ secrets.DP_HARBOR_PASSWORD }}
6679

67-
- name: Build and Push Container
80+
- name: Build and push container
6881
uses: docker/build-push-action@v7
6982
with:
83+
context: "{{defaultContext}}"
84+
file: Dockerfile.${{ matrix.dockerfile }}
85+
push: ${{ github.event_name != 'workflow_dispatch' }}
7086
tags: ${{ steps.meta.outputs.tags }}
7187
labels: ${{ steps.meta.outputs.labels }}
72-
file: Dockerfile.${{ matrix.dockerfile }}
73-
push: true
74-
cache-from: type=registry,ref=ghcr.io/deepmodeling/abacus-${{ matrix.dockerfile }}:latest
88+
cache-from: |
89+
type=registry,ref=ghcr.io/deepmodeling/abacus-${{ matrix.dockerfile }}:latest
7590
cache-to: type=inline

.github/workflows/interface.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: actions/checkout@v7
3838

3939
- name: Set up Python 3.10
40-
uses: actions/setup-python@v6
40+
uses: actions/setup-python@v7
4141
with:
4242
python-version: "3.10"
4343

.github/workflows/pytest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Checkout
1818
uses: actions/checkout@v7
1919
- name: Set up Python
20-
uses: actions/setup-python@v6
20+
uses: actions/setup-python@v7
2121
with:
2222
python-version: 3.8
2323
- name: Build Pyabacus

0 commit comments

Comments
 (0)