Skip to content

Merge devel into master#1787

Merged
amcadmus merged 62 commits intodeepmodeling:masterfrom
amcadmus:master
Jun 26, 2022
Merged

Merge devel into master#1787
amcadmus merged 62 commits intodeepmodeling:masterfrom
amcadmus:master

Conversation

@amcadmus
Copy link
Member

No description provided.

amcadmus and others added 30 commits April 16, 2022 11:11
…#1644)

* change default NN precision from `float64` to `default`

Fix deepmodeling#1643.

* update type embedding

* remove extra .

* remove extra .
* update TF installation doc

* Revert "update TF installation doc"

This reverts commit 4d24036.

* add a seperated doc

* fix typo
* migrate test_cc from conda to docker

* change image

* update image

* set CXX_STANDARD before add_library

* use bash instead of sh
* use float constant for float functions

* kk

* kk

* we have cmath in c++ 11

* use float functions

* revert changes to legacy codes

* fix typo in ewald.cc

* fix lib/tests CUDA installation

* use tanh for float

Co-authored-by: Denghui Lu <denghuilu@pku.edu.cn>

Co-authored-by: Denghui Lu <denghuilu@pku.edu.cn>
Co-authored-by: Han Wang <wang_han@iapcm.ac.cn>
A tensor can be reused in a graph but a numpy array can't. This avoids saving duplicated constants in the case deepmodeling#1423.
A graph has a size limitation of 2 GB, so if we do not clean the graph, the limitation will be indeed 1GB...
* fix rcut in hybrid model compression

The current way `self.graph.get_operation_by_name('ProdEnvMatA')` to get `rcut` is incorrect for hybrid models. There may be several  ProdEnvMatA ops in a graph.

(cherry picked from commit 34a4e9b)

* fix se_r attr
* rewrite data doc

Current data doc was wrttien in the inital version. It's out-of-date.

* provide the name of raw file

* add raw file to input properties and labeled properties
jsdelivr, which is the default mathjax path in the sphinx, has been blocked in China. See jsdelivr/jsdelivr#18392. Of course, we hope our rendered equations can be shown in China.
* Update training.md

* Fix typo

* Update overall.md

* Update overall.md

* Update train-energy.md

* Update train-fitting-tensor.md

* Update train-fitting-tensor.md

* Update train-fitting-tensor.md

* Update README.md

* Update README.md
…eepmodeling#1686)

* fix bug of model compression training with se_e2_r type descriptor

* Update source/op/tabulate_multi_device.cc

Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
* Change Typo

"short" --> "shot"

* Update index.md
…ng#1695)

* set default fparam and aparam stat and recover from graph

fix deepmodeling#1692

* check avg and std separately
1. Compare square value instead of square root value. Square root is expensive.
2. Compare float instead of double, considering rcut is provided as float.

`ProdEnvMatA` (CPU) is observed to improve over 5%.
* compress by element

(cherry picked from commit 2b97d54)

* set upper and lower by net

(cherry picked from commit f6af704)

* make xx net-wise

(cherry picked from commit f030f17)

* fix se_t lower and upper
* implement parallelism for neighbor stat

* bugfix

* fix typo in docstring
* render equations in markdown files

* enable dollarmath in the sphinx

* fix Angstrom sybol; it's not supported by mathjax

* fix equations of the learning rate

* fix equations

* fix equations

* fix equations

* fix equations

* Update lammps-command.md

* use \cdots for ...

* add the detailed keys
njzjz and others added 24 commits June 2, 2022 09:04
Follow up deepmodeling#1723. It's quite confusing that no `version_info.h` is generated
when building TF 2.9 C++ library only (but Python library has). So the
definition is copied here..
* using int64 within the memory allocation operations

* reduce temp memory allocation

* change the related python implementations

* fix UT error

* fix reset error
* support atom_ener_coeff

* bugfix; add option

* reshape atom_ener_coeff before multiply

* add UT for "default"

* fix typo
* replace 1./sqrt with rsqrt

Per NVIDIA doc:
> 11.1.3. Reciprocal Square Root
> The reciprocal square root should always be invoked explicitly as rsqrtf() for single precision and rsqrt() for double precision. The compiler optimizes 1.0f/sqrtf(x) into rsqrtf() only when this does not violate IEEE-754 semantics.

See https://docs.nvidia.com/cuda/cuda-c-best-practices-guide/index.html#reciprocal-square-root

* remove FPTYPE as it has been FPTYPE

* apply the same opt for ROCM
* add DPRc doc

* fix json

* add links
by changing the main font to Symbola.

This font has been installed in the RTD image. But if one wants build locally, first install the font:

apt-get install fonts-symbola
* add a script to build TF from source

* remove todo
* add auto cli docs

This commit adds the automatic documentation for command line interface, generated by a sphinx extension.

* move cli out of inference

it should be not related to inference..
Before this commit, only global site-packages directory was searched.
1e-2 is too small making the compression table have a large upper.
So one can click the link to learn more about a key (like type, default value, etc.).

Note: links are only available in the sphinx-generated HTML or PDF. It will be not shown on the GitHub.

This commit also fixes two typos.
... and update some examples with depracated parameters.
From the perspective of unit tests, there is no differece between testing 1 step and 100 steps.
... it looks that `gprcio` (dependency of TF) has dropped the manylinux2010 wheels
exhale will run doxygen automatically, so there is no need to manually run it.
* bump LAMMPS version to stable_23Jun2022

* update conda package name
@codecov-commenter
Copy link

codecov-commenter commented Jun 26, 2022

Codecov Report

Merging #1787 (06763c2) into master (c4f0cec) will decrease coverage by 0.07%.
The diff coverage is 80.45%.

@@            Coverage Diff             @@
##           master    #1787      +/-   ##
==========================================
- Coverage   76.15%   76.08%   -0.08%     
==========================================
  Files          94       96       +2     
  Lines        7850     7927      +77     
==========================================
+ Hits         5978     6031      +53     
- Misses       1872     1896      +24     
Impacted Files Coverage Δ
deepmd/common.py 83.55% <ø> (+1.16%) ⬆️
deepmd/descriptor/hybrid.py 33.33% <0.00%> (ø)
deepmd/descriptor/se_a_ebd.py 16.32% <0.00%> (ø)
deepmd/model/model_stat.py 100.00% <ø> (ø)
deepmd/op/__init__.py 100.00% <ø> (ø)
deepmd/utils/batch_size.py 96.00% <ø> (ø)
deepmd/utils/path.py 91.45% <ø> (ø)
deepmd/utils/plugin.py 84.37% <ø> (ø)
source/api_cc/include/DeepPot.h 66.66% <ø> (ø)
source/api_cc/include/DeepTensor.h 20.00% <ø> (ø)
... and 27 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 c4f0cec...06763c2. Read the comment docs.

@amcadmus amcadmus requested a review from njzjz June 26, 2022 03:50
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.

It looks like I contribute too many commits LOL

@njzjz njzjz mentioned this pull request Jun 26, 2022
@amcadmus
Copy link
Member Author

It looks like I contribute too many commits LOL

which is definitely welcome

@amcadmus amcadmus merged commit 03c8742 into deepmodeling:master Jun 26, 2022
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