Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lk pd 2736 doublets #1362

Merged
merged 38 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
3af3631
adding cell calls as output of merge star outputs for calling cells
ekiernan Aug 20, 2024
0b3ad39
fixing syntax
ekiernan Aug 20, 2024
1495864
updated h5ad utils to include new warp-tools script for doublets
ekiernan Aug 21, 2024
8d3fec6
added test docker to Optimus
ekiernan Aug 21, 2024
df26128
fixed womtools
ekiernan Aug 21, 2024
9e4e14f
fixed docker name
ekiernan Aug 21, 2024
fec3ebc
testing new dockers for star-merge-npz and warp-tools to allow keeper…
ekiernan Aug 22, 2024
4067ecc
adding quotes around gex_nhash_id because it is null
ekiernan Aug 27, 2024
0440776
Merge branch 'develop' into lk-PD-2736-doublets
ekiernan Sep 18, 2024
4499866
Updated pipeline_versions.txt with all pipeline version information
actions-user Sep 18, 2024
66d8f89
updated documentation
ekiernan Sep 20, 2024
f133e90
Updated pipeline_versions.txt with all pipeline version information
actions-user Sep 21, 2024
338b886
setting null for multiome
ekiernan Sep 21, 2024
b56656c
Merge branch 'lk-PD-2736-doublets' of https://github.com/broadinstitu…
ekiernan Sep 21, 2024
d1dd9f7
typo
ekiernan Sep 21, 2024
86e3a21
added select first to library metrics
ekiernan Sep 23, 2024
289b3a3
fixing broken link in doc test
ekiernan Sep 23, 2024
dac4de4
nhash_id optional
ekiernan Sep 23, 2024
a8539f5
updating syntax for add_library_tso_doublets
ekiernan Sep 23, 2024
6e1ed35
Update H5adUtils.wdl
ekiernan Sep 23, 2024
278ad86
fix brace
ekiernan Sep 23, 2024
f691fbd
adding bash for optional nhash
ekiernan Sep 23, 2024
5e84c07
updated selectfirst for optimus task
ekiernan Sep 23, 2024
c88419b
fixed rbrace
ekiernan Sep 23, 2024
80a07d6
small change
ekiernan Sep 23, 2024
f6b50b7
reverting select_first
ekiernan Sep 23, 2024
30752a5
adding official docker image tags
ekiernan Sep 24, 2024
3616a3d
Merge branch 'develop' into lk-PD-2736-doublets
ekiernan Sep 24, 2024
5235755
added gex and atac nhash_id to Multiome and paired-tag
ekiernan Sep 24, 2024
01930c9
Merge branch 'lk-PD-2736-doublets' of https://github.com/broadinstitu…
ekiernan Sep 24, 2024
5b380ae
changelog updates
ekiernan Sep 24, 2024
85384f5
Updated pipeline_versions.txt with all pipeline version information
actions-user Sep 24, 2024
5a98363
updating warp-tools and star merge npz dockers on slideseq
ekiernan Sep 24, 2024
0542a61
added expected_cells as input to h5adUtils
ekiernan Sep 26, 2024
61e7597
Merge branch 'develop' into lk-PD-2736-doublets
ekiernan Sep 26, 2024
5329e1a
Updated changelogs
ekiernan Sep 30, 2024
2d31525
Updated readmes for pipeline versions
ekiernan Sep 30, 2024
4d6ce44
updated verify h5ad gex task
ekiernan Oct 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pipeline_versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ BroadInternalUltimaGenomics 1.1.0 2024-09-06
BroadInternalImputation 1.1.13 2024-09-06
BroadInternalArrays 1.1.12 2024-09-06
MultiSampleSmartSeq2 2.2.22 2024-09-11
MultiSampleSmartSeq2SingleNucleus 2.0.0 2024-09-11
PairedTag 1.6.1 2024-09-11
MultiSampleSmartSeq2SingleNucleus 2.0.1 2024-09-24
PairedTag 1.7.0 2024-09-24
SmartSeq2SingleSample 5.1.21 2024-09-11
scATAC 1.3.2 2023-08-03
Optimus 7.6.1 2024-09-11
Multiome 5.6.1 2024-09-11
Optimus 7.7.0 2024-09-24
Multiome 5.7.0 2024-09-24
snm3C 4.0.4 2024-08-06
BuildIndices 3.0.0 2023-12-06
atac 2.3.1 2024-09-11
SlideSeq 3.4.1 2024-09-11
SlideSeq 3.4.2 2024-09-24
BuildCembaReferences 1.0.0 2020-11-15
CEMBA 1.1.7 2024-09-06
5 changes: 5 additions & 0 deletions pipelines/skylab/multiome/Multiome.changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 5.7.0
2024-09-24 (Date of Last Commit)
* Added a python implementation of DoubletFinder to calculate doublet scores in gene expression data; percent doublets are now available as a library-level metric and individual doublet scores for cell barcodes are in the h5ad
* Updated gene_names in the final h5ad to be unique

