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-v1 with 31-type chemical species #2676

Merged
merged 59 commits into from Jul 21, 2023

Conversation

LiuGroupHNU
Copy link
Collaborator

  1. Add the nvnmd-v1 with se_atten descriptor and 31-type chemical species. nvnmd-v0 is the old version with se_a descriptor and 4-type chemical species.
  2. Fix the error for map_flt_nvnmd.cpp for nvnmd-v1. An unexpected value of floor(-0.0)=-1 occurred at the index of the mapping table.
  3. Improve the documentation about runing nvnmd in bohrium.

@LiuGroupHNU
Copy link
Collaborator Author

Conflicting files "source/tests/test_nvnmd_se_a.py" and "source/tests/test_nvnmd_utils.py" have been removed. Because the same unit tests are included in "source/tests/test_nvnmd_entrypoints.py".

Copy link
Collaborator

@wanghan-iapcm wanghan-iapcm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to further reduce the size of the weight files weight_v?_cnn.npy for testing? E.g. using smaller models for tests.

@wanghan-iapcm wanghan-iapcm requested a review from njzjz July 15, 2023 15:11
examples/nvnmd/train/train_cnn.json Outdated Show resolved Hide resolved
doc/nvnmd/nvnmd.md Outdated Show resolved Hide resolved
source/lib/src/env_mat_nvnmd.cc Show resolved Hide resolved
deepmd/entrypoints/main.py Show resolved Hide resolved
@njzjz
Copy link
Member

njzjz commented Jul 15, 2023

Conflicting files "source/tests/test_nvnmd_se_a.py" and "source/tests/test_nvnmd_utils.py" have been removed. Because the same unit tests are included in "source/tests/test_nvnmd_entrypoints.py".

You need to resolve conflicts in your branch.

@codecov
Copy link

codecov bot commented Jul 19, 2023

Codecov Report

Patch coverage: 86.14% and project coverage change: +0.55 🎉

Comparison is base (a2995b8) 78.36% compared to head (95e79a2) 78.92%.

Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #2676      +/-   ##
==========================================
+ Coverage   78.36%   78.92%   +0.55%     
==========================================
  Files         235      236       +1     
  Lines       24506    25157     +651     
  Branches     1469     1477       +8     
==========================================
+ Hits        19204    19855     +651     
- Misses       4910     4912       +2     
+ Partials      392      390       -2     
Impacted Files Coverage Δ
deepmd/nvnmd/entrypoints/train.py 15.74% <0.00%> (-32.84%) ⬇️
deepmd/nvnmd/entrypoints/wrap.py 78.80% <59.35%> (-20.18%) ⬇️
deepmd/nvnmd/utils/network.py 63.70% <76.92%> (+5.12%) ⬆️
deepmd/nvnmd/utils/weight.py 87.95% <83.87%> (-6.50%) ⬇️
source/lib/src/prod_env_mat_nvnmd.cc 95.45% <84.61%> (-4.55%) ⬇️
deepmd/descriptor/se_atten.py 93.79% <85.00%> (-0.44%) ⬇️
deepmd/nvnmd/entrypoints/mapt.py 86.96% <90.04%> (+14.96%) ⬆️
deepmd/nvnmd/descriptor/se_atten.py 90.62% <90.62%> (ø)
source/op/map_flt_nvnmd.cc 98.52% <96.96%> (+2.94%) ⬆️
source/op/prod_env_mat_multi_device_nvnmd.cc 95.14% <97.00%> (+1.52%) ⬆️
... and 9 more

... and 18 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

source/tests/nvnmd/map.npy Outdated Show resolved Hide resolved
@wanghan-iapcm
Copy link
Collaborator

@MoPinghui if your pr is ready for review, plz click the re-request bottoms besides the reviewers.

@wanghan-iapcm wanghan-iapcm merged commit 0acd815 into deepmodeling:devel Jul 21, 2023
39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants