From ffbdcd3a95c459a9395178b72515da755c21ebec Mon Sep 17 00:00:00 2001 From: Robrecht Cannoodt Date: Thu, 9 Jan 2025 08:55:14 +0100 Subject: [PATCH] fix folder names --- src/methods/novel/{run => novel}/config.vsh.yaml | 0 src/methods/novel/{run => novel}/main.nf | 0 src/methods/novel/{predict => novel_predict}/config.vsh.yaml | 0 src/methods/novel/{predict => novel_predict}/script.py | 0 src/methods/novel/{train => novel_train}/config.vsh.yaml | 0 src/methods/novel/{train => novel_train}/script.py | 0 src/methods/simple_mlp/{run => simple_mlp}/config.vsh.yaml | 4 ++-- src/methods/simple_mlp/{run => simple_mlp}/main.nf | 4 ++-- .../{predict => simple_mlp_predict}/config.vsh.yaml | 2 +- .../simple_mlp/{predict => simple_mlp_predict}/script.py | 4 ++-- .../simple_mlp/{train => simple_mlp_train}/config.vsh.yaml | 2 +- src/methods/simple_mlp/{train => simple_mlp_train}/script.py | 0 12 files changed, 8 insertions(+), 8 deletions(-) rename src/methods/novel/{run => novel}/config.vsh.yaml (100%) rename src/methods/novel/{run => novel}/main.nf (100%) rename src/methods/novel/{predict => novel_predict}/config.vsh.yaml (100%) rename src/methods/novel/{predict => novel_predict}/script.py (100%) rename src/methods/novel/{train => novel_train}/config.vsh.yaml (100%) rename src/methods/novel/{train => novel_train}/script.py (100%) rename src/methods/simple_mlp/{run => simple_mlp}/config.vsh.yaml (94%) rename src/methods/simple_mlp/{run => simple_mlp}/main.nf (87%) rename src/methods/simple_mlp/{predict => simple_mlp_predict}/config.vsh.yaml (96%) rename src/methods/simple_mlp/{predict => simple_mlp_predict}/script.py (95%) rename src/methods/simple_mlp/{train => simple_mlp_train}/config.vsh.yaml (95%) rename src/methods/simple_mlp/{train => simple_mlp_train}/script.py (100%) diff --git a/src/methods/novel/run/config.vsh.yaml b/src/methods/novel/novel/config.vsh.yaml similarity index 100% rename from src/methods/novel/run/config.vsh.yaml rename to src/methods/novel/novel/config.vsh.yaml diff --git a/src/methods/novel/run/main.nf b/src/methods/novel/novel/main.nf similarity index 100% rename from src/methods/novel/run/main.nf rename to src/methods/novel/novel/main.nf diff --git a/src/methods/novel/predict/config.vsh.yaml b/src/methods/novel/novel_predict/config.vsh.yaml similarity index 100% rename from src/methods/novel/predict/config.vsh.yaml rename to src/methods/novel/novel_predict/config.vsh.yaml diff --git a/src/methods/novel/predict/script.py b/src/methods/novel/novel_predict/script.py similarity index 100% rename from src/methods/novel/predict/script.py rename to src/methods/novel/novel_predict/script.py diff --git a/src/methods/novel/train/config.vsh.yaml b/src/methods/novel/novel_train/config.vsh.yaml similarity index 100% rename from src/methods/novel/train/config.vsh.yaml rename to src/methods/novel/novel_train/config.vsh.yaml diff --git a/src/methods/novel/train/script.py b/src/methods/novel/novel_train/script.py similarity index 100% rename from src/methods/novel/train/script.py rename to src/methods/novel/novel_train/script.py diff --git a/src/methods/simple_mlp/run/config.vsh.yaml b/src/methods/simple_mlp/simple_mlp/config.vsh.yaml similarity index 94% rename from src/methods/simple_mlp/run/config.vsh.yaml rename to src/methods/simple_mlp/simple_mlp/config.vsh.yaml index 53a68c2..fe5ca35 100644 --- a/src/methods/simple_mlp/run/config.vsh.yaml +++ b/src/methods/simple_mlp/simple_mlp/config.vsh.yaml @@ -21,7 +21,7 @@ resources: type: nextflow_script entrypoint: run_wf dependencies: - - name: methods/simplemlp_train - - name: methods/simplemlp_predict + - name: methods/simple_mlp_train + - name: methods/simple_mlp_predict runners: - type: nextflow diff --git a/src/methods/simple_mlp/run/main.nf b/src/methods/simple_mlp/simple_mlp/main.nf similarity index 87% rename from src/methods/simple_mlp/run/main.nf rename to src/methods/simple_mlp/simple_mlp/main.nf index 595a241..386675e 100644 --- a/src/methods/simple_mlp/run/main.nf +++ b/src/methods/simple_mlp/simple_mlp/main.nf @@ -3,12 +3,12 @@ workflow run_wf { main: output_ch = input_ch - | simplemlp_train.run( + | simple_mlp_train.run( fromState: ["input_train_mod1", "input_train_mod2"], toState: ["input_model": "output"] ) - | simplemlp_predict.run( + | simple_mlp_predict.run( fromState: ["input_train_mod2", "input_test_mod1", "input_model", "input_transform"], toState: ["output": "output"] ) diff --git a/src/methods/simple_mlp/predict/config.vsh.yaml b/src/methods/simple_mlp/simple_mlp_predict/config.vsh.yaml similarity index 96% rename from src/methods/simple_mlp/predict/config.vsh.yaml rename to src/methods/simple_mlp/simple_mlp_predict/config.vsh.yaml index 4fc47e0..a61ba81 100644 --- a/src/methods/simple_mlp/predict/config.vsh.yaml +++ b/src/methods/simple_mlp/simple_mlp_predict/config.vsh.yaml @@ -1,5 +1,5 @@ __merge__: /src/api/comp_method_predict.yaml -name: simplemlp_predict +name: simple_mlp_predict info: test_setup: diff --git a/src/methods/simple_mlp/predict/script.py b/src/methods/simple_mlp/simple_mlp_predict/script.py similarity index 95% rename from src/methods/simple_mlp/predict/script.py rename to src/methods/simple_mlp/simple_mlp_predict/script.py index f95aada..1d97912 100644 --- a/src/methods/simple_mlp/predict/script.py +++ b/src/methods/simple_mlp/simple_mlp_predict/script.py @@ -15,8 +15,8 @@ 'output': 'output/prediction' } meta = { - 'config': 'target/executable/methods/simplemlp_predict/.config.vsh.yaml', - 'resources_dir': 'target/executable/methods/simplemlp_predict', + 'config': 'target/executable/methods/simple_mlp_predict/.config.vsh.yaml', + 'resources_dir': 'target/executable/methods/simple_mlp_predict', 'cpus': 10 } ## VIASH END diff --git a/src/methods/simple_mlp/train/config.vsh.yaml b/src/methods/simple_mlp/simple_mlp_train/config.vsh.yaml similarity index 95% rename from src/methods/simple_mlp/train/config.vsh.yaml rename to src/methods/simple_mlp/simple_mlp_train/config.vsh.yaml index 3a78e4a..29bff7e 100644 --- a/src/methods/simple_mlp/train/config.vsh.yaml +++ b/src/methods/simple_mlp/simple_mlp_train/config.vsh.yaml @@ -1,5 +1,5 @@ __merge__: /src/api/comp_method_train.yaml -name: simplemlp_train +name: simple_mlp_train resources: - type: python_script path: script.py diff --git a/src/methods/simple_mlp/train/script.py b/src/methods/simple_mlp/simple_mlp_train/script.py similarity index 100% rename from src/methods/simple_mlp/train/script.py rename to src/methods/simple_mlp/simple_mlp_train/script.py