From 071c7697f97d7b5551e492b4ed78ad2c18a2a4a2 Mon Sep 17 00:00:00 2001 From: David Robert Verelst <dave@dtu.dk> Date: Fri, 5 Aug 2016 10:18:04 +0200 Subject: [PATCH] change default pbs file list cache to launch_pbs_filelist.txt --- launch.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/launch.py b/launch.py index 50ff40e..107b118 100755 --- a/launch.py +++ b/launch.py @@ -247,7 +247,7 @@ def launch_deps(nr_cpus, path_pbs_files=None, search_crit_re=r'\.p$', else: 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: print_both(flog, 'Building file list of to be launched jobs. ' 'Might take a while...') @@ -373,7 +373,7 @@ class Scheduler: path_pbs_files : path, default=None 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. search_crit_re : string, default=r'\.p$' @@ -466,7 +466,7 @@ class Scheduler: def get_joblist(self, verbose=True): # 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 verbose: print 'Building file list of to be launched jobs. ', @@ -686,8 +686,7 @@ class Scheduler: time.sleep(self.tsleep_short) ii += 1 elif crontab_mode: - fname = os.path.join(os.getcwd(), 'pbs_in_file_cache.txt') - save_pbsflist(fname, pbsflist[ii:]) + save_pbsflist(self.f_pbsflist, pbsflist[ii:]) return else: # wait a bit before trying to launch a job again -- GitLab