Skip to content
Snippets Groups Projects
Commit 071c7697 authored by David Verelst's avatar David Verelst
Browse files

change default pbs file list cache to launch_pbs_filelist.txt

parent 11759ab9
No related branches found
No related tags found
No related merge requests found
...@@ -247,7 +247,7 @@ def launch_deps(nr_cpus, path_pbs_files=None, search_crit_re=r'\.p$', ...@@ -247,7 +247,7 @@ def launch_deps(nr_cpus, path_pbs_files=None, search_crit_re=r'\.p$',
else: else:
flog = None flog = None
fname = os.path.join(os.getcwd(), 'pbs_in_file_cache.txt') fname = os.path.join(os.getcwd(), 'launch_pbs_filelist.txt')
if not cache: if not cache:
print_both(flog, 'Building file list of to be launched jobs. ' print_both(flog, 'Building file list of to be launched jobs. '
'Might take a while...') 'Might take a while...')
...@@ -373,7 +373,7 @@ class Scheduler: ...@@ -373,7 +373,7 @@ class Scheduler:
path_pbs_files : path, default=None path_pbs_files : path, default=None
If set to None, the default file name and path are assumed: If set to None, the default file name and path are assumed:
'pbs_in_file_cache.txt' and the current working directory 'launch_pbs_filelist.txt' and the current working directory
respectively. respectively.
search_crit_re : string, default=r'\.p$' search_crit_re : string, default=r'\.p$'
...@@ -466,7 +466,7 @@ class Scheduler: ...@@ -466,7 +466,7 @@ class Scheduler:
def get_joblist(self, verbose=True): def get_joblist(self, verbose=True):
# build the file list # build the file list
self.f_pbsflist = os.path.join(os.getcwd(), 'pbs_in_file_cache.txt') self.f_pbsflist = os.path.join(self.path_pbs_files, 'launch_pbs_filelist.txt')
if not self.cache: if not self.cache:
if verbose: if verbose:
print 'Building file list of to be launched jobs. ', print 'Building file list of to be launched jobs. ',
...@@ -686,8 +686,7 @@ class Scheduler: ...@@ -686,8 +686,7 @@ class Scheduler:
time.sleep(self.tsleep_short) time.sleep(self.tsleep_short)
ii += 1 ii += 1
elif crontab_mode: elif crontab_mode:
fname = os.path.join(os.getcwd(), 'pbs_in_file_cache.txt') save_pbsflist(self.f_pbsflist, pbsflist[ii:])
save_pbsflist(fname, pbsflist[ii:])
return return
else: else:
# wait a bit before trying to launch a job again # wait a bit before trying to launch a job again
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment