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.

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

nvnmd: update doc and fix bug in map_flt_nvnmd.cc #2831

Merged
merged 66 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
182c6d5
nvnmd
May 13, 2022
31a1599
nvnmd
May 13, 2022
e6a977e
nvnmd
May 13, 2022
ea9c486
nvnmd
May 14, 2022
458baf2
nvnmd
May 14, 2022
fc027b2
nvnmd
May 15, 2022
67ced71
nvnmd
LiuGroupHNU May 16, 2022
939afdc
nvnmd
LiuGroupHNU May 17, 2022
4d49a4a
nvnmd
LiuGroupHNU May 17, 2022
a7b20c2
nvnmd
LiuGroupHNU May 17, 2022
1b653b9
nvnmd
LiuGroupHNU May 18, 2022
7e666d3
nvnmd
LiuGroupHNU May 18, 2022
b56df0e
Merge remote-tracking branch 'upstream/devel' into devel
LiuGroupHNU May 18, 2022
336f48d
Merge remote-tracking branch 'upstream/devel' into devel
LiuGroupHNU May 18, 2022
f648669
nvnmd
LiuGroupHNU May 18, 2022
f3c3afb
Merge remote-tracking branch 'upstream/devel' into devel
MoPinghui Jun 13, 2022
c186324
nvnmd
MoPinghui Jun 13, 2022
1abc02a
nvnmd
MoPinghui Jun 14, 2022
65fbec8
nvnmd
MoPinghui Jun 17, 2022
79a0454
nvnmd
MoPinghui Jun 20, 2022
e1f7e8a
nvnmd
MoPinghui Jun 22, 2022
cdd3be7
nvnmd
MoPinghui Jun 25, 2022
019c325
Merge branch 'devel' into devel
wanghan-iapcm Jun 27, 2022
13104e8
fix bug in elementary substance sample of compound system, add type_m…
MoPinghui Sep 7, 2022
401c78c
merge 019c325
MoPinghui Sep 7, 2022
648ce78
nvnmd
MoPinghui Sep 7, 2022
ed793ca
nvnmd
MoPinghui Sep 7, 2022
36db74f
nvnmd with floating point number
MoPinghui Dec 19, 2022
8a0380a
nvnmd with floating point number
MoPinghui Dec 20, 2022
f557783
nvnmd with floating point number
MoPinghui Dec 20, 2022
bb39348
nvnmd with floating point number
MoPinghui Jan 2, 2023
8e64871
Merge remote-tracking branch 'upstream/devel' into devel
MoPinghui Jan 3, 2023
8e02711
nvnmd with floating point number
MoPinghui Jan 4, 2023
d7361cb
nvnmd with floating point number
MoPinghui Jan 7, 2023
322b668
nvnmd with floating point number
MoPinghui Jan 9, 2023
215d2ab
nvnmd with floating point number
MoPinghui Jan 9, 2023
e2bb683
nvnmd with floating point number
MoPinghui Jan 9, 2023
c5fddf3
nvnmd with floating point number
MoPinghui Jan 9, 2023
b6d25d6
nvnmd with floating point number
MoPinghui Jan 24, 2023
c3b800a
nvnmd with floating point number
MoPinghui Feb 2, 2023
d623d94
nvnmd with floating point number
MoPinghui Feb 2, 2023
f6f70d7
nvnmd merge upstream/devel
MoPinghui Mar 26, 2023
d4d5930
nvnmd: fix some warning about matmul_flt_nvnmd
MoPinghui Mar 27, 2023
8f85beb
nvnmd: fix some warning about matmul_flt_nvnmd
MoPinghui Mar 27, 2023
fdd9e79
nvnmd: fix some warning about matmul_flt_nvnmd
MoPinghui Mar 27, 2023
d5e533f
nvnmd: fix some warning about matmul_flt_nvnmd
MoPinghui Mar 27, 2023
dbcd92d
nvnmd: fix some warning about matmul_flt_nvnmd
MoPinghui Mar 27, 2023
12895f5
nvnmd: fix some warning about matmul_flt_nvnmd
MoPinghui Mar 27, 2023
d23c5dd
nvnmd: fix some warning about matmul_flt_nvnmd
MoPinghui Mar 27, 2023
6aa8dfb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 28, 2023
ad89adc
Merge branch 'devel' of https://github.com/deepmodeling/deepmd-kit in…
MoPinghui Jun 28, 2023
750a538
nvnmd v0 with float and 4 types, nvnmd v1 with float and 31 types
MoPinghui Jul 7, 2023
76f75d8
change unit test for nvnmd v1
MoPinghui Jul 7, 2023
3fb6af1
fix error for map_flt_nvnmd
MoPinghui Jul 14, 2023
84e0deb
nvnmd, fix conflicts
MoPinghui Jul 19, 2023
191c72d
nvnmd
MoPinghui Jul 19, 2023
8e2c4e8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 19, 2023
14d1fc1
nvnmd
MoPinghui Jul 20, 2023
95e79a2
Merge branch 'devel' of https://github.com/LiuGroupHNU/deepmd-kit int…
MoPinghui Jul 20, 2023
5106693
fix the warning of pytest.marker
MoPinghui Sep 15, 2023
c369fbc
Merge branch 'devel' of https://github.com/deepmodeling/deepmd-kit in…
MoPinghui Sep 15, 2023
1bba8ae
merge nvnmd-devel
MoPinghui Sep 15, 2023
7eebac3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 15, 2023
17d5a39
Revert "[pre-commit.ci] auto fixes from pre-commit.com hooks"
njzjz Sep 15, 2023
dc91966
fix pyproject.toml
njzjz Sep 15, 2023
0a3eac0
Apply suggestions from code review
LiuGroupHNU Sep 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions doc/nvnmd/nvnmd.md
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ Then you need prepare the configuration file `job.json`, the configuration file
"job_name": "test",
"command": "/usr/bin/lmp_mpi < in.lmp;",
"log_file": "OUTCAR",
"machine_type": "c8_m32_cpu",
"machine_type": "c4_m16_cpu",
"job_type": "container",
"image_name": "lammps_dp:29Sep2021",
"platform": "hnu",
"platform": "hnugba",
"region": "default",
"project_id": 0000
}
Expand All @@ -255,24 +255,24 @@ where items are defined as:
| job_name | the name of computing job, which can be named freely | a string |
| command | the command to be executed on the computing node | a string |
| log_file | the log file that can be viewed at any time during the calculation process, which can be viewed on the Bohrium "Jobs" page | a string |
| machine_type | the machine type used for the job | "c8_m32_cpu" |
| machine_type | the machine type used for the job | "c1_m4_cpu", "c4_m16_cpu", "c8_m32_cpu" |
| job_type | the job type | "container" |
| image_name | the image name used for the job | "lammps_dp:29Sep2021"|
| platform | resource provider | "hnu" |
| platform | resource provider | "hnugba" |
| project_id | the project ID to which the job belongs, which can be viewed on the "Projects" page | a integer |

