Skip to content

Merge devel into master#1864

Merged
amcadmus merged 21 commits into
deepmodeling:masterfrom
amcadmus:master
Aug 19, 2022
Merged

Merge devel into master#1864
amcadmus merged 21 commits into
deepmodeling:masterfrom
amcadmus:master

Conversation

@amcadmus

Copy link
Copy Markdown
Member

merge recent changes on devel branch into master branch

amcadmus and others added 21 commits July 1, 2022 10:31
* add op docs

Also add op docs to ProdEnvMatA Op to show an example of how to write Op docs.

* add another equation

* avoid mismatching
…g#1744)

* There's no need for building libtensorflow_cc.so anymore

* update symbolic link

* Update source/cmake/Findtensorflow.cmake

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

* add support for unit-test

* Update install-from-source.md

* bump the cmake version at setup.py

* set _GLIBCXX_USE_CXX11_ABI flag globally

Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Follow up deepmodeling#1789. It can be detected by valgrind.
fix deepmodeling#1815

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
* merge CMake test codes via `add_subdirectory`

Avoid maintaining duplicated codes.

* remove pthread; use openmp instead
fix deepmodeling#1823

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Bare `pair_coeff` is not allowed in the recent versions of LAMMPS.
* add variant info to output message

* fix compilation error

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
So credits will keep up-to-date. No one's contribution will be forgot.
For detailed implementation, see also deepmodeling/deepmodeling_sphinx#18.
* revert prod_force OMP in deepmodeling#1360

Sometimes when box is quite small (i.e. box size < 2 * rcut), the same atom may repeat to appear in the neighbor list. This cause inaccurate results when using OMP.

* do not update pip

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

* revert pining pip; setting env for setuptools>=64

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
@codecov-commenter

codecov-commenter commented Aug 19, 2022

Copy link
Copy Markdown

Codecov Report

Merging #1864 (209abbe) into master (5a32c49) will decrease coverage by 15.46%.
The diff coverage is n/a.

❗ Current head 209abbe differs from pull request most recent head ee3b01c. Consider uploading reports for the commit ee3b01c to get more accurate results

@@             Coverage Diff             @@
##           master    #1864       +/-   ##
===========================================
- Coverage   77.00%   61.53%   -15.47%     
===========================================
  Files         118        4      -114     
  Lines        9414       13     -9401     
===========================================
- Hits         7249        8     -7241     
+ Misses       2165        5     -2160     
Impacted Files Coverage Δ
source/api_cc/include/DeepTensor.h 20.00% <ø> (ø)
deepmd/env.py
deepmd/infer/deep_eval.py
deepmd/infer/deep_pot.py
deepmd/infer/deep_tensor.py
deepmd/train/run_options.py
deepmd/train/trainer.py
deepmd/utils/tabulate.py
deepmd/descriptor/__init__.py
deepmd/nvnmd/entrypoints/wrap.py
... and 104 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@amcadmus amcadmus merged commit c393392 into deepmodeling:master Aug 19, 2022
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.

4 participants