Skip to content

Commit

Permalink
update workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
rcannood committed Sep 7, 2024
1 parent bc461ca commit 405ea62
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 13 deletions.
7 changes: 4 additions & 3 deletions _viash.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ config_mods: |
.runners[.type == "nextflow"].config.labels := { lowmem : "memory = 20.Gb", midmem : "memory = 50.Gb", highmem : "memory = 100.Gb", lowcpu : "cpus = 5", midcpu : "cpus = 15", highcpu : "cpus = 30", lowtime : "time = 1.h", midtime : "time = 4.h", hightime : "time = 8.h", veryhightime : "time = 24.h" }
repositories:
- name: openproblems-v2
- name: core
type: github
repo: openproblems-bio/openproblems-v2
tag: main_build
repo: openproblems-bio/core
tag: build/main
path: viash/core
6 changes: 2 additions & 4 deletions src/workflows/process_datasets/config.vsh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@ resources:
- path: /common/nextflow_helpers/helper.nf

dependencies:
- name: common/check_dataset_schema
repository: openproblems-v2
- name: common/extract_metadata
repository: openproblems-v2
- name: schema/verify_data_structure
repository: core
- name: data_processors/process_dataset

runners:
Expand Down
2 changes: 1 addition & 1 deletion src/workflows/process_datasets/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ workflow run_wf {
main:
output_ch = input_ch

| check_dataset_schema.run(
| verify_data_structure.run(
fromState: { id, state ->
def schema = findArgumentSchema(meta.config, "input")
def schemaYaml = tempFile("schema.yaml")
Expand Down
6 changes: 2 additions & 4 deletions src/workflows/run_benchmark/config.vsh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,8 @@ resources:
path: /_viash.yaml

dependencies:
- name: common/check_dataset_schema
repository: openproblems-v2
- name: common/extract_metadata
repository: openproblems-v2
- name: h5ad/extract_uns_metadata
repository: core
- name: control_methods/true_labels
- name: methods/logistic_regression
- name: metrics/accuracy
Expand Down
2 changes: 1 addition & 1 deletion src/workflows/run_benchmark/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ workflow run_wf {
}

// extract the dataset metadata
| extract_metadata.run(
| extract_uns_metadata.run(
fromState: [input: "input_solution"],
toState: { id, output, state ->
state + [
Expand Down

0 comments on commit 405ea62

Please sign in to comment.