Skip to content
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

Jump to bottom

update deepmd input to v2; format JSON files #1315

Merged
merged 10 commits into from
Aug 28, 2023
Merged

update deepmd input to v2; format JSON files #1315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
be3910c
update deepmd input to v2; format JSON files
njzjz Aug 23, 2023
6df2107
exclude symlinks
njzjz Aug 23, 2023
143bb99
fix json
njzjz Aug 23, 2023
51c3b77
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2023
2d34f58
fix errors
njzjz Aug 23, 2023
fb20b45
add pretty-format-json hook; 4 spaces may be better
njzjz Aug 27, 2023
8f413de
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2023
5ad2ca3
fix args
njzjz Aug 27, 2023
dbf7103
autofix
njzjz Aug 27, 2023
1eb347d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,20 @@ repos:
exclude: "^tests/.*$"
- id: check-yaml
exclude: "^conda/.*$"
#- id: check-json
- id: check-json
exclude: "^examples/CH4-lebesgue/.*$"
- id: check-added-large-files
- id: check-merge-conflict
- id: check-symlinks
exclude: "^tests/tools/run_report_test_output/.*$"
- id: check-toml
- id: pretty-format-json
args:
- "--autofix"
- "--no-sort-keys"
- "--indent=4"
exclude: "^examples/CH4-lebesgue/.*$"

# Python
- repo: https://github.com/psf/black
rev: 23.7.0
Expand Down
5 changes: 2 additions & 3 deletions doc/simplify/simplify.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Here is an example of `param.json` for QM7 dataset:
"learning_rate": {
"type": "exp",
"start_lr": 0.001,
"decay_steps": 10,
"stop_lr": 5e-8,
"decay_rate": 0.99
},
"loss": {
Expand All @@ -85,12 +85,11 @@ Here is an example of `param.json` for QM7 dataset:
},
"training": {
"set_prefix": "set",
"stop_batch": 10000,
"numb_steps": 10000,
"disp_file": "lcurve.out",
"disp_freq": 1000,
"numb_test": 1,
"save_freq": 1000,
"save_ckpt": "model.ckpt",
"disp_training": true,
"time_training": true,
"profiling": false,
Expand Down
54 changes: 34 additions & 20 deletions dpgen/data/jsons/al.diamond.111.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,36 @@
{
"cell_type": "diamond",
"latt": 2.5,
"super_cell": [1, 1, 1],
"elements": ["Al"],
"potcars": ["/home/wanghan/Soft/vasp/potcar.unknown/potpaw_PBE/Al/POTCAR"
],
"encut": 600,
"kspacing_relax": 0.16,
"kspacing_md": 0.08,
"kgamma": false,
"scale": [0.96, 0.98, 1.00, 1.02, 1.04, 1.06],
"skip_relax": false,
"pert_numb": 100,
"pert_box": 0.03,
"pert_atom": 0.01,
"md_temp": 100,
"md_nstep": 10,
"deepgen_templ": "../generator/template/",
"coll_ndata": 5000,
"_comment": "that's all"
"cell_type": "diamond",
"latt": 2.5,
"super_cell": [
1,
1,
1
],
"elements": [
"Al"
],
"potcars": [
"/home/wanghan/Soft/vasp/potcar.unknown/potpaw_PBE/Al/POTCAR"
],
"encut": 600,
"kspacing_relax": 0.16,
"kspacing_md": 0.08,
"kgamma": false,
"scale": [
0.96,
0.98,
1.0,
1.02,
1.04,
1.06
],
"skip_relax": false,
"pert_numb": 100,
"pert_box": 0.03,
"pert_atom": 0.01,
"md_temp": 100,
"md_nstep": 10,
"deepgen_templ": "../generator/template/",
"coll_ndata": 5000,
"_comment1": "that's all"
}
54 changes: 34 additions & 20 deletions dpgen/data/jsons/al.diamond.222.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,36 @@
{
"cell_type": "diamond",
"latt": 2.5,
"super_cell": [2, 2, 2],
"elements": ["Al"],
"potcars": ["/home/wanghan/Soft/vasp/potcar.unknown/potpaw_PBE/Al/POTCAR"
],
"encut": 600,
"kspacing_relax": 0.16,
"kspacing_md": 0.08,
"kgamma": false,
"scale": [0.96, 0.98, 1.00, 1.02, 1.04, 1.06],
"skip_relax": false,
"pert_numb": 100,
"pert_box": 0.03,
"pert_atom": 0.01,
"md_temp": 100,
"md_nstep": 10,
"deepgen_templ": "../template/",
"coll_ndata": 5000,
"_comment": "that's all"
"cell_type": "diamond",
"latt": 2.5,
"super_cell": [
2,
2,
2
],
"elements": [
"Al"
],
"potcars": [
"/home/wanghan/Soft/vasp/potcar.unknown/potpaw_PBE/Al/POTCAR"
],
"encut": 600,
"kspacing_relax": 0.16,
"kspacing_md": 0.08,
"kgamma": false,
"scale": [
0.96,
0.98,
1.0,
1.02,
1.04,
1.06
],
"skip_relax": false,
"pert_numb": 100,
"pert_box": 0.03,
"pert_atom": 0.01,
"md_temp": 100,
"md_nstep": 10,
"deepgen_templ": "../template/",
"coll_ndata": 5000,
"_comment1": "that's all"
}
54 changes: 34 additions & 20 deletions dpgen/data/jsons/al.fcc.111.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,36 @@
{
"cell_type": "fcc",
"latt": 4.04,
"super_cell": [1, 1, 1],
"elements": ["Al"],
"potcars": ["/home/wanghan/Soft/vasp/potcar.unknown/potpaw_PBE/Al/POTCAR"
],
"encut": 600,
"kspacing_relax": 0.16,
"kspacing_md": 0.06,
"kgamma": false,
"scale": [0.96, 0.98, 1.00, 1.02, 1.04, 1.06],
"skip_relax": true,
"pert_numb": 100,
"pert_box": 0.03,
"pert_atom": 0.01,
"md_temp": 100,
"md_nstep": 10,
"deepgen_templ": "../template/",
"coll_ndata": 5000,
"_comment": "that's all"
"cell_type": "fcc",
"latt": 4.04,
"super_cell": [
1,
1,
1
],
"elements": [
"Al"
],
"potcars": [
"/home/wanghan/Soft/vasp/potcar.unknown/potpaw_PBE/Al/POTCAR"
],
"encut": 600,
"kspacing_relax": 0.16,
"kspacing_md": 0.06,
"kgamma": false,
"scale": [
0.96,
0.98,
1.0,
1.02,
1.04,
1.06
],
"skip_relax": true,
"pert_numb": 100,
"pert_box": 0.03,
"pert_atom": 0.01,
"md_temp": 100,
"md_nstep": 10,
"deepgen_templ": "../template/",
"coll_ndata": 5000,
"_comment1": "that's all"
}
54 changes: 34 additions & 20 deletions dpgen/data/jsons/al.fcc.222.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,36 @@
{
"cell_type": "fcc",
"latt": 4.04,
"super_cell": [2, 2, 2],
"elements": ["Al"],
"potcars": ["/home/wanghan/Soft/vasp/potcar.unknown/potpaw_PBE/Al/POTCAR"
],
"encut": 600,
"kspacing_relax": 0.16,
"kspacing_md": 0.06,
"kgamma": false,
"scale": [0.96, 0.98, 1.00, 1.02, 1.04, 1.06],
"skip_relax": true,
"pert_numb": 100,
"pert_box": 0.03,
"pert_atom": 0.01,
"md_temp": 100,
"md_nstep": 10,
"deepgen_templ": "../template/",
"coll_ndata": 5000,
"_comment": "that's all"
"cell_type": "fcc",
"latt": 4.04,
"super_cell": [
2,
2,
2
],
"elements": [
"Al"
],
"potcars": [
"/home/wanghan/Soft/vasp/potcar.unknown/potpaw_PBE/Al/POTCAR"
],
"encut": 600,
"kspacing_relax": 0.16,
"kspacing_md": 0.06,
"kgamma": false,
"scale": [
0.96,
0.98,
1.0,
1.02,
1.04,
1.06
],
"skip_relax": true,
"pert_numb": 100,
"pert_box": 0.03,
"pert_atom": 0.01,
"md_temp": 100,
"md_nstep": 10,
"deepgen_templ": "../template/",
"coll_ndata": 5000,
"_comment1": "that's all"
}
54 changes: 34 additions & 20 deletions dpgen/data/jsons/al.hcp.111.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,36 @@
{
"cell_type": "hcp",
"latt": 4.04,
"super_cell": [1, 1, 1],
"elements": ["Al"],
"potcars": ["/home/wanghan/Soft/vasp/potcar.unknown/potpaw_PBE/Al/POTCAR"
],
"encut": 600,
"kspacing_relax": 0.16,
"kspacing_md": 0.06,
"kgamma": false,
"scale": [0.96, 0.98, 1.00, 1.02, 1.04, 1.06],
"skip_relax": false,
"pert_numb": 100,
"pert_box": 0.03,
"pert_atom": 0.01,
"md_temp": 100,
"md_nstep": 10,
"deepgen_templ": "../template/",
"coll_ndata": 5000,
"_comment": "that's all"
"cell_type": "hcp",
"latt": 4.04,
"super_cell": [
1,
1,
1
],
"elements": [
"Al"
],
"potcars": [
"/home/wanghan/Soft/vasp/potcar.unknown/potpaw_PBE/Al/POTCAR"
],
"encut": 600,
"kspacing_relax": 0.16,
"kspacing_md": 0.06,
"kgamma": false,
"scale": [
0.96,
0.98,
1.0,
1.02,
1.04,
1.06
],
"skip_relax": false,
"pert_numb": 100,
"pert_box": 0.03,
"pert_atom": 0.01,
"md_temp": 100,
"md_nstep": 10,
"deepgen_templ": "../template/",
"coll_ndata": 5000,
"_comment1": "that's all"
}
54 changes: 34 additions & 20 deletions dpgen/data/jsons/al.hcp.222.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,36 @@
{
"cell_type": "hcp",
"latt": 4.04,
"super_cell": [2, 2, 2],
"elements": ["Al"],
"potcars": ["/home/wanghan/Soft/vasp/potcar.unknown/potpaw_PBE/Al/POTCAR"
],
"encut": 600,
"kspacing_relax": 0.16,
"kspacing_md": 0.06,
"kgamma": false,
"scale": [0.96, 0.98, 1.00, 1.02, 1.04, 1.06],
"skip_relax": false,
"pert_numb": 100,
"pert_box": 0.03,
"pert_atom": 0.01,
"md_temp": 100,
"md_nstep": 10,
"deepgen_templ": "../template/",
"coll_ndata": 5000,
"_comment": "that's all"
"cell_type": "hcp",
"latt": 4.04,
"super_cell": [
2,
2,
2
],
"elements": [
"Al"
],
"potcars": [
"/home/wanghan/Soft/vasp/potcar.unknown/potpaw_PBE/Al/POTCAR"
],
"encut": 600,
"kspacing_relax": 0.16,
"kspacing_md": 0.06,
"kgamma": false,
"scale": [
0.96,
0.98,
1.0,
1.02,
1.04,
1.06
],
"skip_relax": false,
"pert_numb": 100,
"pert_box": 0.03,
"pert_atom": 0.01,
"md_temp": 100,
"md_nstep": 10,
"deepgen_templ": "../template/",
"coll_ndata": 5000,
"_comment1": "that's all"
}