Merge devel into master #720
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge master into devel
old keyword "stop_batch" -> new keyword "numb_steps"
…n lmp (deepmodeling#696) * metal testing for alloys and pair_coeff compatible with the latest lammps * add bcc self interstitial calculations * bcc interstitial optimization and change some default parameters in lmp * fix lmp default parameters * bcc interstitial optimization * add bcc interstitial unittest Co-authored-by: kevinwenminion <tongqi_wen@qq.com>
The latter will not catch `KeyboardInterrupt` and `SystemExit`. See https://stackoverflow.com/a/18982726/9567349.
* fix typo in github actions release to conda * Get from_poscar_path only when from_poscar is true (deepmodeling#537) Change-Id: I17774bee345634e4e72bd783e8112eefaaf9f0d3 Co-authored-by: Zhengju Sha <jenny@bytedance.com> * Fix QE pwscf AssertionError details in deepmodeling#683 Co-authored-by: Han Wang <amcadmus@gmail.com> Co-authored-by: felix5572 <felix5572@github.com> Co-authored-by: shazj99 <shazj99@gmail.com> Co-authored-by: Zhengju Sha <jenny@bytedance.com> Co-authored-by: Han Wang <wang_han@iapcm.ac.cn>
* fix typo in github actions release to conda * Get from_poscar_path only when from_poscar is true (deepmodeling#537) Change-Id: I17774bee345634e4e72bd783e8112eefaaf9f0d3 Co-authored-by: Zhengju Sha <jenny@bytedance.com> * feature: merge run.py * fix:fix syntax bug * fix summary ratio bug * fix: fix bug of var(calypso_run_opt_path) not defined * reorganize code v1 * add: add unittest * add: add some explainations of dp+calypso in README.md * change a little bit in readme.md * change position of function * add deepmd-kit>=2.0.1 install_require in setup.py * test failed cause no tensorflow module so add tensorflow in setup.py * calc model devi in command line * fix some small bugs of modd and PBS script of cpu * fix unittest * delete parse_input.dat * fix unittest * first reorganization * secord reorganization * fix bugs * fix: fix bugs in modd_calypso.py write_modd.py and run.py * change functions name and fix bugs * remove modd_calypso.py * remove: remove modd_calypso.py * remove some useless outputs * restore dispatcher/PBS.py * refactor: make some changes in calypso related code - rename model_devi_calypso.py run_calypso.py - rename calypso.py make_calypso.py - add new file calypso_check_outcar.py calypso_run_opt.py - add new file calypso_run_model_devi.py - delete write_modd.py - modify README.md and run.py * refactor: move calypso main code(run.py) into run_calypso.py and modify test_calypso.py * docs: modify README.md related to CALYPSO * delete some useless comments in run.py * add write_model_devi_out function into make_calypso.py for passing unittest * fix a spelling mistake in calypso_run_opt.py (famx -> fmax) * change runopt script's name from run_opt.py to calypso_run_opt.py and fix bug in runopt script * fix unittest Co-authored-by: Han Wang <amcadmus@gmail.com> Co-authored-by: felix5572 <felix5572@github.com> Co-authored-by: shazj99 <shazj99@gmail.com> Co-authored-by: Zhengju Sha <jenny@bytedance.com> Co-authored-by: Han Wang <wang_han@iapcm.ac.cn>
…#705) * add abacus+lcao+dpks interface for dpgen init and run. * fix test abacus make input bug. * Update requirements.txt add dpdata==0.2.6 to requirements. * Update setup.py update dpdata to 0.2.6 * fix bugs concerning abacus in README * update abacus example files to dpmd 2.x and dpdispatcher new version. Co-authored-by: LiuRenxi <liurenxi@LiuRenxideMacBook-Pro.local> Co-authored-by: Han Wang <amcadmus@gmail.com>
* doc: dpgen run machine parameters * unpin sphinx Fix sphinx-doc/sphinx#10291 (comment)
deepmodeling#718) * Change mv to cp when downloading softlinks. * Add explanations relevant to POTCAR's examples. * Fix CH4's vasp-md INCAR example. * Fix bug in make_submission of Auto-test * Add ase, custodian, GromacsWrapper in conda packages. * Fix bug of fp_task_min * Add gromacswrapper to conda recipe * Revert "Fix bug of fp_task_min" This reverts commit 8d7f8a7. * Add numkit recipe * Add `convert_mdata` definition to fix simplify bug. * Fix the usage of `pair_coeff` in `auto_test` * Delete printed information by `dpgen -h` in manual. * Revert "Add gromacswrapper to conda recipe" This reverts commit 3529e91. * Revert "Add numkit recipe" This reverts commit d19bd77.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.