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 branch into master #690

Merged
merged 14 commits into from
Mar 30, 2022
Merged

Commits on Dec 15, 2021

  1. Configuration menu
    Copy the full SHA
    591d26c View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2021

  1. bug_fix | previous patch crashed (deepmodeling#626)

    bug introduced by pr#611
    list.sum() --> sum(list)
    Vibsteamer authored Dec 30, 2021
    Configuration menu
    Copy the full SHA
    7a8ae82 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2022

  1. Added ABACUS pw interface for dpgen init_bulk (deepmodeling#590)

    * delete unnecessary files
    
    * remove ABACUS codes in relabel.py, fix test files.
    
    * Add files via upload
    
    * Add files via upload
    
    * added abacus interface for init_bulk
    
    * modify abacus init_bulk interface in accordance with earlier prs
    
    * Add files via upload
    
    * Add files via upload
    
    * Add files via upload
    
    * Add files via upload
    
    * Update test_coll_abacus.py
    
    * Update README.md
    
    * replace STRU_unit functions with poscar_unit functions plus dpdata conversion
    
    * added relax_kspacing and md_kspacing for KPT generation.
    
    Co-authored-by: LiuRenxi <[email protected]>
    Liu-RX and LiuRenxi authored Jan 4, 2022
    Configuration menu
    Copy the full SHA
    b3db59d View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2022

  1. Configuration menu
    Copy the full SHA
    1564080 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2022

  1. Add minimize step with fix 1 all box/relax tri 0.0 to autotest/re…

    …lax step (deepmodeling#631)
    
    * 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 <[email protected]>
    
    * Add `minimize` step with `fix   1 all box/relax tri 0.0`
    
    Co-authored-by: Han Wang <[email protected]>
    Co-authored-by: felix5572 <[email protected]>
    Co-authored-by: shazj99 <[email protected]>
    Co-authored-by: Zhengju Sha <[email protected]>
    Co-authored-by: Han Wang <[email protected]>
    6 people authored Feb 8, 2022
    Configuration menu
    Copy the full SHA
    38f01c2 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2022

  1. Configuration menu
    Copy the full SHA
    304c7f7 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2022

  1. bug fix (deepmodeling#650)

    * pwscf gamma sampling; fix loc_frame conflict
    
    * pwscf gamma sampling; fix the conflict between loc_frame descriptor and automatic sel label generation
    
    Co-authored-by: Pinchen Xie <[email protected]>
    salinelake and Pinchen Xie authored Feb 24, 2022
    Configuration menu
    Copy the full SHA
    7d2c1de View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2022

  1. Configuration menu
    Copy the full SHA
    9e3f176 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. Update simplify.py for api > 1.0, and fix multi-suffixes bug . (deepm…

    …odeling#670)
    
    * Update simplify.py
    
    Compatibility for api > 1.0
    
    * Update simplify.py
    
    fix the bug when multiple suffix applied, dp test obmit the middle ones and keep the last one, which lead to conflicts in dp test outputs. e.g.: dp test request 4 files: details.0.e.out details.1.e.out details.2.e.out details.3.e.out; actually output 1 file: details.e.out
    
    * Update simplify.py
    
    import function LooseVersion for API > 1.0
    cherushui authored Mar 15, 2022
    Configuration menu
    Copy the full SHA
    6304b66 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2022

  1. Make Autotest compatible with the new version of dpdispatcher. (dee…

    …pmodeling#667)
    
    * 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.
    
    * Debug info
    
    * Debug info
    
    * Fix bug in autotest
    
    * Check autotest confdir
    
    * Debug autotest command
    
    * Change run_task to [run_task]
    
    * Combining tasks together in common_equi
    
    * Combining dispatcher in common_equi
    
    * Delete debugging info.
    
    * Delete irrelevant conda file
    
    * Fix bug in common_equi
    
    * Add error log in common_prop
    AnguseZhang authored Mar 24, 2022
    Configuration menu
    Copy the full SHA
    8cd50da View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. Configuration menu
    Copy the full SHA
    d30d557 View commit details
    Browse the repository at this point in the history
  2. set the seed of type_embedding network (deepmodeling#689)

    (cherry picked from commit 1f1a39c)
    njzjz authored Mar 30, 2022
    Configuration menu
    Copy the full SHA
    be18580 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    00a74ed View commit details
    Browse the repository at this point in the history
  4. Merge branch 'devel'

    Han Wang committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    cedd26b View commit details
    Browse the repository at this point in the history