Skip to content

Commit

Permalink
fix dispatcher bugs in autotest run (deepmodeling#568)
Browse files Browse the repository at this point in the history
* 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 dispatcher bugs in autotest run

Change-Id: I0e48ec74d0a0d0d6c26988c6e8c28428a362b5d9

Co-authored-by: Han Wang <amcadmus@gmail.com>
Co-authored-by: felix5572 <felix5572@github.com>
Co-authored-by: Zhengju Sha <jenny@bytedance.com>
  • Loading branch information
4 people authored and Cloudac7 committed Dec 1, 2021
1 parent 646f1e4 commit 37f8003
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions dpgen/auto_test/common_equi.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,35 +159,35 @@ def run_equi(confs,
disp = make_dispatcher(machine, resources, work_path, [run_tasks[ii]], group_size)
print("%s --> Runing... "%(work_path))

api_version = mdata.get('api_version', '0.9')
if LooseVersion(api_version) < LooseVersion('1.0'):
warnings.warn(f"the dpdispatcher will be updated to new version."
f"And the interface may be changed. Please check the documents for more details")
disp.run_jobs(resources,
command,
work_path,
[run_tasks[ii]],
group_size,
forward_common_files,
forward_files,
backward_files,
outlog='outlog',
errlog='errlog')
elif LooseVersion(api_version) >= LooseVersion('1.0'):
submission = make_submission(
mdata_machine=machine,
mdata_resource=resources,
commands=[command],
work_path=work_path,
run_tasks=run_tasks,
group_size=group_size,
forward_common_files=forward_common_files,
forward_files=forward_files,
backward_files=backward_files,
outlog = 'outlog',
errlog = 'errlog'
)
submission.run_submission()
api_version = mdata.get('api_version', '0.9')
if LooseVersion(api_version) < LooseVersion('1.0'):
warnings.warn(f"the dpdispatcher will be updated to new version."
f"And the interface may be changed. Please check the documents for more details")
disp.run_jobs(resources,
command,
work_path,
[run_tasks[ii]],
group_size,
forward_common_files,
forward_files,
backward_files,
outlog='outlog',
errlog='errlog')
elif LooseVersion(api_version) >= LooseVersion('1.0'):
submission = make_submission(
mdata_machine=machine,
mdata_resource=resources,
commands=[command],
work_path=work_path,
run_tasks=run_tasks,
group_size=group_size,
forward_common_files=forward_common_files,
forward_files=forward_files,
backward_files=backward_files,
outlog = 'outlog',
errlog = 'errlog'
)
submission.run_submission()


def post_equi(confs, inter_param):
Expand Down

0 comments on commit 37f8003

Please sign in to comment.