Skip to content

Commit 7c9f9ee

Browse files
committed
Replace jobs.bch with annotation_jobs.bch
1 parent 4a37527 commit 7c9f9ee

File tree

1 file changed

+9
-9
lines changed
  • Late adults stats pipeline/DRrequiredAgeing/DRrequiredAgeingPackage/R

1 file changed

+9
-9
lines changed

Late adults stats pipeline/DRrequiredAgeing/DRrequiredAgeingPackage/R/sideFunctions.R

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5128,7 +5128,7 @@ IMPC_annotationPostProcess = function(SP.results = getwd(),
51285128
system('split -15000 AllResultsIndeces.txt split_index_', wait = TRUE)
51295129

51305130

5131-
system('rm -f jobs.bch', wait = TRUE)
5131+
system('rm -f annotation_jobs.bch', wait = TRUE)
51325132
system('rm -f config.Rdata', wait = TRUE)
51335133
system('rm -f logs.zip' , wait = TRUE)
51345134
system('rm -f loader.R', wait = TRUE)
@@ -5145,9 +5145,9 @@ IMPC_annotationPostProcess = function(SP.results = getwd(),
51455145
pattern = 'split_index',
51465146
mem = "12G",
51475147
time = "2-00",
5148-
outputfile = 'jobs.bch'
5148+
outputfile = 'annotation_jobs.bch'
51495149
)
5150-
system('chmod 775 jobs.bch', wait = TRUE)
5150+
system('chmod 775 annotation_jobs.bch', wait = TRUE)
51515151

51525152

51535153
if (is.null(mp_chooser_file) || !file.exists(file.path(DRrequiredAgeing:::local(), 'annotation', mp_chooser_file))) {
@@ -5168,7 +5168,7 @@ IMPC_annotationPostProcess = function(SP.results = getwd(),
51685168
wait = TRUE
51695169
)
51705170

5171-
system('sbatch --job-name=impc_stats_pipeline_job --time=01:00:00 --mem=1G -o ../annotation_postprocess_job_id.txt --wrap="bash ./jobs.bch"', wait = TRUE)
5171+
system('sbatch --job-name=impc_stats_pipeline_job --time=01:00:00 --mem=1G -o ../annotation_postprocess_job_id.txt --wrap="bash ./annotation_jobs.bch"', wait = TRUE)
51725172
DRrequiredAgeing:::waitTillCommandFinish(
51735173
WaitIfTheOutputContains = waitUntillSee,
51745174
ignoreline = ignoreThisLineInWaitingCheck
@@ -6318,7 +6318,7 @@ annotationIndexCreator = function(path = getwd(),
63186318
pattern = 'split_index',
63196319
mem = "12G",
63206320
time = "2-00",
6321-
outputfile = 'jobs.bch') {
6321+
outputfile = 'annotation_jobs.bch') {
63226322
lf = list.files(
63236323
path = path,
63246324
pattern = pattern,
@@ -6488,7 +6488,7 @@ IMPC_HadoopLoad = function(SP.results = getwd(),
64886488
system('split -50 AllResultsIndeces.txt split_index_', wait = TRUE)
64896489

64906490

6491-
system('rm -f jobs.bch', wait = TRUE)
6491+
system('rm -f annotation_jobs.bch', wait = TRUE)
64926492
system('rm -f config.Rdata', wait = TRUE)
64936493
system('rm -f configHadoop.Rdata', wait = TRUE)
64946494
system('rm -f logs.zip' , wait = TRUE)
@@ -6506,9 +6506,9 @@ IMPC_HadoopLoad = function(SP.results = getwd(),
65066506
pattern = 'split_index',
65076507
mem = "5G",
65086508
time = "2-00",
6509-
outputfile = 'jobs.bch'
6509+
outputfile = 'annotation_jobs.bch'
65106510
)
6511-
system('chmod 775 jobs.bch', wait = TRUE)
6511+
system('chmod 775 annotation_jobs.bch', wait = TRUE)
65126512

65136513

65146514
if (is.null(mp_chooser_file) || !file.exists(file.path(DRrequiredAgeing:::local(), 'annotation', mp_chooser_file))) {
@@ -6529,7 +6529,7 @@ IMPC_HadoopLoad = function(SP.results = getwd(),
65296529
wait = TRUE
65306530
)
65316531

6532-
submit_limit_jobs(bch_file="jobs.bch", job_id_logfile="../../../../compressed_logs/hadoop_load_job_id.txt")
6532+
submit_limit_jobs(bch_file="annotation_jobs.bch", job_id_logfile="../../../../compressed_logs/hadoop_load_job_id.txt")
65336533
DRrequiredAgeing:::waitTillCommandFinish(
65346534
WaitIfTheOutputContains = waitUntillSee,
65356535
ignoreline = ignoreThisLineInWaitingCheck

0 commit comments

Comments
 (0)