Skip to content

Commit

Permalink
Fix join barcode step for Opossum (#1397)
Browse files Browse the repository at this point in the history
* Fix: Use CSI instead of TBI indexing in tabix command to support chromosomes larger than 512 Mbp.

* Updated pipeline_versions.txt with all pipeline version information

* Updated pipeline_versions.txt with all pipeline version information

* updated changelogs

* Updated pipeline_versions.txt with all pipeline version information

* updated pairedtag version

* Updated pipeline_versions.txt with all pipeline version information

* CreateFragmentFile task now uses csi index format

* Update pipelines/skylab/multiome/Multiome.changelog.md

Co-authored-by: Elizabeth Kiernan <[email protected]>

* Update pipelines/skylab/optimus/Optimus.changelog.md

Co-authored-by: Elizabeth Kiernan <[email protected]>

* Update pipelines/skylab/slideseq/SlideSeq.changelog.md

Co-authored-by: Elizabeth Kiernan <[email protected]>

* Update pipelines/skylab/smartseq2_single_nucleus_multisample/MultiSampleSmartSeq2SingleNucleus.changelog.md

Co-authored-by: Elizabeth Kiernan <[email protected]>

* Update pipelines/skylab/paired_tag/PairedTag.changelog.md

Co-authored-by: Elizabeth Kiernan <[email protected]>

* Updated pipeline_versions.txt with all pipeline version information

* updating indexing for pairedtag and changing index file name

* Updated outputs to reflect the csi index. Renamed the index from tbi to index

* Update Multiome.wdl

changed JoinBarcodes task index file name

* Update pipelines/skylab/atac/atac.wdl

Co-authored-by: Elizabeth Kiernan <[email protected]>

---------

Co-authored-by: GitHub Action <[email protected]>
Co-authored-by: Elizabeth Kiernan <[email protected]>
Co-authored-by: ekiernan <[email protected]>
  • Loading branch information
4 people authored Nov 6, 2024
1 parent d7c2443 commit 88b1e48
Show file tree
Hide file tree
Showing 15 changed files with 50 additions and 20 deletions.
12 changes: 6 additions & 6 deletions pipeline_versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ ExomeReprocessing 3.3.3 2024-11-04
BuildIndices 3.0.0 2023-12-06
scATAC 1.3.2 2023-08-03
snm3C 4.0.4 2024-08-06
Multiome 5.8.0 2024-10-23
PairedTag 1.8.0 2024-10-23
Multiome 5.9.0 2024-10-21
PairedTag 1.8.1 2024-11-04
MultiSampleSmartSeq2 2.2.22 2024-09-11
MultiSampleSmartSeq2SingleNucleus 2.0.2 2024-10-23
Optimus 7.8.0 2024-10-23
atac 2.4.0 2024-10-23
MultiSampleSmartSeq2SingleNucleus 2.0.3 2024-11-04
Optimus 7.8.1 2024-11-04
atac 2.5.0 2024-10-23
SmartSeq2SingleSample 5.1.21 2024-09-11
SlideSeq 3.4.3 2024-10-24
SlideSeq 3.4.4 2024-11-04
5 changes: 5 additions & 0 deletions pipelines/skylab/atac/atac.changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 2.5.0
2024-10-23 (Date of Last Commit)

* Updated the tabix flag in CreateFragmentFile task to use CSI instead of TBI indexing, which supports chromosomes larger than 512 Mbp

# 2.4.0
2024-10-23 (Date of Last Commit)

Expand Down
6 changes: 4 additions & 2 deletions pipelines/skylab/atac/atac.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ workflow ATAC {
String adapter_seq_read3 = "TCGTCGGCAGCGTCAGATGTGTATAAGAGACAG"
}

String pipeline_version = "2.4.0"
String pipeline_version = "2.5.0"

# Determine docker prefix based on cloud provider
String gcr_docker_prefix = "us.gcr.io/broad-gotc-prod/"
Expand Down Expand Up @@ -614,7 +614,7 @@ task CreateFragmentFile {
echo "Starting bgzip"
bgzip "~{input_id}.fragments.sorted.tsv"
echo "Starting tabix"
tabix -s 1 -b 2 -e 3 "~{input_id}.fragments.sorted.tsv.gz"
tabix -s 1 -b 2 -e 3 -C "~{input_id}.fragments.sorted.tsv.gz"
>>>
runtime {
Expand All @@ -627,6 +627,8 @@ task CreateFragmentFile {
output {
File fragment_file = "~{input_id}.fragments.sorted.tsv.gz"
File fragment_file_index = "~{input_id}.fragments.sorted.tsv.gz.csi"
File Snap_metrics = "~{input_id}.metrics.h5ad"
File atac_library_metrics = "~{input_id}_~{atac_nhash_id}_library_metrics.csv"
}
Expand Down
4 changes: 4 additions & 0 deletions pipelines/skylab/multiome/Multiome.changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 5.9.0
2024-10-21 (Date of Last Commit)
* Updated the tabix flag in JoinMultiomeBarcodes task in H5adUtils.wdl to use CSI instead of TBI indexing, which supports chromosomes larger than 512 Mbp; this task changes the format for the ATAC fragment file index
* Renamed the fragment file index from atac_fragment_tsv_tbi to atac_fragment_tsv_index
# 5.8.0
2024-10-23 (Date of Last Commit)

Expand Down
5 changes: 2 additions & 3 deletions pipelines/skylab/multiome/Multiome.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import "../../../tasks/broad/Utilities.wdl" as utils

workflow Multiome {

String pipeline_version = "5.8.0"

String pipeline_version = "5.9.0"

input {
String cloud_provider
Expand Down Expand Up @@ -181,7 +180,7 @@ workflow Multiome {
# atac outputs
File bam_aligned_output_atac = Atac.bam_aligned_output
File fragment_file_atac = JoinBarcodes.atac_fragment_tsv
File fragment_file_index = JoinBarcodes.atac_fragment_tsv_tbi
File fragment_file_index = JoinBarcodes.atac_fragment_tsv_index
File snap_metrics_atac = JoinBarcodes.atac_h5ad_file
File atac_library_metrics = Atac.library_metrics_file

Expand Down
5 changes: 5 additions & 0 deletions pipelines/skylab/optimus/Optimus.changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 7.8.1
2024-11-04 (Date of Last Commit)

* Updated the tabix flag in JoinMultiomeBarcodes task in H5adUtils.wdl to use CSI instead of TBI indexing, which supports chromosomes larger than 512 Mbp; this task should not affect the Optimus pipeline

# 7.8.0
2024-10-23 (Date of Last Commit)

Expand Down
2 changes: 1 addition & 1 deletion pipelines/skylab/optimus/Optimus.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ workflow Optimus {
# version of this pipeline

String pipeline_version = "7.8.0"
String pipeline_version = "7.8.1"


# this is used to scatter matched [r1_fastq, r2_fastq, i1_fastq] arrays
Expand Down
5 changes: 5 additions & 0 deletions pipelines/skylab/paired_tag/PairedTag.changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 1.8.1
2024-11-04 (Date of Last Commit)

* Updated the tabix flag in JoinMultiomeBarcodes task in H5adUtils.wdl to use CSI instead of TBI indexing, which supports chromosomes larger than 512 Mbp; this task should not affect the Paired-Tag pipeline

# 1.8.0
2024-10-23 (Date of Last Commit)

Expand Down
2 changes: 1 addition & 1 deletion pipelines/skylab/paired_tag/PairedTag.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "../../../tasks/broad/Utilities.wdl" as utils

workflow PairedTag {

String pipeline_version = "1.8.0"
String pipeline_version = "1.8.1"


input {
Expand Down
5 changes: 5 additions & 0 deletions pipelines/skylab/slideseq/SlideSeq.changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 3.4.4
2024-11-04 (Date of Last Commit)

* Updated the tabix flag in JoinMultiomeBarcodes task in H5adUtils.wdl to use CSI instead of TBI indexing, which supports chromosomes larger than 512 Mbp; this task should not affect the Slide-seq pipeline

# 3.4.3
2024-10-24 (Date of Last Commit)

Expand Down
2 changes: 1 addition & 1 deletion pipelines/skylab/slideseq/SlideSeq.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import "../../../tasks/broad/Utilities.wdl" as utils

workflow SlideSeq {

String pipeline_version = "3.4.3"
String pipeline_version = "3.4.4"

input {
Array[File] r1_fastq
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 2.0.3
2024-11-04 (Date of Last Commit)

* Updated the tabix flag in JoinMultiomeBarcodes task in H5adUtils.wdl to use CSI instead of TBI indexing, which supports chromosomes larger than 512 Mbp; this task should not affect the snSS2 pipeline

# 2.0.2
2024-10-23 (Date of Last Commit)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ workflow MultiSampleSmartSeq2SingleNucleus {
}

# Version of this pipeline
String pipeline_version = "2.0.2"
String pipeline_version = "2.0.3"

if (false) {
String? none = "None"
Expand Down
6 changes: 3 additions & 3 deletions tasks/skylab/H5adUtils.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ task JoinMultiomeBarcodes {
echo "Starting bgzip"
bgzip "~{atac_fragment_base}.sorted.tsv"
echo "Starting tabix"
tabix -s 1 -b 2 -e 3 "~{atac_fragment_base}.sorted.tsv.gz"
tabix -s 1 -b 2 -e 3 -C "~{atac_fragment_base}.sorted.tsv.gz"
>>>
Expand All @@ -343,7 +343,7 @@ task JoinMultiomeBarcodes {
File gex_h5ad_file = "~{gex_base_name}.h5ad"
File atac_h5ad_file = "~{atac_base_name}.h5ad"
File atac_fragment_tsv = "~{atac_fragment_base}.sorted.tsv.gz"
File atac_fragment_tsv_tbi = "~{atac_fragment_base}.sorted.tsv.gz.tbi"
File atac_fragment_tsv_index = "~{atac_fragment_base}.sorted.tsv.gz.csi"
}
}
Expand Down Expand Up @@ -660,4 +660,4 @@ task AggregateSmartSeq2H5ad {
preemptible: 3
maxRetries: 1
}
}
}
4 changes: 2 additions & 2 deletions tasks/skylab/PairedTagUtils.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ task ParseBarcodes {
echo "Starting bgzip"
bgzip "~{atac_fragment_base}.sorted.tsv"
echo "Starting tabix"
tabix -s 1 -b 2 -e 3 "~{atac_fragment_base}.sorted.tsv.gz"
tabix -s 1 -b 2 -e 3 -C "~{atac_fragment_base}.sorted.tsv.gz"
>>>
Expand All @@ -292,6 +292,6 @@ task ParseBarcodes {
output {
File atac_h5ad_file = "~{atac_base_name}.h5ad"
File atac_fragment_tsv = "~{atac_fragment_base}.sorted.tsv.gz"
File atac_fragment_tsv_tbi = "~{atac_fragment_base}.sorted.tsv.gz.tbi"
File atac_fragment_tsv_tbi = "~{atac_fragment_base}.sorted.tsv.gz.csi"
}
}

0 comments on commit 88b1e48

Please sign in to comment.