Skip to content

Commit

Permalink
Version bump and fixes to cpu call in config file
Browse files Browse the repository at this point in the history
  • Loading branch information
joshua-d-campbell committed Sep 4, 2019
1 parent 015334a commit bf1a749
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
18 changes: 9 additions & 9 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -42,37 +42,37 @@ process {
clusterOptions = "-P ${PROJECT} -l h_rt=48:00:00 -l mem_per_core=5G -pe omp 6 -l scratch=25G"
}
withName: runRealignerTargetCreator {
clusterOptions = "-P ${PROJECT} -l h_rt=96:00:00 -l mem_total=25G -l scratch=25G"
clusterOptions = "-P ${PROJECT} -l h_rt=96:00:00 -l mem_total=25G -l scratch=25G -pe omp 3"
}
withName: runIndelRealigner {
clusterOptions = "-P ${PROJECT} -l h_rt=192:00:00 -l mem_total=28G -l scratch=25G -pe omp 4 -l mem_per_core=14"
clusterOptions = "-P ${PROJECT} -l h_rt=192:00:00 -l mem_total=28G -l scratch=25G -pe omp 3 -l mem_per_core=14"
}
withName: runBaseRecalibrator {
clusterOptions = "-P ${PROJECT} -l h_rt=96:00:00 -l mem_total=30G -pe omp 3 -l scratch=25G"
clusterOptions = "-P ${PROJECT} -l h_rt=96:00:00 -l mem_total=30G -pe omp 3 -l scratch=25G -pe omp 3"
}
withName: runPrintReads {
clusterOptions = "-P ${PROJECT} -l h_rt=24:00:00 -l mem_total=25G -l scratch=25G"
clusterOptions = "-P ${PROJECT} -l h_rt=24:00:00 -l mem_total=25G -l scratch=25G -pe omp 3"
}
withName: runBaseRecalibratorPostRecal {
clusterOptions = "-P ${PROJECT} -l h_rt=48:00:00 -l mem_total=5g -l scratch=25G"
clusterOptions = "-P ${PROJECT} -l h_rt=48:00:00 -l mem_total=5g -l scratch=25G -pe omp 3"
}
withName: runAnalyzeCovariates {
clusterOptions = "-P ${PROJECT} -l h_rt=12:00:00 -l mem_total=5G -l scratch=25G"
}
withName: runDepthOfCoverage {
clusterOptions = "-P ${PROJECT} -l h_rt=24:00:00 -l mem_total=5G -l scratch=25G"
clusterOptions = "-P ${PROJECT} -l h_rt=24:00:00 -l mem_total=5G -l scratch=25G -pe omp 3"
}
withName: runCollectMultipleMetrics {
clusterOptions = "-P ${PROJECT} -l h_rt=24:00:00 -l mem_total=5G -l scratch=25G -pe omp 2"
clusterOptions = "-P ${PROJECT} -l h_rt=24:00:00 -l mem_total=5G -l scratch=25G -pe omp 3"
}
withName: runHybridCaptureMetrics {
clusterOptions = "-P ${PROJECT} -l h_rt=24:00:00 -l mem_total=5G -l scratch=5G -pe omp 2"
clusterOptions = "-P ${PROJECT} -l h_rt=24:00:00 -l mem_total=5G -l scratch=5G -pe omp 3"
}
withName: runFastQC {
clusterOptions = "-P ${PROJECT} -l h_rt=24:00:00 -l mem_total=5G -l scratch=5G"
}
withName: runOxoGMetrics {
clusterOptions = "-P ${PROJECT} -l h_rt=24:00:00 -l mem_total=5G -l scratch=5G -pe omp 2"
clusterOptions = "-P ${PROJECT} -l h_rt=24:00:00 -l mem_total=5G -l scratch=5G -pe omp 3"
}
withName: runMultiQCFastq {
clusterOptions = "-P ${PROJECT} -l h_rt=24:00:00 -l mem_total=5G -l scratch=5G"
Expand Down
20 changes: 10 additions & 10 deletions nf-GATK_Exome_Preprocess.nf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ DBSNP = file(params.dbsnp)

logParams(params, "nextflow_parameters.txt")

VERSION = "1.1"
VERSION = "1.2"

// Header log info
log.info "========================================="
Expand Down Expand Up @@ -256,7 +256,7 @@ process runRealignerTargetCreator {
target_file = indivID + "_target_intervals.list"

"""
java -Xmx25G -Djava.io.tmpdir=tmp/ -jar ${GATK} \
java -Xmx25G -XX:ParallelGCThreads=2 -Djava.io.tmpdir=tmp/ -jar ${GATK} \
-T RealignerTargetCreator \
-R ${REF} \
-I ${dedup_bam_list.join(" -I ")} \
Expand All @@ -280,7 +280,7 @@ process runIndelRealigner {
script:

"""
java -Xmx25G -Djava.io.tmpdir=tmp/ -jar ${GATK} \
java -Xmx25G -XX:ParallelGCThreads=2 -Djava.io.tmpdir=tmp/ -jar ${GATK} \
-T IndelRealigner \
-R ${REF} \
-I ${dedup_bam_list.join(" -I ")} \
Expand Down Expand Up @@ -349,7 +349,7 @@ process runPrintReads {
outfile_bai = sampleID + ".clean.bai"
outfile_bai2 = sampleID + ".clean.bam.bai"
"""
java -XX:ParallelGCThreads=1 -Xmx25g -Djava.io.tmpdir=tmp/ -jar ${GATK} \
java -XX:ParallelGCThreads=2 -Xmx25g -Djava.io.tmpdir=tmp/ -jar ${GATK} \
-T PrintReads \
-R ${REF} \
-I ${realign_bam} \
Expand All @@ -373,7 +373,7 @@ process runBaseRecalibratorPostRecal {
post_recal_table = sampleID + "_post_recal_table.txt"

"""
java -XX:ParallelGCThreads=1 -Xmx5g -Djava.io.tmpdir=tmp/ -jar ${GATK} \
java -XX:ParallelGCThreads=2 -Xmx5g -Djava.io.tmpdir=tmp/ -jar ${GATK} \
-T BaseRecalibrator \
-R ${REF} \
-I ${realign_bam} \
Expand All @@ -399,7 +399,7 @@ process runAnalyzeCovariates {
recal_plots = sampleID + "_recal_plots.pdf"

"""
java -XX:ParallelGCThreads=1 -Xmx5g -Djava.io.tmpdir=tmp/ -jar ${GATK} \
java -XX:ParallelGCThreads=2 -Xmx5g -Djava.io.tmpdir=tmp/ -jar ${GATK} \
-T AnalyzeCovariates \
-R ${REF} \
-before ${recal_table} \
Expand Down Expand Up @@ -436,7 +436,7 @@ process runDepthOfCoverage {
prefix = sampleID + "."

"""
java -XX:ParallelGCThreads=1 -Djava.io.tmpdir=tmp/ -Xmx5g -jar ${GATK} \
java -XX:ParallelGCThreads=2 -Djava.io.tmpdir=tmp/ -Xmx5g -jar ${GATK} \
-R ${REF} \
-T DepthOfCoverage \
-I ${bam} \
Expand Down Expand Up @@ -464,7 +464,7 @@ process runCollectMultipleMetrics {
prefix = sampleID + "."

"""
java -XX:ParallelGCThreads=1 -Xmx5g -Djava.io.tmpdir=tmp/ -jar $PICARD CollectMultipleMetrics \
java -XX:ParallelGCThreads=2 -Xmx5g -Djava.io.tmpdir=tmp/ -jar $PICARD CollectMultipleMetrics \
PROGRAM=MeanQualityByCycle \
PROGRAM=QualityScoreDistribution \
PROGRAM=CollectAlignmentSummaryMetrics \
Expand Down Expand Up @@ -498,7 +498,7 @@ process runHybridCaptureMetrics {
outfile = sampleID + ".hybrid_selection_metrics.txt"
target_coverage = sampleID + ".target_coverage.txt"
"""
java -XX:ParallelGCThreads=1 -Xmx5g -Djava.io.tmpdir=tmp/ -jar $PICARD CollectHsMetrics \
java -XX:ParallelGCThreads=2 -Xmx5g -Djava.io.tmpdir=tmp/ -jar $PICARD CollectHsMetrics \
INPUT=${bam} \
OUTPUT=${outfile} \
TARGET_INTERVALS=${TARGETS} \
Expand All @@ -524,7 +524,7 @@ process runOxoGMetrics {
outfile = sampleID + ".OxoG_metrics.txt"

"""
java -XX:ParallelGCThreads=1 -Xmx5g -Djava.io.tmpdir=tmp/ -jar $PICARD CollectOxoGMetrics \
java -XX:ParallelGCThreads=2 -Xmx5g -Djava.io.tmpdir=tmp/ -jar $PICARD CollectOxoGMetrics \
INPUT=${bam} \
OUTPUT=${outfile} \
DB_SNP=${DBSNP} \
Expand Down

0 comments on commit bf1a749

Please sign in to comment.