Skip to content

Commit 593e8f1

Browse files
authored
Merge pull request #63 from marinak-ebi/slurm-migration
Migrate all pipelines from LSF to SLURM
2 parents eb56a82 + ca01d72 commit 593e8f1

File tree

12 files changed

+106
-401
lines changed

12 files changed

+106
-401
lines changed

Extract details from StatPackets/ExtractPVals.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -733,13 +733,13 @@ makejobs = function(path = getwd()) {
733733
bf = basename(file)
734734
n = length(parameters)
735735
jobs = paste0 (
736-
'bsub -J IMPC_stats_pipeline_lsf_jobs -M 16000 -e err/err',
736+
'sbatch --job-name=impc_stats_pipeline_job --mem=16G --time=2-00 -e err/err',
737737
bf,
738738
1:n,
739739
' -o out/out',
740740
bf,
741741
1:n,
742-
' "Rscript ExtractPVals.R ',
742+
' --wrap="Rscript ExtractPVals.R ',
743743
parameters,
744744
' ',
745745
file,

Extract details from StatPackets/ExtractPValsPhenStat.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,13 +637,13 @@ makejobs = function(path = getwd()) {
637637
bf = basename(file)
638638
n = length(parameters)
639639
jobs = paste0 (
640-
'bsub -J IMPC_stats_pipeline_lsf_jobs -M 16000 -e err/err',
640+
'sbatch --job-name=impc_stats_pipeline_job --mem=16G --time=2-00 -e err/err',
641641
bf,
642642
1:n,
643643
' -o out/out',
644644
bf,
645645
1:n,
646-
' "Rscript ExtractPVals.R ',
646+
' --wrap="Rscript ExtractPVals.R ',
647647
parameters,
648648
' ',
649649
file,
Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
11
# Split a text files based on #lines
22
split -8500 Index_DR101_V1.txt split_index_
33

4-
5-
# for creating LSF jobs in R
4+
# for creating jobs in R
65
DRrequiredAgeing:::annotationIndexCreator()
76

87
### Logs
98
find ./*/*_RawData/ClusterOut/ -name *ClusterOut -type f |xargs cp --backup=numbered -t ~/NoBckDir/DR10/logs/
109
find ./*/*_RawData/ClusterErr/ -name *ClusterErr -type f |xargs cp --backup=numbered -t ~/NoBckDir/DR10/logs/
1110

12-
1311
### Logs
1412
find ./*/*_RawData/ClusterOut/ -name *ClusterOut -type f |xargs rm
1513
find ./*/*_RawData/ClusterErr/ -name *ClusterErr -type f |xargs rm
1614

17-
1815
### Merge files
1916
cat *.tsv >> all.tsv
2017

21-
22-
### Compress a directory
23-
bsub -J IMPC_stats_pipeline_lsf_jobs -q research-rh74 "tar -zcvf ~/NoBckDir/DR9.2/jo
18+
### Compress a directory: don't forget to specify memory and time
19+
sbatch --job-name=impc_stats_pipeline_job --mem=1G --time=xx:xx:xx --wrap="tar -zcvf ~/NoBckDir/DR9.2/jo"

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ mainAgeing = function(file = NULL ,
5151
# Only for Batch generator
5252
BatchProducer = FALSE ,
5353
cpu = 1 ,
54-
memory = 8000 ,
54+
memory = "7G" ,
55+
time = "08:00:00" ,
5556
nMax = 10000 ,
5657
ChunkSize = 24 ,
5758
MinColoniesInChunks = 32 ,
@@ -299,6 +300,7 @@ mainAgeing = function(file = NULL ,
299300
center = center ,
300301
cpu = cpu ,
301302
memory = memory ,
303+
time = time ,
302304
extraBatchParameters = extraBatchParameters
303305
)
304306
write(

0 commit comments

Comments
 (0)