# 5.6.1
2024-09-11 (Date of Last Commit)
* Updated warp-tools docker which added create_h5ad_snss2.py to the docker image. This change does not affect the Multiome pipeline
Expand Down
9 changes: 5 additions & 4 deletions pipelines/skylab/multiome/Multiome.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ import "../../../tasks/broad/Utilities.wdl" as utils

workflow Multiome {

String pipeline_version = "5.6.1"
String pipeline_version = "5.7.0"


input {
String cloud_provider
String input_id
# Additional library aliquot ID
String? nhash_id
String? gex_nhash_id
String? atac_nhash_id

# Optimus Inputs
String counting_mode = "sn_rna"
Expand Down Expand Up @@ -89,7 +90,7 @@ workflow Multiome {
i1_fastq = gex_i1_fastq,
input_id = input_id + "_gex",
output_bam_basename = input_id + "_gex",
gex_nhash_id = nhash_id,
gex_nhash_id = gex_nhash_id,
tar_star_reference = tar_star_reference,
annotations_gtf = annotations_gtf,
mt_genes = mt_genes,
Expand Down Expand Up @@ -118,7 +119,7 @@ workflow Multiome {
adapter_seq_read1 = adapter_seq_read1,
vm_size = vm_size,
annotations_gtf = annotations_gtf,
atac_nhash_id = nhash_id,
atac_nhash_id = atac_nhash_id,
adapter_seq_read3 = adapter_seq_read3
}
call H5adUtils.JoinMultiomeBarcodes as JoinBarcodes {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"Multiome.Atac.num_threads_bwa":"16",
"Multiome.Atac.mem_size_bwa":"64",
"Multiome.soloMultiMappers":"Uniform",
"Multiome.nhash_id":"example_1234"
"Multiome.gex_nhash_id":"example_1234",
"Multiome.atac_nhash_id":"example_1234"
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@
"Multiome.Atac.cpu_platform_bwa":"Intel Cascade Lake",
"Multiome.Atac.num_threads_bwa":"24",
"Multiome.Atac.mem_size_bwa":"175",
"Multiome.nhash_id":"example_1234"
"Multiome.gex_nhash_id":"example_1234",
"Multiome.gex_nhash_id":"example_1234"
}
6 changes: 6 additions & 0 deletions pipelines/skylab/optimus/Optimus.changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 7.7.0
2024-09-24 (Date of Last Commit)

* Added a python implementation of DoubletFinder to calculate doublet scores in gene expression data; percent doublets are now available as a library-level metric and individual doublet scores for cell barcodes are in the h5ad
* Updated gene_names in the final h5ad to be unique

# 7.6.1
2024-09-11 (Date of Last Commit)
* Updated warp-tools docker which added create_h5ad_snss2.py to the docker image. This change does not affect the Optimus pipeline
Expand Down
14 changes: 10 additions & 4 deletions pipelines/skylab/optimus/Optimus.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ workflow Optimus {
Array[File]? i1_fastq
String input_id
# String for additional library aliquot ID
String? gex_nhash_id = ""
String? gex_nhash_id
String output_bam_basename = input_id
String? input_name
String? input_id_metadata_field
Expand Down Expand Up @@ -71,7 +71,7 @@ workflow Optimus {
# version of this pipeline


String pipeline_version = "7.6.1"
String pipeline_version = "7.7.0"


# this is used to scatter matched [r1_fastq, r2_fastq, i1_fastq] arrays
Expand All @@ -91,8 +91,9 @@ workflow Optimus {
String pytools_docker = "pytools:1.0.0-1661263730"
String empty_drops_docker = "empty-drops:1.0.1-4.2"
String star_docker = "star:1.0.1-2.7.11a-1692706072"
String warp_tools_docker_2_2_0 = "warp-tools:2.3.0"
String star_merge_docker = "star-merge-npz:1.2"
String warp_tools_docker_2_2_0 = "warp-tools:2.4.0"
String star_merge_docker = "star-merge-npz:1.3.0"


#TODO how do we handle these?
String alpine_docker = "alpine-bash@sha256:965a718a07c700a5204c77e391961edee37477634ce2f9cf652a8e4c2db858ff"
Expand Down Expand Up @@ -241,11 +242,13 @@ workflow Optimus {
input:
input_id = input_id,
gex_nhash_id = gex_nhash_id,
expected_cells = expected_cells,
input_name = input_name,
input_id_metadata_field = input_id_metadata_field,
input_name_metadata_field = input_name_metadata_field,
annotation_file = annotations_gtf,
library_metrics = MergeStarOutputs.library_metrics,
cellbarcodes = MergeStarOutputs.outputbarcodes,
cell_metrics = CellMetrics.cell_metrics,
gene_metrics = GeneMetrics.gene_metrics,
sparse_count_matrix = MergeStarOutputs.sparse_counts,
Expand Down Expand Up @@ -276,11 +279,14 @@ workflow Optimus {
input:
input_id = input_id,
gex_nhash_id = gex_nhash_id,
expected_cells = expected_cells,
input_name = input_name,
counting_mode = counting_mode,
input_id_metadata_field = input_id_metadata_field,
input_name_metadata_field = input_name_metadata_field,
annotation_file = annotations_gtf,
library_metrics = MergeStarOutputs.library_metrics,
cellbarcodes = MergeStarOutputs.outputbarcodes,
cell_metrics = CellMetrics.cell_metrics,
gene_metrics = GeneMetrics.gene_metrics,
sparse_count_matrix = MergeStarOutputs.sparse_counts,
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.7.0
2024-09-24 (Date of Last Commit)
* Added a python implementation of DoubletFinder to calculate doublet scores in gene expression data; percent doublets are now available as a library-level metric and individual doublet scores for cell barcodes are in the h5ad
* Updated gene_names in the final h5ad to be unique

# 1.6.1
2024-09-11 (Date of Last Commit)
* Updated warp-tools docker which added create_h5ad_snss2.py to the docker image. This change does not affect the PairedTag pipeline
Expand Down
9 changes: 5 additions & 4 deletions pipelines/skylab/paired_tag/PairedTag.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ import "../../../tasks/broad/Utilities.wdl" as utils

workflow PairedTag {

String pipeline_version = "1.6.1"
String pipeline_version = "1.7.0"


input {
String input_id
# Additional library aliquot id
String? nhash_id
String? gex_nhash_id
String? atac_nhash_id

# Optimus Inputs
String counting_mode = "sn_rna"
Expand Down Expand Up @@ -97,7 +98,7 @@ workflow PairedTag {
count_exons = count_exons,
cloud_provider = cloud_provider,
soloMultiMappers = soloMultiMappers,
gex_nhash_id = nhash_id
gex_nhash_id = gex_nhash_id
}

# Call the ATAC workflow
Expand Down Expand Up @@ -131,7 +132,7 @@ workflow PairedTag {
preindex = preindex,
cloud_provider = cloud_provider,
vm_size = vm_size,
atac_nhash_id = nhash_id
atac_nhash_id = atac_nhash_id
}

if (preindex) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"PairedTag.Atac_preindex.mem_size_bwa":"64",
"PairedTag.soloMultiMappers":"Uniform",
"PairedTag.cloud_provider": "gcp",
"PairedTag.nhash_id":"example_1234"
"PairedTag.gex_nhash_id":"example_1234",
"PairedTag.atac_nhash_id":"example_1234"
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"PairedTag.Atac_preindex.mem_size_bwa":"64",
"PairedTag.soloMultiMappers":"Uniform",
"PairedTag.cloud_provider": "gcp",
"PairedTag.nhash_id":"example_1234"
"PairedTag.gex_nhash_id":"example_1234",
"PairedTag.atac_nhash_id":"example_1234"
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"PairedTag.Atac_preindex.mem_size_bwa":"64",
"PairedTag.soloMultiMappers":"Uniform",
"PairedTag.cloud_provider": "gcp",
"PairedTag.nhash_id":"example_1234"
"PairedTag.gex_nhash_id":"example_1234",
"PairedTag.atac_nhash_id":"example_1234"
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"PairedTag.Atac_preindex.num_threads_bwa":"24",
"PairedTag.Atac_preindex.mem_size_bwa":"175",
"PairedTag.soloMultiMappers":"Uniform",
"PairedTag.nhash_id":"example_1234",
"PairedTag.gex_nhash_id":"example_1234",
"PairedTag.atac_nhash_id":"example_1234",
"PairedTag.cloud_provider": "gcp"
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"PairedTag.Atac_preindex.num_threads_bwa":"16",
"PairedTag.Atac_preindex.mem_size_bwa":"64",
"PairedTag.soloMultiMappers":"Uniform",
"PairedTag.nhash_id":"example_1234",
"PairedTag.gex_nhash_id":"example_1234",
"PairedTag.atac_nhash_id":"example_1234",
"PairedTag.cloud_provider": "gcp"
}
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.2
2024-09-24 (Date of Last Commit)

* Added a python implementation of DoubletFinder to calculate doublet scores in gene expression data; this does not impact the slideseq workflow

# 3.4.1
2024-09-11 (Date of Last Commit)

Expand Down
6 changes: 3 additions & 3 deletions 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.1"
String pipeline_version = "3.4.2"

input {
Array[File] r1_fastq
Expand All @@ -48,8 +48,8 @@ workflow SlideSeq {
# docker images
String pytools_docker = "pytools:1.0.0-1661263730"
String picard_cloud_docker = "picard-cloud:2.26.10"
String warp_tools_docker_2_2_0 = "warp-tools:2.3.0"
String star_merge_docker = "star-merge-npz:1.2"
String warp_tools_docker_2_2_0 = "warp-tools:2.4.0"
String star_merge_docker = "star-merge-npz:1.3.0"

String ubuntu_docker = "ubuntu_16_0_4@sha256:025124e2f1cf4d29149958f17270596bffe13fc6acca6252977c572dd5ba01bf"
String gcp_ubuntu_docker_prefix = "gcr.io/gcp-runtimes/"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 2.0.1
2024-09-24 (Date of Last Commit)
* Added a python implementation of DoubletFinder to calculate doublet scores in gene expression data; this does not affect the snSS2 workflow

# 2.0.0
2024-09-11 (Dat 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.0"
String pipeline_version = "2.0.1"

if (false) {
String? none = "None"
Expand Down
Loading
Loading