Show More
@@ -738,7 +738,7 b' class WindowsHPCLauncher(BaseLauncher):' | |||||
738 | else: |
|
738 | else: | |
739 | raise LauncherError("Job id couldn't be determined: %s" % output) |
|
739 | raise LauncherError("Job id couldn't be determined: %s" % output) | |
740 | self.job_id = job_id |
|
740 | self.job_id = job_id | |
741 |
self.log.info('Job started with |
|
741 | self.log.info('Job started with id: %r', job_id) | |
742 | return job_id |
|
742 | return job_id | |
743 |
|
743 | |||
744 | def start(self, n): |
|
744 | def start(self, n): | |
@@ -799,7 +799,7 b' class WindowsHPCControllerLauncher(WindowsHPCLauncher, ClusterAppMixin):' | |||||
799 | t.controller_args.extend(self.controller_args) |
|
799 | t.controller_args.extend(self.controller_args) | |
800 | job.add_task(t) |
|
800 | job.add_task(t) | |
801 |
|
801 | |||
802 |
self.log. |
|
802 | self.log.debug("Writing job description file: %s", self.job_file) | |
803 | job.write(self.job_file) |
|
803 | job.write(self.job_file) | |
804 |
|
804 | |||
805 | @property |
|
805 | @property | |
@@ -832,7 +832,7 b' class WindowsHPCEngineSetLauncher(WindowsHPCLauncher, ClusterAppMixin):' | |||||
832 | t.engine_args.extend(self.engine_args) |
|
832 | t.engine_args.extend(self.engine_args) | |
833 | job.add_task(t) |
|
833 | job.add_task(t) | |
834 |
|
834 | |||
835 |
self.log. |
|
835 | self.log.debug("Writing job description file: %s", self.job_file) | |
836 | job.write(self.job_file) |
|
836 | job.write(self.job_file) | |
837 |
|
837 | |||
838 | @property |
|
838 | @property | |
@@ -941,7 +941,7 b' class BatchSystemLauncher(BaseLauncher):' | |||||
941 | else: |
|
941 | else: | |
942 | raise LauncherError("Job id couldn't be determined: %s" % output) |
|
942 | raise LauncherError("Job id couldn't be determined: %s" % output) | |
943 | self.job_id = job_id |
|
943 | self.job_id = job_id | |
944 |
self.log.info('Job submitted with job id: %r' |
|
944 | self.log.info('Job submitted with job id: %r', job_id) | |
945 | return job_id |
|
945 | return job_id | |
946 |
|
946 | |||
947 | def write_batch_script(self, n): |
|
947 | def write_batch_script(self, n): | |
@@ -961,19 +961,19 b' class BatchSystemLauncher(BaseLauncher):' | |||||
961 | regex = re.compile(self.job_array_regexp) |
|
961 | regex = re.compile(self.job_array_regexp) | |
962 | # print regex.search(self.batch_template) |
|
962 | # print regex.search(self.batch_template) | |
963 | if not regex.search(self.batch_template): |
|
963 | if not regex.search(self.batch_template): | |
964 |
self.log. |
|
964 | self.log.debug("adding job array settings to batch script") | |
965 | firstline, rest = self.batch_template.split('\n',1) |
|
965 | firstline, rest = self.batch_template.split('\n',1) | |
966 | self.batch_template = u'\n'.join([firstline, self.job_array_template, rest]) |
|
966 | self.batch_template = u'\n'.join([firstline, self.job_array_template, rest]) | |
967 |
|
967 | |||
968 | regex = re.compile(self.queue_regexp) |
|
968 | regex = re.compile(self.queue_regexp) | |
969 | # print regex.search(self.batch_template) |
|
969 | # print regex.search(self.batch_template) | |
970 | if self.queue and not regex.search(self.batch_template): |
|
970 | if self.queue and not regex.search(self.batch_template): | |
971 |
self.log. |
|
971 | self.log.debug("adding PBS queue settings to batch script") | |
972 | firstline, rest = self.batch_template.split('\n',1) |
|
972 | firstline, rest = self.batch_template.split('\n',1) | |
973 | self.batch_template = u'\n'.join([firstline, self.queue_template, rest]) |
|
973 | self.batch_template = u'\n'.join([firstline, self.queue_template, rest]) | |
974 |
|
974 | |||
975 | script_as_string = self.formatter.format(self.batch_template, **self.context) |
|
975 | script_as_string = self.formatter.format(self.batch_template, **self.context) | |
976 |
self.log. |
|
976 | self.log.debug('Writing batch script: %s', self.batch_file) | |
977 |
|
977 | |||
978 | with open(self.batch_file, 'w') as f: |
|
978 | with open(self.batch_file, 'w') as f: | |
979 | f.write(script_as_string) |
|
979 | f.write(script_as_string) |
General Comments 0
You need to be logged in to leave comments.
Login now