Skip to content

Commit dfec587

Browse files
authored
Merge pull request #34 from openproblems-bio/benchmark_run
Benchmark run
2 parents 11d6913 + 62cceb8 commit dfec587

File tree

9 files changed

+34
-6
lines changed

9 files changed

+34
-6
lines changed

scripts/create_resources/README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
3+
4+
The spatial datasets can be downloaded and processed with scripts in `task_ist_preprocessing/scripts/create_resources/spatial`
5+
6+
The scRNAseq reference datasets can be downloaded and processed with scripts in `task_ist_preprocessing/scripts/create_resources/sc`
7+
8+
Note that scripts in those two dirs create the datasets at:
9+
```
10+
s3://openproblems-data/resources/datasets/*/
11+
```
12+
13+
Finally the script `task_ist_preprocessing/scripts/create_resources/combine/process_datasets.sh` creates the combined, processed datasets (pairs of spatial and scRNAseq). This processing/combining step subsets the genes to the common genes and saves metadata of the combined object in the output files. The combined datasets are saved at
14+
```
15+
s3://openproblems-data/resources/task_ist_preprocessing/datasets/
16+
```
17+
(The final benchmark runs on all datasets in this location)
File renamed without changes.

scripts/create_resources/process_allen_brain_cell_atlas_brain.sh renamed to scripts/create_resources/sc/process_allen_brain_cell_atlas_brain.sh

File renamed without changes.

scripts/create_resources/process_wu_human_breast_cancer_sc.sh renamed to scripts/create_resources/sc/process_wu_human_breast_cancer_sc.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ tw launch https://github.com/openproblems-bio/task_ist_preprocessing.git \
3939
--config common/nextflow_helpers/labels_tw.config \
4040
--labels datasets,wu_human_breast_cancer_sc
4141

42-
aws s3 sync \
43-
s3://openproblems-data/resources/datasets/wu_human_breast_cancer_sc/2021Wu_human_breast_cancer_sc \
44-
resources/datasets/wu_human_breast_cancer_sc/2021Wu_human_breast_cancer_sc
42+
#aws s3 sync \
43+
# s3://openproblems-data/resources/datasets/wu_human_breast_cancer_sc/2021Wu_human_breast_cancer_sc \
44+
# resources/datasets/wu_human_breast_cancer_sc/2021Wu_human_breast_cancer_sc
File renamed without changes.

scripts/create_resources/process_vizgen_merscope.sh renamed to scripts/create_resources/spatial/process_vizgen_merscope.sh

File renamed without changes.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
3+
Here we generate a small test dataset, used for `viash test`. Note that the file structure here is a bit simplified compared to `scripts/create_resources` as we only have one dataset.
4+
5+
Download and process the single cell data:
6+
`bash 2023_yao_mouse_brain_scrnaseq_10xv2.sh`
7+
8+
Download and process the spatial data:
9+
`bash 2023_10x_mouse_brain_xenium_rep1.sh`
10+
11+
Combine the two datasets and run the ist preprocessing pipeline once with generic methods to create example outputs after each step.

scripts/run_benchmark/run_test_seqeracloud.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ tw launch https://github.com/openproblems-bio/task_ist_preprocessing.git \
2727
--workspace 53907369739130 \
2828
--params-file /tmp/params.yaml \
2929
--config common/nextflow_helpers/labels_tw.config \
30-
--labels task_template,test
30+
--labels task_ist_preprocessing,test
3131

3232
aws s3 sync \
3333
s3://openproblems-nextflow/temp/results \

src/workflows/run_benchmark/main.nf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,8 @@ workflow run_wf {
397397
// dataset_sp_id: ..., // todo: extract this from the dataset
398398
method_ids: method_ids,
399399
steps: state.steps,
400-
metric_ids: state.score_uns.metrics_ids,
401-
metrics_values: state.score_uns.metrics_values
400+
metric_ids: state.score_uns.metric_ids,
401+
metrics_values: state.score_uns.metric_values
402402
]
403403
}
404404
def score_uns_yaml_blob = toYamlBlob(score_uns)

0 commit comments

Comments
 (0)