X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fservice.py;h=c69eee04013ac310ff15904871124ff0abd9a24d;hb=dd8e6b0785c78c42c3866f161dd853a54e47275a;hp=be0ccac25a2a3bbba40616881edef2d84edf3188;hpb=2698fc8f476233bcef6526cdcbc9fe37e57ca34d;p=qcg-portal.git diff --git a/qcg/service.py b/qcg/service.py index be0ccac..c69eee0 100644 --- a/qcg/service.py +++ b/qcg/service.py @@ -5,7 +5,6 @@ from django.db import transaction from django.utils.functional import SimpleLazyObject from django.utils.timezone import now from pyqcg import QCG -from pyqcg.description import JobDescription from pyqcg.service import Registry from pyqcg.utils import Credential, TimePeriod, JobStatus, TaskStatus @@ -133,39 +132,6 @@ def update_job(job, proxy): elapsed, job.job_id, elapsed_job, job.tasks.count(), elapsed_tasks, elapsed_py) -def submit_job(params, proxy): - QCG.start() - desc = JobDescription(Credential(proxy)) - - direct_map = ('env_variables', 'executable', 'arguments', 'note', 'grant', 'hosts', 'properties', 'queue', 'procs', - 'wall_time', 'memory', 'memory_per_slot', 'modules', 'input', 'stage_in', 'native', 'notify', - 'preprocess', 'postprocess', 'persistent') - - for name in direct_map: - if params[name]: - setattr(desc, name, params[name]) - - if params['application']: - desc.set_application(*params['application']) - if params['nodes']: - desc.set_nodes(*params['nodes']) - if params['reservation']: - desc.set_reservation(params['reservation']) - if params['watch_output']: - desc.set_watch_output(params['watch_output'], params['watch_output_pattern']) - # TODO script - # TODO monitoring - - # for prop in direct_map + ('application', 'nodes', 'env_variables', 'reservation', 'watch_output'): - # print prop, type(getattr(desc, prop)), repr(getattr(desc, prop)) - - # print desc.xml_description - - job = desc.submit() - - return job.job_id - - def cancel(obj, proxy): ts = time.time() QCG.start()