Skip to content

Merge devel into master#1047

Merged
amcadmus merged 735 commits intodeepmodeling:masterfrom
amcadmus:master
Aug 28, 2021
Merged

Merge devel into master#1047
amcadmus merged 735 commits intodeepmodeling:masterfrom
amcadmus:master

Conversation

@amcadmus
Copy link
Member

No description provided.

Han Wang and others added 30 commits April 16, 2021 10:37
seperate impl of averging errors across systems
…over a dict. Not using ClassArg in trainer anymore
Bug fixings related to using validate dataset
Printing the training error with exactly the batch used to train
Auto conversion of input script from v1 to v2
denghuilu and others added 24 commits August 21, 2021 17:24
)

* add model compression training support

* fix UT error

* address comments

* address comments

* rm fitting_net_variables from class DPTabulate

* clean class DPTabulate

* fix typo

* add doc for init-frz-model

add doc for init-frz-model at training-advanced.md

* fix rocm error
* add examples to `DeepPot`'s docstring

* add an example to `calc_model_devi`'s docstring
…epmodeling#1011)

Otherwise it won't be shown in the document.

Also contains other cleanups.
* Instantiate RunOptions first when training.

* Add an end-to-end test for parallel training.

* Allow CPU parallel training.
* add docstring to `DescrptSeA`

Contains other cleanups.

* fix the equation of `s(r)`
* add `InputNlist` into API doc

This struct is necessary for C++ APIs.

* Apply suggestions from code review

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

* update comment for `firstneigh`

Co-authored-by: Denghui Lu <ludenghui.cs@gmail.com>
* add docstring for `EnerFitting`

* Apply suggestions from code review

Co-authored-by: Han Wang <amcadmus@gmail.com>

Co-authored-by: Han Wang <amcadmus@gmail.com>
* Use a local Numpy random generator.

* Fix import error.

* Replace random generator in test_gen_stat_data.py.
)

This commit saves checkpoint to `save_ckpt-step` (e.g. `model.ckpt-100`) instead of `save_ckpt` (e.g. `model.ckpt`), and keeps 5 recent checkpoint files (this is a default value of `tf.Saver`). Such thing is conducted by `tf.Saver`.  To not break any behaviors, a symlink will then be made from  `model.ckpt-100` to `model.ckpt`. (Usually such thing should be controlled by `checkpoint` file, but deepmd-kit doesn't read this file.)
This can fix deepmodeling#1023, as (1) we made symlink after a checkpoint has been already saved; (2) if something is still wrong, one can use a previous checkpoint instead.
* speedup cuda kernel scan_nlist

* fix no-pbc error
* use TF's built-in method to get numpy dtype

I got a way to get the numpy type from a int. Take an example
```py
>>> tf.dtypes.as_dtype(19).as_numpy_dtype
<class 'numpy.float16'>
```

`PRECISION_MAPPING` is not used any more, as it's actually not a public API.

By the way, it also supports `str`
```py
>>> tf.dtypes.as_dtype("float16")
tf.float16
```

* sadly only `tf.as_dtype` is supported in TF 1.8
…in SE_A, now tanh & gelu is both available. (deepmodeling#1020)

* commit-message: decouple activation function's type from model compression's process in SE_A, now tanh & gelu is both available.

* commit-message: modified code and passed unittest

* commit-message: Format Document

* commit-message :Format revert

* commit-message: format change

* commit-message: Format change

Co-authored-by: HLA <huangla@dp.tech>
* fix model compression error

* add doc for model compression limitation
@codecov-commenter
Copy link

codecov-commenter commented Aug 27, 2021

Codecov Report

Attention: Patch coverage is 72.61596% with 1476 lines in your changes missing coverage. Please review.

Please upload report for BASE (master@90b1f52). Learn more about missing BASE report.

Files Patch % Lines
deepmd/entrypoints/test.py 11.53% 184 Missing ⚠️
deepmd/train/trainer.py 70.68% 129 Missing ⚠️
deepmd/descriptor/se_a_ebd.py 14.58% 123 Missing ⚠️
deepmd/entrypoints/config.py 16.00% 105 Missing ⚠️
deepmd/fit/polar.py 48.18% 100 Missing ⚠️
deepmd/descriptor/se_a_ef.py 54.83% 84 Missing ⚠️
deepmd/loggers/loggers.py 41.90% 61 Missing ⚠️
deepmd/loss/tensor.py 52.29% 52 Missing ⚠️
deepmd/infer/deep_pot.py 68.98% 49 Missing ⚠️
deepmd/utils/convert.py 16.94% 49 Missing ⚠️
... and 43 more
Additional details and impacted files
@@            Coverage Diff            @@
##             master    #1047   +/-   ##
=========================================
  Coverage          ?   75.10%           
=========================================
  Files             ?       87           
  Lines             ?     6953           
  Branches          ?        0           
=========================================
  Hits              ?     5222           
  Misses            ?     1731           
  Partials          ?        0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@njzjz njzjz left a comment

Choose a reason for hiding this comment

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

We can see the diff when comparing with devel. It's okay.

@njzjz njzjz added this to the v2.0.0 milestone Aug 27, 2021
@amcadmus amcadmus merged commit 1a25414 into deepmodeling:master Aug 28, 2021
gzq942560379 pushed a commit to HPC-AI-Team/deepmd-kit that referenced this pull request Sep 2, 2021
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.