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

Merge devel into master #1059

Merged
merged 127 commits into from
Dec 3, 2022
Merged

Merge devel into master #1059

merged 127 commits into from
Dec 3, 2022

Conversation

amcadmus
Copy link
Member

@amcadmus amcadmus commented Dec 1, 2022

No description provided.

AnguseZhang and others added 30 commits July 11, 2022 23:58
…mplify

fix post_fp_vasp and make_fp_configs for simplify
deepmodeling#804)

(cherry picked from commit f5782ea2b33c3ee638ab23bc0e1e4a19b8d578e3)
* fix UT test_make_md

* remove debug line
* args: add `shuffle_poscar` to run jdata

* Update arginfo.py

* add default to shuffle_poscar

Co-authored-by: Han Wang <92130845+wanghan-iapcm@users.noreply.github.com>
* fix README

* remove "load_ckpt"

* remove `load_ckpt`
* add entire arguments of gaussian style

Resolves deepmodeling#780.

* add args for relative model deviation
…g#836)

* test: update abacus input paramters

* refactor: add fp_incar function for abacus users

* modify make_abacus_scf_input

* modify make_abacus_scf_input for on-off keys

* modify make_abacus_scf_input for on-off keys 2rd

* modify README.md

* revise abacus_scf.py

* refactor: change ways of gen KPT file in run step

* revise run.py

* modify dpgen/generator/arginfo.py as zjz said

* modify abacus_scf.py

* delete redundant lines for forward_files of abacus

* delete redundant lines for forward_files of abacus 2nd
ZLI-afk and others added 18 commits October 6, 2022 09:17
…deepmodeling#963)

Fix incompatibility of Interstitial.py and Vacancy.py with
pymatgen>2022.7.9
add pymatgen-analysis-defect and pybind11 in setup.py.
add reminder for user to install pymatgen-analysis-defect if this
package is not in their environment

Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
```json
"init_data_sys": [
   "123/456/789.hdf5"
]
```

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
…eepmodeling#989)

In ABACUS-DEEPKS, ABACUS need the deepks descriptor file when one of
'deepks_out_labels' and 'deepks_scf' is set to 1.
# Patching CVE-2007-4559

Hi, we are security researchers from the Advanced Research Center at
[Trellix](https://www.trellix.com). We have began a campaign to patch a
widespread bug named CVE-2007-4559. CVE-2007-4559 is a 15 year old bug
in the Python tarfile package. By using extract() or extractall() on a
tarfile object without sanitizing input, a maliciously crafted .tar file
could perform a directory path traversal attack. We found at least one
unsantized extractall() in your codebase and are providing a patch for
you via pull request. The patch essentially checks to see if all tarfile
members will be extracted safely and throws an exception otherwise. We
encourage you to use this patch or your own solution to secure against
CVE-2007-4559. Further technical information about the vulnerability can
be found in this
[blog](https://www.trellix.com/en-us/about/newsroom/stories/research/tarfile-exploiting-the-world.html).

If you have further questions you may contact us through this projects
lead researcher [Kasimir Schulz](mailto:kasimir.schulz@trellix.com).
Follows PEP 621.
This PR also removes the automatic `__date__` -- it only reflects the
installation date.
…pmodeling#1020)

python3.10 support: collection.Mapping -> collection.abc.Mapping

repair this: deepmodeling#1019
Since "forward_files" for init_surf is supported (see deepmodeling#909), here add
the relevant doc.
Note: some documentation links will be available once the devel branch
is merged into the master branch.
For deepmodeling#782 , WIP.
@tuoping @taipinghu @Vibsteamer please give some advice on the
arguments' introduction, thanks!
Fixes deepmodeling#1029.

Co-authored-by: Han Wang <92130845+wanghan-iapcm@users.noreply.github.com>
Fix deepmodeling#1029.

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Codecov python package is deprecated does not work any more. This patch
migrates it to another version.

Co-authored-by: Han Wang <92130845+wanghan-iapcm@users.noreply.github.com>
The previous PBC implementation is to create ghost atoms and pass them
to the OpenBabel. Since OpenBabel has supported PBC condition in v3.1.0,
the previous implementation is migrated to the native one in this PR.

Co-authored-by: AnguseZhang <529133328@qq.com>
@amcadmus amcadmus requested review from njzjz and AnguseZhang December 1, 2022 13:35
@codecov-commenter
Copy link

codecov-commenter commented Dec 1, 2022

Codecov Report

Attention: Patch coverage is 58.59591% with 749 lines in your changes missing coverage. Please review.

Project coverage is 39.48%. Comparing base (8dea29e) to head (572fbfd).
Report is 286 commits behind head on master.

Files with missing lines Patch % Lines
dpgen/generator/run.py 48.18% 114 Missing ⚠️
dpgen/auto_test/Gamma.py 62.84% 107 Missing ⚠️
dpgen/generator/lib/calypso_run_opt.py 0.00% 89 Missing ⚠️
dpgen/generator/lib/calypso_check_outcar.py 0.00% 80 Missing ⚠️
dpgen/generator/lib/run_calypso.py 7.69% 72 Missing ⚠️
dpgen/data/gen.py 26.02% 54 Missing ⚠️
dpgen/auto_test/ABACUS.py 79.35% 32 Missing ⚠️
dpgen/auto_test/lib/abacus.py 84.75% 25 Missing ⚠️
dpgen/generator/lib/make_calypso.py 45.65% 25 Missing ⚠️
dpgen/simplify/simplify.py 0.00% 22 Missing ⚠️
... and 25 more
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1059      +/-   ##
==========================================
+ Coverage   35.13%   39.48%   +4.35%     
==========================================
  Files          96       99       +3     
  Lines       16804    17989    +1185     
==========================================
+ Hits         5904     7103    +1199     
+ Misses      10900    10886      -14     

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

Copy link
Collaborator

@AnguseZhang AnguseZhang left a comment

Choose a reason for hiding this comment

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

Agree with this PR.

Meanwhile, this PR will introduce a breaking change to DP-GEN, since we will not support python3.7 anymore. So we should release 0.11.0, instead of 0.10.7, shall we?

@njzjz
Copy link
Member

njzjz commented Dec 1, 2022

Meanwhile, this PR will introduce a breaking change to DP-GEN, since we will not support python3.7 anymore.

This reminds me to update the documentation in #1060.

@njzjz
Copy link
Member

njzjz commented Dec 1, 2022

warning: #957 has not been fixed yet.

@amcadmus
Copy link
Member Author

amcadmus commented Dec 2, 2022

Agree with this PR.

Meanwhile, this PR will introduce a breaking change to DP-GEN, since we will not support python3.7 anymore. So we should release 0.11.0, instead of 0.10.7, shall we?

I agree. it will be released as 0.11.0

@amcadmus amcadmus merged commit 355f8ed into deepmodeling:master Dec 3, 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.