Skip to content

Commit 2297ffa

Browse files
committed
Added --version to main.nf
1 parent aa3cc0d commit 2297ffa

17 files changed

+1807
-1526
lines changed

.circleci/config.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,13 @@ jobs:
2222
working_directory: /tmp/src
2323
steps:
2424
- run:
25-
name: Install parallel gzip and python3
26-
command: apk add --no-cache pigz python3
25+
name: Install parallel gzip, python3 and java
26+
command: apk add --no-cache pigz python3 java
27+
- run:
28+
name: Install nextflow
29+
command: |
30+
wget -qO- https://get.nextflow.io | bash
31+
export PATH=$PATH:$PWD/nextflow
2732
- restore_cache:
2833
keys:
2934
- docker-v1-{{ .Branch }}-{{ epoch }}

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ work/
1111
nextflow
1212

1313
# Ignore results files
14-
results
14+
results/

Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ ENV PATH=${PATH}:/scif/apps/bcftools/bin
2121
# SciF Entrypoint
2222
# Disabled because of compatibility with nextflow.
2323
#ENTRYPOINT ["scif"]
24+
CMD scif

main.nf

+9-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Pipeline overview:
2222
def helpMessage() {
2323
log.info"""
2424
=========================================
25-
BU-ISCIII/nextflow-scif DEMO PIPELINE v${version}
25+
BU-ISCIII/nextflow-scif DEMO PIPELINE v${params.ver}
2626
=========================================
2727
Usage:
2828
@@ -36,20 +36,25 @@ def helpMessage() {
3636
--outdir Output dir.
3737
--help show this message.
3838
-profile Hardware config to use. standard/docker/singularity. Default: standard.
39+
--version Show pipeline version.
3940
4041
""".stripIndent()
4142
}
4243

43-
// Pipeline version
44-
version = '0.1'
45-
4644
// Show help message
4745
params.help = false
4846
if (params.help){
4947
helpMessage()
5048
exit 0
5149
}
5250

51+
if (params.version){
52+
log.info"""
53+
v${params.ver}
54+
""".stripIndent()
55+
exit 0
56+
}
57+
5358
// Default parameters
5459
params.reads = "$baseDir/data/samples/*.fastq"
5560
params.genome = "$baseDir/data/genome.fa"

