Skip to content

Commit a1c2172

Browse files
authored
Merge pull request #130 from dyzheng/develop
Merge deepmodeling/develop to abacusmodeling/develop branch
2 parents a1b45d6 + e6b1023 commit a1c2172

File tree

232 files changed

+25289
-6896
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+25289
-6896
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,33 @@
22
name: Bug Report
33
about: Create a report for problems with ABACUS
44
title: ''
5-
labels: bug
5+
labels: Bug
66
assignees: dyzheng
77

88
---
99

1010
## Describe the Bug
11-
A clear and concise description of what the bug is.
11+
A clear and concise description of what the bug is.
12+
The bug may results in:
13+
- abnormal interruption of the program,
14+
- systematic or randomized numerical error, or
15+
- relatively low efficiency.
16+
17+
## Expected behavior
18+
A clear and concise description of what you expected to happen.
1219

1320
## To Reproduce
1421
Steps to reproduce the behavior:
1522
1. [e.g. clone the source code from ...]
1623
2. [e.g. configure CMake with options ...]
1724
3. [e.g. build ABACUS with ...]
1825
4. [e.g. run ABACUS with ...]
26+
It is recommended to attach your calculation case here for the developers to reproduce the bug.
1927

2028
## Environment
21-
- OS: [e.g. CentOS 7.6]
22-
- Compiler: [e.g. Intel LLVM 2021.1]
23-
- Optional Dependencies: [e.g. Intel MKL]
29+
- OS: [e.g. Ubuntu 20.04]
30+
- Compiler: [e.g. gcc 5.1.0]
31+
- Dependencies: [e.g. Intel MKL, OpenBLAS]
2432

2533
## Additional Context
2634
Add any other context about the problem here.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Feature Request
3+
about: Suggest something more for ABACUS to do
4+
title: ''
5+
labels: Feature
6+
assignees: mohanchen
7+
8+
---
9+
10+
## Background
11+
A clear and concise description of why this new feature is important.
12+
13+
## Describe the solution you'd like
14+
A clear and concise description of what you want to happen.
15+
16+
## Additional context
17+
Add any other context or screenshots about the feature request here.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: Help Wanted
3+
about: For general questions or assistance.
4+
title: ''
5+
labels: Help wanted
6+
assignees: caic99
7+
8+
---
9+
10+
Want to use ABACUS for certain system? Facing problems when installing ABACUS? Don't know how to choose a good parameter? Feel free to reach us, and we'll do our best to help!

.github/ISSUE_TEMPLATE/software-enhancements.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
name: Software Enhancements
33
about: Suggest an idea to make ABACUS more robust and organized
44
title: ''
5-
labels: enhancement
5+
labels: Refactor
66
assignees: caic99
77

88
---
99

1010
## Describe Current Status and Possible Solution
1111

12-
A clear and concise description of why this enhancement is important. If you have some ideas about how to achieve it, please also describe.
12+
A clear and concise description of why this enhancement is important.
13+
Describing the current situation of ABACUS is preferred.
14+
If you have some ideas about how to achieve it, please feel free to comment.
1315

1416
## Additional Context
1517

.github/workflows/build_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
container: ghcr.io/${{ github.repository_owner }}/abacus-development-kit:${{ matrix.tag }}
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2727
- name: Build
2828
run: |
2929
cmake -B build -DBUILD_TESTING=ON ${{ matrix.build_args }}

.github/workflows/container.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
push:
55
branches:
66
- develop
7-
- reconstruction
8-
- newelpa
97

108
jobs:
119
build_container_and_push:
@@ -15,7 +13,7 @@ jobs:
1513
dockerfile: ["gnu","intel","cuda"]
1614
steps:
1715
- name: Checkout
18-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1917

2018
- name: Setup Docker Buildx
2119
uses: docker/setup-buildx-action@v1
@@ -30,8 +28,8 @@ jobs:
3028
- name: Build and Push Container
3129
uses: docker/build-push-action@v2
3230
with:
33-
tags: ghcr.io/${{ github.repository_owner }}/abacus-development-kit:${{matrix.dockerfile}}
34-
file: Dockerfile.${{matrix.dockerfile}}
31+
tags: ghcr.io/${{ github.repository_owner }}/abacus-development-kit:${{ matrix.dockerfile }}
32+
file: Dockerfile.${{ matrix.dockerfile }}
3533
cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/abacus-development-kit:${{matrix.dockerfile}}
3634
cache-to: type=inline
3735
push: true

.github/workflows/dynamic.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,29 @@ on:
44
schedule:
55
- cron: '0 3 * * *'
66
workflow_dispatch:
7-
inputs:
8-
name:
9-
description: 'Number of Cores to Run ABACUS'
10-
required: false
11-
default: '2'
127

