-
Notifications
You must be signed in to change notification settings - Fork 17
Add semi-supervised STACAS (ssSTACAS) as new method component #59
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
Open
JGarnica22
wants to merge
13
commits into
openproblems-bio:main
Choose a base branch
from
carmonalab:ss_stacas
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
827cef0
add method semi-supervised STACAS (ssSTACAS)
JGarnica22 cfa41e5
update changelog
JGarnica22 65008f3
Merge remote-tracking branch 'upstream/main' into ss_stacas
JGarnica22 dee1e1c
Update: base_r container
JGarnica22 aaacd54
add: method_types configuration
JGarnica22 1291bf8
fix: move ssSTACAS below kBET
JGarnica22 4a40ddc
add: PR #
JGarnica22 340de8f
fix: remove boilerplat comments
JGarnica22 93d5477
udpate: latest STACAS version
JGarnica22 81e03c9
Merge remote-tracking branch 'upstream/main' into ss_stacas
JGarnica22 7b1357c
fix: do not load unneeded counts, and specificy anchor.features
JGarnica22 52f0b33
Merge remote-tracking branch 'upstream/main' into ss_stacas
JGarnica22 5e31e19
resolve conflict
JGarnica22 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,4 +8,7 @@ | |
| /output | ||
| trace-* | ||
| .ipynb_checkpoints | ||
| __pycache__ | ||
| __pycache__ | ||
| .Rproj.user | ||
| .Rhistory | ||
| *.Rproj | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,6 @@ | |
| set -e | ||
|
|
||
| common/scripts/create_component \ | ||
| --name my_r_method \ | ||
| --name ss_stacas \ | ||
| --language r \ | ||
| --type method | ||
|
JGarnica22 marked this conversation as resolved.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| # The API specifies which type of component this is. | ||
| # It contains specifications for: | ||
| # - The input/output files | ||
| # - Common parameters | ||
| # - A unit test | ||
| __merge__: ../../api/comp_method.yaml | ||
|
|
||
| # A unique identifier for your component (required). | ||
| # Can contain only lowercase letters or underscores. | ||
| name: ss_stacas | ||
| # A relatively short label, used when rendering visualisations (required) | ||
| label: ssSTACAS | ||
| # A one sentence summary of how this method works (required). Used when | ||
| # rendering summary tables. | ||
| summary: Accurate semi-supervised integration of single-cell transcriptomics data | ||
| # A multi-line description of how this component works (required). Used | ||
| # when rendering reference documentation. | ||
| description: | | ||
| STACAS is a method for scRNA-seq integration, | ||
| especially suited to accurately integrate datasets with large cell type imbalance | ||
| (e.g. in terms of proportions of distinct cell populations). | ||
| Prior cell type knowledge, given as cell type labels, can be provided to the algorithm to perform | ||
| semi-supervised integration, leading to increased preservation of biological variability | ||
| in the resulting integrated space. | ||
| STACAS is robust to incomplete cell type labels and can be applied to large-scale integration tasks. | ||
| references: | ||
| doi: 10.1038/s41467-024-45240-z | ||
| # Andreatta M, Hérault L, Gueguen P, Gfeller D, Berenstein AJ, Carmona SJ. | ||
| # Semi-supervised integration of single-cell transcriptomics data. | ||
| # Nature Communications*. 2024;15(1):1-13. doi:10.1038/s41467-024-45240-z | ||
| links: | ||
| # URL to the documentation for this method (required). | ||
| documentation: https://carmonalab.github.io/STACAS.demo/STACAS.demo.html | ||
| # URL to the code repository for this method (required). | ||
| repository: https://github.com/carmonalab/STACAS | ||
| # Metadata for your component | ||
| info: | ||
| # Which normalisation method this component prefers to use (required). | ||
| preferred_normalization: log_cp10k | ||
|
JGarnica22 marked this conversation as resolved.
|
||
|
|
||
| # Component-specific parameters (optional) | ||
| # arguments: | ||
| # - name: "--n_neighbors" | ||
| # type: "integer" | ||
| # default: 5 | ||
| # description: Number of neighbors to use. | ||
|
|
||
| # Resources required to run the component | ||
| resources: | ||
| # The script of your component (required) | ||
| - type: r_script | ||
| path: script.R | ||
| # Additional resources your script needs (optional) | ||
| # - type: file | ||
| # path: weights.pt | ||
|
|
||
| engines: | ||
| # Specifications for the Docker image for this component. | ||
| - type: docker | ||
| image: openproblems/base_r:1.0.0 | ||
|
JGarnica22 marked this conversation as resolved.
Outdated
|
||
| # Add custom dependencies here (optional). For more information, see | ||
| # https://viash.io/reference/config/engines/docker/#setup . | ||
| setup: | ||
| - type: r | ||
| #github: https://github.com/carmonalab/STACAS.git@2.2.0 | ||
| cran: | ||
| - Seurat | ||
| - SeuratObject | ||
| - R.utils | ||
| bioc: | ||
| - BiocNeighbors | ||
| - BiocParallel | ||
| script: remotes::install_github("carmonalab/STACAS@2.2.0", dependencies = FALSE) | ||
|
|
||
| runners: | ||
| # This platform allows running the component natively | ||
| - type: executable | ||
| # Allows turning the component into a Nextflow module / pipeline. | ||
| - type: nextflow | ||
| directives: | ||
| label: [midtime,midmem,midcpu] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| requireNamespace("anndata", quietly = TRUE) | ||
| suppressPackageStartupMessages({ | ||
| library(STACAS) | ||
| library(Matrix) | ||
| library(SeuratObject) | ||
| library(Seurat) | ||
| }) | ||
|
|
||
| ## VIASH START | ||
| par <- list( | ||
| input = "resources_test/task_batch_integration/cxg_immune_cell_atlas/dataset.h5ad", | ||
| output = "output.h5ad" | ||
| ) | ||
| meta <- list( | ||
| name = "ss_stacas" | ||
| ) | ||
| ## VIASH END | ||
|
|
||
| cat("Reading input file\n") | ||
| adata <- anndata::read_h5ad(par[["input"]]) | ||
|
|
||
| cat("Create Seurat object\n") | ||
| # Transpose because Seurat expects genes in rows, cells in columns | ||
| counts_r <- Matrix::t(adata$layers[["counts"]]) | ||
| normalized_r <- Matrix::t(adata$layers[["normalized"]]) | ||
| # Convert to a regular sparse matrix first and then to dgCMatrix | ||
| counts_c <- as(as(counts_r, "CsparseMatrix"), "dgCMatrix") | ||
| normalized_c <- as(as(normalized_r, "CsparseMatrix"), "dgCMatrix") | ||
|
JGarnica22 marked this conversation as resolved.
Outdated
|
||
|
|
||
| # Create Seurat object with raw counts, these are needed to compute Variable Genes | ||
| seurat_obj <- Seurat::CreateSeuratObject(counts = counts_c, | ||
| meta.data = adata$obs) | ||
| # Manually assign pre-normalized values to the "data" slot | ||
| seurat_obj@assays$RNA$data <- normalized_c | ||
|
|
||
| cat("Run STACAS\n") | ||
| object_integrated <- seurat_obj |> | ||
| Seurat::SplitObject(split.by = "batch") |> | ||
| STACAS::Run.STACAS(cell.labels = "cell_type") | ||
|
|
||
| cat("Store outputs\n") | ||
| output <- anndata::AnnData( | ||
| uns = list( | ||
| dataset_id = adata$uns[["dataset_id"]], | ||
| normalization_id = adata$uns[["normalization_id"]], | ||
| method_id = meta$name | ||
| ), | ||
| obs = adata$obs, | ||
| var = adata$var, | ||
| obsm = list( | ||
| X_emb = object_integrated@reductions$pca@cell.embeddings | ||
| ) | ||
| ) | ||
|
|
||
| cat("Write output AnnData to file\n") | ||
| output$write_h5ad(par[["output"]], compression = "gzip") | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.