nextflow.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ manifest {
1616

1717
// Global default params, used in configs
1818
params {
19-
version = '0.1' //Pipeline version
19+
ver = '1.1' //Pipeline version
2020
nf_required_version = '0.27.6' //Minimum version of Nextflow required
2121

2222
reads="$baseDir/data/samples/*.fastq"

results/bwa/A.sorted.bam

0 Bytes
Binary file not shown.

results/bwa/A.stats.txt

+335-243
Large diffs are not rendered by default.

results/bwa/B.sorted.bam

0 Bytes
Binary file not shown.

results/bwa/B.stats.txt

+335-243
Large diffs are not rendered by default.

results/bwa/C.sorted.bam

0 Bytes
Binary file not shown.

results/bwa/C.stats.txt

+335-243
Large diffs are not rendered by default.

results/report.html

+13-10
Large diffs are not rendered by default.

results/timeline.html

+13-13
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,20 @@
8282
function c1(index) { return "#bdbdbd"; }
8383
function c2(index) { return colors[index % 16]; } // <-- note: uses only the first 16 colors
8484

85-
var elapsed="10.8s"
86-
var beginningMillis=1533296394915;
87-
var endingMillis=1533296405754;
85+
var elapsed="6.1s"
86+
var beginningMillis=1533729133417;
87+
var endingMillis=1533729139543;
8888
var data=[
89-
{"label": "makeBWAindex (genome.fa)", "times": [{"starting_time": 1533296395677, "ending_time": 1533296395697, "color":c1(0)}, {"starting_time": 1533296395697, "ending_time": 1533296396169, "color":c2(0), "label": "571ms \/ 117.2 MB"}, {"starting_time": 1533296396169, "ending_time": 1533296396248, "color":c1(0)}]},
90-
{"label": "mapping (C)", "times": [{"starting_time": 1533296396328, "ending_time": 1533296396348, "color":c1(1)}, {"starting_time": 1533296396348, "ending_time": 1533296398222, "color":c2(1), "label": "1.9s \/ 296.9 MB"}, {"starting_time": 1533296398222, "ending_time": 1533296398274, "color":c1(1)}]},
91-
{"label": "mapping (B)", "times": [{"starting_time": 1533296396342, "ending_time": 1533296396351, "color":c1(1)}, {"starting_time": 1533296396351, "ending_time": 1533296398231, "color":c2(1), "label": "2s \/ 296.9 MB"}, {"starting_time": 1533296398231, "ending_time": 1533296398301, "color":c1(1)}]},
92-
{"label": "mapping (A)", "times": [{"starting_time": 1533296396351, "ending_time": 1533296396449, "color":c1(1)}, {"starting_time": 1533296396449, "ending_time": 1533296398312, "color":c2(1), "label": "1.9s \/ 296.9 MB"}]},
93-
{"label": "samtools (C)", "times": [{"starting_time": 1533296398290, "ending_time": 1533296398308, "color":c1(2)}, {"starting_time": 1533296398308, "ending_time": 1533296398995, "color":c2(2), "label": "746ms \/ 130.2 MB"}, {"starting_time": 1533296398995, "ending_time": 1533296399036, "color":c1(2)}]},
94-
{"label": "samtools (A)", "times": [{"starting_time": 1533296398310, "ending_time": 1533296398401, "color":c1(2)}, {"starting_time": 1533296398401, "ending_time": 1533296399113, "color":c2(2), "label": "772ms \/ 130.2 MB"}]},
95-
{"label": "samtools (B)", "times": [{"starting_time": 1533296398318, "ending_time": 1533296398403, "color":c1(2)}, {"starting_time": 1533296398403, "ending_time": 1533296399118, "color":c2(2), "label": "774ms \/ 130.2 MB"}]},
96-
{"label": "variantCalling (C)", "times": [{"starting_time": 1533296399058, "ending_time": 1533296399062, "color":c1(3)}, {"starting_time": 1533296399062, "ending_time": 1533296399720, "color":c2(3), "label": "5.7s \/ 168.5 MB"}, {"starting_time": 1533296399720, "ending_time": 1533296404763, "color":c1(3)}]},
97-
{"label": "variantCalling (A)", "times": [{"starting_time": 1533296399103, "ending_time": 1533296399182, "color":c1(3)}, {"starting_time": 1533296399182, "ending_time": 1533296399853, "color":c2(3), "label": "741ms \/ 168.6 MB"}]},
98-
{"label": "variantCalling (B)", "times": [{"starting_time": 1533296399123, "ending_time": 1533296399185, "color":c1(3)}, {"starting_time": 1533296399185, "ending_time": 1533296399879, "color":c2(3), "label": "762ms \/ 168.5 MB"}, {"starting_time": 1533296399879, "ending_time": 1533296399885, "color":c1(3)}]}
89+
{"label": "makeBWAindex (genome.fa)", "times": [{"starting_time": 1533729134045, "ending_time": 1533729134148, "color":c1(0)}, {"starting_time": 1533729134148, "ending_time": 1533729134598, "color":c2(0), "label": "546ms \/ 117.2 MB"}]},
90+
{"label": "mapping (A)", "times": [{"starting_time": 1533729134662, "ending_time": 1533729134692, "color":c1(1)}, {"starting_time": 1533729134692, "ending_time": 1533729136556, "color":c2(1), "label": "1.9s \/ 296.9 MB"}, {"starting_time": 1533729136556, "ending_time": 1533729136608, "color":c1(1)}]},
91+
{"label": "mapping (C)", "times": [{"starting_time": 1533729134677, "ending_time": 1533729134741, "color":c1(1)}, {"starting_time": 1533729134741, "ending_time": 1533729136721, "color":c2(1), "label": "2.1s \/ 296.9 MB"}, {"starting_time": 1533729136721, "ending_time": 1533729136806, "color":c1(1)}]},
92+
{"label": "mapping (B)", "times": [{"starting_time": 1533729134686, "ending_time": 1533729134745, "color":c1(1)}, {"starting_time": 1533729134745, "ending_time": 1533729136686, "color":c2(1), "label": "2s \/ 296.9 MB"}, {"starting_time": 1533729136686, "ending_time": 1533729136705, "color":c1(1)}]},
93+
{"label": "samtools (A)", "times": [{"starting_time": 1533729136626, "ending_time": 1533729136744, "color":c1(2)}, {"starting_time": 1533729136744, "ending_time": 1533729137341, "color":c2(2), "label": "649ms \/ 130.2 MB"}]},
94+
{"label": "samtools (B)", "times": [{"starting_time": 1533729136751, "ending_time": 1533729136813, "color":c1(2)}, {"starting_time": 1533729136813, "ending_time": 1533729137470, "color":c2(2), "label": "711ms \/ 130.2 MB"}]},
95+
{"label": "samtools (C)", "times": [{"starting_time": 1533729136848, "ending_time": 1533729136907, "color":c1(2)}, {"starting_time": 1533729136907, "ending_time": 1533729137538, "color":c2(2), "label": "687ms \/ 130.2 MB"}]},
96+
{"label": "variantCalling (A)", "times": [{"starting_time": 1533729137326, "ending_time": 1533729137375, "color":c1(3)}, {"starting_time": 1533729137375, "ending_time": 1533729138260, "color":c2(3), "label": "970ms \/ 168.6 MB"}, {"starting_time": 1533729138260, "ending_time": 1533729138296, "color":c1(3)}]},
97+
{"label": "variantCalling (B)", "times": [{"starting_time": 1533729137512, "ending_time": 1533729137545, "color":c1(3)}, {"starting_time": 1533729137545, "ending_time": 1533729138309, "color":c2(3), "label": "824ms \/ 168.5 MB"}, {"starting_time": 1533729138309, "ending_time": 1533729138336, "color":c1(3)}]},
98+
{"label": "variantCalling (C)", "times": [{"starting_time": 1533729137554, "ending_time": 1533729137635, "color":c1(3)}, {"starting_time": 1533729137635, "ending_time": 1533729138398, "color":c2(3), "label": "832ms \/ 168.5 MB"}]}
9999
]
100100

101101

results/trace.txt

-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1 @@
11
task_id hash native_id name status exit submit duration realtime %cpu rss vmem rchar wchar
2-
1 b2/6b8e52 9955 makeBWAindex (genome.fa) COMPLETED 0 2018-08-03 13:39:55.677 571ms 472ms 8.0% 2.7 MB 117.2 MB 728.4 KB 508.9 KB
3-
3 06/a0d2ce 10055 mapping (C) COMPLETED 0 2018-08-03 13:39:56.328 1.9s 1.9s 57.0% 11.7 MB 296.9 MB 5.9 MB 97 B
4-
2 f6/3af404 10098 mapping (A) COMPLETED 0 2018-08-03 13:39:56.351 1.9s 1.9s 57.0% 11.7 MB 296.9 MB 5.9 MB 97 B
5-
4 c5/49dc3c 10068 mapping (B) COMPLETED 0 2018-08-03 13:39:56.342 2s 1.9s 55.0% 11.7 MB 296.9 MB 5.9 MB 97 B
6-
5 b5/089036 10576 samtools (C) COMPLETED 0 2018-08-03 13:39:58.290 746ms 687ms 37.0% 11 MB 130.2 MB 2.2 MB 2.1 MB
7-
6 38/45a06f 10593 samtools (A) COMPLETED 0 2018-08-03 13:39:58.310 772ms 712ms 39.0% 11 MB 130.2 MB 2.2 MB 2.1 MB
8-
7 69/e3f32a 10610 samtools (B) COMPLETED 0 2018-08-03 13:39:58.318 774ms 715ms 37.0% 11 MB 130.2 MB 2.2 MB 2.1 MB
9-
9 94/5bd822 10975 variantCalling (A) COMPLETED 0 2018-08-03 13:39:59.103 741ms 671ms 34.0% 36.4 MB 168.6 MB 649.9 KB 112.3 KB
10-
10 96/ea9536 10992 variantCalling (B) COMPLETED 0 2018-08-03 13:39:59.123 762ms 694ms 51.0% 36.4 MB 168.5 MB 869.9 KB 314.7 KB
11-
8 1f/df3295 10943 variantCalling (C) COMPLETED 0 2018-08-03 13:39:59.058 5.7s 658ms 36.0% 36.4 MB 168.5 MB 672.4 KB 136.6 KB

0 commit comments

Comments
 (0)