138
jobs:
149
test:
15-
name: Do the job on the runner
10+
name: Dynamic analysis
1611
runs-on: self-hosted
1712
if: github.repository_owner == 'deepmodeling'
1813
container: ghcr.io/deepmodeling/abacus-development-kit:gnu
1914
steps:
2015
- name: Checkout
21-
uses: actions/checkout@v2
22-
- name: Build and Test
16+
uses: actions/checkout@v3
17+
- name: Building
2318
run: |
2419
cmake -B build -DENABLE_ASAN=1 -DBUILD_TESTING=ON -DENABLE_DEEPKS=1
2520
cmake --build build -j16
2621
cmake --install build
22+
- name: Testing
23+
run: |
2724
cmake --build build --target test ARGS="-V"
2825
- name: Publish Report to Dashboard
2926
uses: crazy-max/ghaction-github-pages@v2
27+
if: ${{ ! cancelled() }}
3028
with:
3129
target_branch: dashboard
32-
build_dir: html
30+
build_dir: tests/html
3331
env:
3432
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/static.yaml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,36 @@
11
name: Static Analysis
22

33
on:
4-
workflow_dispatch:
4+
pull_request:
55

66
jobs:
77
clang-tidy:
8-
runs-on: self-hosted
9-
if: github.repository_owner == 'deepmodeling'
8+
runs-on: ubuntu-latest
109
container: ghcr.io/deepmodeling/abacus-development-kit:gnu
1110
steps:
1211
- name: Checkout Pull Request
13-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
1413
with:
15-
ref: ${{ github.event.pull_request.head.sha }}
14+
fetch-depth: 2
1615
- name: Setup clang-tidy
1716
run: |
1817
apt-get update && apt-get install -y --no-install-recommends clang-format clang-tidy
1918
- name: Generate Build Commands
2019
run: |
2120
cmake -B build -DCMAKE_EXPORT_COMPILE_COMMANDS=1
22-
- name: Checkout Changed Files
23-
id: files
24-
uses: deepmodeling/get-changed-files@master
2521
- name: Run clang-tidy
2622
run: |
27-
printf "%s\n" ${{ steps.files.outputs.added_modified }} | grep -E "^.*\.(cpp|h)$" > cppfiles.txt
28-
clang-tidy -p=build --export-fixes=diagnostics.yaml `cat cppfiles.txt`
29-
- name: Run clang-tidy-pr-comments action
30-
uses: deepmodeling/abacus-code-reviewer@master
23+
git diff -U0 HEAD^ | clang-tidy-diff -p1 -path build -export-fixes fixes.yml
24+
- name: Pull request comments from clang-tidy reports
25+
uses: platisd/[email protected]
3126
with:
3227
# The GitHub token (or a personal access token)
3328
github_token: ${{ secrets.GITHUB_TOKEN }}
3429
# The path to the clang-tidy fixes generated previously
35-
clang_tidy_fixes: diagnostics.yaml
30+
clang_tidy_fixes: fixes.yml
3631
# Optionally set to true if you want the Action to request
3732
# changes in case warnings are found
38-
request_changes: true
33+
request_changes: false
3934
# Optionally set the number of comments per review
4035
# to avoid GitHub API timeouts for heavily loaded
4136
# pull requests

.github/workflows/test.yml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
11
name: Integration Test and Unit Test
22

33
on:
4-
pull_request_target:
5-
branches:
6-
- develop
7-
- tryEigen
8-
- update_MD
9-
- ABACUS_2.2.0_beta
10-
- deepks
11-
- planewave
12-
- pw_refactor
13-
- TDDFT
4+
pull_request:
145

156
jobs:
167
test:
17-
name: Do the job on the runner
8+
name: Test
189
runs-on: self-hosted
1910
if: github.repository_owner == 'deepmodeling'
2011
container: ghcr.io/deepmodeling/abacus-development-kit:gnu
2112
steps:
2213
- name: Checkout
23-
uses: actions/checkout@v2
14+
uses: actions/checkout@v3
2415
with:
25-
ref: ${{ github.event.pull_request.head.sha }}
26-
- name: Build and Test
27-
env:
28-
GTEST_COLOR: 'yes'
16+
ref: "refs/pull/${{ github.event.number }}/merge"
17+
- name: Build
2918
run: |
3019
cmake -B build -DBUILD_TESTING=ON -DENABLE_DEEPKS=ON
3120
cmake --build build -j8
3221
cmake --install build
22+
- name: Test
23+
env:
24+
GTEST_COLOR: 'yes'
25+
run: |
3326
cmake --build build --target test ARGS="-V"

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ obj
55
OUT.*
66
log.txt
77
result.out
8+
*.dat
89
.DS_Store
910
.cache
1011
.vscode
1112
html
12-
run.log
13+
*.log
14+
STRU_READIN_ADJUST.cif

0 commit comments

Comments
 (0)