Notice:The task will use 8 CPU cores for computation, so do not repeatedly use the `mpirun` command, otherwise an error will be reported. All 0000 after "project_id" need to be replaced with your own project ID, which can be viewed on the "Projects" page. Also, the JSON file format requires that no commas be added after the last field within the {}, otherwise, there will be a syntax error.
Notice:The task will use 4 CPU cores for computation, so do not repeatedly use the `mpirun` command, otherwise an error will be reported. All 0000 after "project_id" need to be replaced with your own project ID, which can be viewed on the "Projects" page. Also, the JSON file format requires that no commas be added after the last field within the {}, otherwise, there will be a syntax error. Please check the [documentation](https://github.com/LiuGroupHNU/md-data/blob/master/code/doc/mdpu/hardware.md) for the latest hardware configuration information.

In addition, it is necessary to prepare input script of the MD simulation, the ML model named `model.pb` obtained by QNN training and data files containing information required for running an MD simulation (e.g., `coord.lmp` containing initial atom coordinates).

In the input script, one needs to specify the pair style as follows

```lammps
pair_style nvnmd model.pb 6 2
pair_style nvnmd model.pb
pair_coeff * *
```

where `model.pb` is the path to model, `6` is the cutoff radius, `2` is the number of FPGA cards used with the maximum of 2.
where `model.pb` is the path to model.

After preparing the configuration file and the required files for calculation, using Lebesgue Utility to submit the job

Expand Down
4 changes: 4 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ select = [
"RUF", # ruff
"NPY", # numpy
]

ignore = [
"E501", # line too long
"F841", # local variable is assigned to but never used
Expand All @@ -194,3 +195,6 @@ ignore-init-module-imports = true

[tool.ruff.pydocstyle]
convention = "numpy"

[tool.pytest.ini_options]
markers = "run"
2 changes: 1 addition & 1 deletion source/op/map_flt_nvnmd.cc
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class MapFltNvnmdOp : public OpKernel {
for (ii = 0; ii < N * D; ii++) {
// cal idx and xx
xi = x[ii];
if ((xi < x0) || (xi >= x1)) {
if ((xi < x0) || (xi > x1)) {
continue;
}
//
Expand Down
Loading