Skip to content

Merge devel into master#1126

Merged
amcadmus merged 35 commits intomasterfrom
devel
Sep 10, 2021
Merged

Merge devel into master#1126
amcadmus merged 35 commits intomasterfrom
devel

Conversation

@amcadmus
Copy link
Member

No description provided.

amcadmus and others added 30 commits August 28, 2021 08:16
Co-authored-by: Han Wang <wang_han@iapcm.ac.cn>
* fix device UT error

* fix UT bug
Fix #1068.
This bug is produced by #594.
* upgrade os.system to subporcess-popen method

* fix UT error

* fix UT error

* address comments
* use `np.testing.assert_almost_equal` for array comparing

* bugfix

* bugfix

* bugfix

* bugfix

* bugfix

* bugfix

* bugfix
Currently, TF only initializes GPUs once, and never releases memory. As a result, we must set `allow_growth` in the first Session (or every session?), otherwise it doesn't work.

Please confirm the `allow_growth` config in `trainer.py` is expected, otherwise we should remove it instead.
…' must occur in namespace 'deepmd' (#1071)

Co-authored-by: Han Wang <wang_han@iapcm.ac.cn>
* change the default checkpoint path for model compression

* update UT for model compression

* clean up files
* Remove dupliated setting of `allow_growth` in trainer.

* Make parallel training UT independent of its working folder.

* Skip parallel-training tests when there is only 1 GPU card.

* Enable parallel training UT in GitHub CI.
#1074)

* Fix shape mismatch when type_embedding is enabled and type_one_side is disabled.

* Add UT to cover the case where batch_size is larger than 1.

* Fix random issue in unit tests.
* create cross-references in docstring

* add typing alias
* add ABC for descriptors

I'm going to add abstract base classes for different object, where a list of methods and attributes is defined to normalize classes and their external call by other classes. It's also useful to develop and extend new classes.

The first one I did is the descriptor.

* TYPE_CHECKING doesn't work in python 3.6

* fix warnings
* fix a potential slice bug in se_t

* fix UT error

* address comments
* make compress work for hybrid descriptor composed of se_e2_a

* fix `get_embedding_net_nodes_from_graph_def`

* fix lint warning
…l" (#1093)

* done interface for deepmd with the centroids atoms

* Update lammps-command.md

Added documentation to the computation of the heat flux
* Fix gradient not averaged when parallel training.

* Correct throughput metrics and explain CPU runtime in the parallel-training tutorial.
* enable init-frz-model support for the original model within the dp train interface

* add init_variables method for ABC

* add doc for embedding_net method
Note: this is a simple fix to resolve #1088, but I think we should design a clear architecture to call neighbor stat.

This should reduce the half of the time, but it may be still too long. We can consider some better algorithm to calculate neighbour stat (like KDtree?) for further optimization.
* enable init-frz-model support for the original model within the dp train interface

* add init_variables method for ABC

* add doc for embedding_net method

* update doc for init-frz-model
When I debug #1109, I accidentally find the LAMMPS_VERSION_NUMBER condition is wrong, making builds fail. (but this is not related to #1109)
* Fix missing `std::numeric_limits`

- Include `<limits>` header, fix missing `std::numeric_limits` when compiling with GCC 11.0.
njzjz and others added 4 commits September 8, 2021 22:50
* support init_frz_model for hybrid descriptor

Refactors some methods to implement it.
Also fixes some typos.

* rename `graph_def` to `model_file`

Co-authored-by: Denghui Lu <ludenghui.cs@gmail.com>

Co-authored-by: Denghui Lu <ludenghui.cs@gmail.com>
Co-authored-by: Han Wang <wang_han@iapcm.ac.cn>
…es (#1124)

Co-authored-by: Han Wang <wang_han@iapcm.ac.cn>
As detected by LGTM, here is an error:
Call to method DeepTensor.__init__ with too many arguments; should be no more than 4.

I agree with the automatic code analysis tool.
@codecov-commenter
Copy link

codecov-commenter commented Sep 10, 2021

Codecov Report

Merging #1126 (95a0340) into master (1a25414) will increase coverage by 0.37%.
The diff coverage is 64.20%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1126      +/-   ##
==========================================
+ Coverage   75.10%   75.47%   +0.37%     
==========================================
  Files          87       88       +1     
  Lines        6953     7043      +90     
==========================================
+ Hits         5222     5316      +94     
+ Misses       1731     1727       -4     
Impacted Files Coverage Δ
deepmd/entrypoints/main.py 88.77% <ø> (ø)
deepmd/infer/deep_polar.py 65.21% <ø> (ø)
deepmd/infer/deep_pot.py 68.55% <0.00%> (-0.44%) ⬇️
deepmd/model/ener.py 91.74% <0.00%> (-0.85%) ⬇️
deepmd/utils/argcheck.py 87.63% <ø> (ø)
deepmd/model/tensor.py 88.46% <20.00%> (-0.86%) ⬇️
deepmd/descriptor/hybrid.py 36.84% <31.57%> (-2.82%) ⬇️
deepmd/train/trainer.py 72.01% <38.46%> (+1.33%) ⬆️
deepmd/entrypoints/transfer.py 72.54% <50.00%> (ø)
deepmd/utils/graph.py 74.11% <54.54%> (ø)
... and 21 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1a25414...95a0340. Read the comment docs.

@amcadmus amcadmus merged commit 2f6020b into master Sep 10, 2021
njzjz added a commit to njzjz/deepmd-kit that referenced this pull request Sep 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants