diff --git a/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp.py b/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp.py index e033790..61b61cc 100644 --- a/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp.py +++ b/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp.py @@ -29,13 +29,22 @@ OUT_TIME_LIST = set({('ShortestPath', 'ENZYMES', 'False'), ('StructuralSP', 'DHFR', 'False'), ('StructuralSP', 'OHSU', 'True'), ('StructuralSP', 'OHSU', 'False'), + ('StructuralSP', 'SYNTHETIC', 'False'), ('StructuralSP', 'SYNTHETIC', 'True'), + ('StructuralSP', 'SYNTHETIC', 'False'), ('ShortestPath', 'SYNTHETICnew', 'False'), ('StructuralSP', 'SYNTHETICnew', 'True'), ('StructuralSP', 'SYNTHETICnew', 'False'), ('ShortestPath', 'Synthie', 'False'), ('StructuralSP', 'Synthie', 'True'), ('StructuralSP', 'Synthie', 'False'), + ('ShortestPath', 'COIL-DEL', 'False'), + ('StructuralSP', 'COIL-DEL', 'True'), + ('StructuralSP', 'COIL-DEL', 'False'), + ('ShortestPath', 'PROTEINS', 'False'), + ('ShortestPath', 'PROTEINS_full', 'False'), + ('StructuralSP', 'Mutagenicity', 'True'), + ('StructuralSP', 'Mutagenicity', 'False'), }) OUT_MEM_LIST = set({('StructuralSP', 'PROTEINS', 'True'), @@ -89,12 +98,20 @@ def check_task_status(save_dir, *params): return True # Check if the task is running or in queue of slurm. - command = 'squeue --user ljia02 --name "fcsp' + str_task_id + '" --format "%.2t" --noheader' + command = 'squeue --user $USER --name "fcsp' + str_task_id + '" --format "%.2t" --noheader' stream = os.popen(command) output = stream.readlines() if len(output) > 0: return True + # Check if there are more than 10 tlong tasks running. + command = 'squeue --user $USER --partition tlong --noheader' + stream = os.popen(command) + output = stream.readlines() + if len(output) > 10: + return True + + # Check if the results are already computed. file_name = os.path.join(save_dir, 'run_time' + str_task_id + '.pkl') if os.path.isfile(file_name): diff --git a/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp_space.py b/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp_space.py index c82d6c9..e21a6e6 100644 --- a/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp_space.py +++ b/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp_space.py @@ -197,7 +197,7 @@ def check_task_status(save_dir, *params): return True # Check if the task is running or in queue of slurm. - command = 'squeue --user ljia02 --name "fcsp.space' + str_task_id + '" --format "%.2t" --noheader' + command = 'squeue --user $USER --name "fcsp.space' + str_task_id + '" --format "%.2t" --noheader' stream = os.popen(command) output = stream.readlines() if len(output) > 0: