Skip to content

Commit 2c276fb

Browse files
committed
rename all
1 parent e1b3f27 commit 2c276fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+227
-106
lines changed

.github/workflows/main.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: run-simple-use-case
1+
name: run-exemplary-workflow
22

33
on:
44
push:
@@ -23,21 +23,21 @@ jobs:
2323
- name: setup-conda-environment
2424
uses: conda-incubator/setup-miniconda@v2
2525
with:
26-
environment-file: simple_use_case/source/envs/default_env.yaml
26+
environment-file: exemplary_workflow/source/envs/default_env.yaml
2727
miniforge-version: latest
28-
activate-environment: simple_use_case
28+
activate-environment: exemplary_workflow
2929

3030
- name: run-workflow
3131
shell: bash -l {0}
3232
run: |
3333
conda install --channel conda-forge doit=0.33.1
34-
cd $GITHUB_WORKSPACE/simple_use_case/pydoit
34+
cd $GITHUB_WORKSPACE/exemplary_workflow/pydoit
3535
doit
3636
- name: upload-paper-artifact
3737
uses: actions/upload-artifact@v2
3838
with:
3939
name: paper
40-
path: ./simple_use_case/pydoit/paper.pdf
40+
path: ./exemplary_workflow/pydoit/paper.pdf
4141
retention-days: 1
4242
if-no-files-found: error
4343

@@ -54,21 +54,21 @@ jobs:
5454
- name: setup-conda-environment
5555
uses: conda-incubator/setup-miniconda@v2
5656
with:
57-
environment-file: simple_use_case/source/envs/default_env.yaml
57+
environment-file: exemplary_workflow/source/envs/default_env.yaml
5858
miniforge-version: latest
59-
activate-environment: simple_use_case
59+
activate-environment: exemplary_workflow
6060

6161
- name: run-workflow
6262
shell: bash -l {0}
6363
run: |
6464
conda install --channel conda-forge cwltool
65-
cd $GITHUB_WORKSPACE/simple_use_case/cwl
66-
cwltool wf_run_use_case.cwl
65+
cd $GITHUB_WORKSPACE/exemplary_workflow/cwl
66+
cwltool wf_run_exemplary_wf.cwl
6767
- name: upload-paper-artifact
6868
uses: actions/upload-artifact@v2
6969
with:
7070
name: paper
71-
path: ./simple_use_case/cwl/paper.pdf
71+
path: ./exemplary_workflow/cwl/paper.pdf
7272
retention-days: 1
7373
if-no-files-found: error
7474

@@ -90,14 +90,14 @@ jobs:
9090
run: |
9191
sudo apt-get update && sudo apt-get install --no-install-recommends --yes python3-pip
9292
python3 -m pip install cwltool[deps]
93-
cd $GITHUB_WORKSPACE/simple_use_case/cwl
94-
python3 -m cwltool --debug --beta-conda-dependencies wf_run_use_case.cwl
93+
cd $GITHUB_WORKSPACE/exemplary_workflow/cwl
94+
python3 -m cwltool --debug --beta-conda-dependencies wf_run_exemplary_wf.cwl
9595
9696
- name: upload-paper-artifact
9797
uses: actions/upload-artifact@v2
9898
with:
9999
name: paper
100-
path: ./simple_use_case/cwl/paper.pdf
100+
path: ./exemplary_workflow/cwl/paper.pdf
101101
retention-days: 1
102102
if-no-files-found: error
103103

@@ -115,19 +115,19 @@ jobs:
115115
uses: conda-incubator/setup-miniconda@v2
116116
with:
117117
miniforge-version: latest
118-
activate-environment: simple_use_case
118+
activate-environment: exemplary_workflow
119119

120120
- name: run-workflow
121121
shell: bash -l {0}
122122
run: |
123123
conda install --channel bioconda nextflow=21.04.0
124-
cd $GITHUB_WORKSPACE/simple_use_case/nextflow
125-
nextflow run simplecase.nf
124+
cd $GITHUB_WORKSPACE/exemplary_workflow/nextflow
125+
nextflow run exemplarywf.nf
126126
- name: upload-paper-artifact
127127
uses: actions/upload-artifact@v2
128128
with:
129129
name: paper
130-
path: ./simple_use_case/nextflow/paper.pdf
130+
path: ./exemplary_workflow/nextflow/paper.pdf
131131
retention-days: 1
132132
if-no-files-found: error
133133

@@ -146,21 +146,21 @@ jobs:
146146
uses: conda-incubator/setup-miniconda@v2
147147
with:
148148
miniforge-version: latest
149-
activate-environment: simple_use_case
149+
activate-environment: exemplary_workflow
150150
channels: conda-forge,bioconda
151151
channel-priority: strict
152152

153153
- name: run-workflow
154154
shell: bash -l {0}
155155
run: |
156156
conda install snakemake
157-
cd $GITHUB_WORKSPACE/simple_use_case/snakemake
157+
cd $GITHUB_WORKSPACE/exemplary_workflow/snakemake
158158
snakemake --cores 1 --use-conda --conda-frontend conda ./paper.pdf
159159
- name: upload-paper-artifact
160160
uses: actions/upload-artifact@v2
161161
with:
162162
name: paper
163-
path: ./simple_use_case/snakemake/paper.pdf
163+
path: ./exemplary_workflow/snakemake/paper.pdf
164164
retention-days: 1
165165
if-no-files-found: error
166166

@@ -177,22 +177,22 @@ jobs:
177177
- name: setup-conda-environment
178178
uses: conda-incubator/setup-miniconda@v2
179179
with:
180-
environment-file: simple_use_case/source/envs/default_env.yaml
180+
environment-file: exemplary_workflow/source/envs/default_env.yaml
181181
miniforge-version: latest
182-
activate-environment: simple_use_case
182+
activate-environment: exemplary_workflow
183183

184184
- name: run-workflow
185185
shell: bash -l -i {0}
186186
run: |
187-
bash $GITHUB_WORKSPACE/simple_use_case/kadistudio/install_components.sh
187+
bash $GITHUB_WORKSPACE/exemplary_workflow/kadistudio/install_components.sh
188188
mkdir $GITHUB_WORKSPACE/run
189-
process_engine run $GITHUB_WORKSPACE/simple_use_case/kadistudio/simple_use_case.flow -p $GITHUB_WORKSPACE/run
189+
process_engine run $GITHUB_WORKSPACE/exemplary_workflow/kadistudio/exemplary_workflow.flow -p $GITHUB_WORKSPACE/run
190190
191191
- name: upload-paper-artifact
192192
uses: actions/upload-artifact@v2
193193
with:
194194
name: paper
195-
path: ./simple_use_case/kadistudio/paper.pdf
195+
path: ./exemplary_workflow/kadistudio/paper.pdf
196196
retention-days: 1
197197
if-no-files-found: error
198198

@@ -237,9 +237,9 @@ jobs:
237237
- name: setup-conda-environment
238238
uses: conda-incubator/setup-miniconda@v2
239239
with:
240-
environment-file: simple_use_case/source/envs/default_env.yaml
240+
environment-file: exemplary_workflow/source/envs/default_env.yaml
241241
miniforge-version: latest
242-
activate-environment: simple_use_case
242+
activate-environment: exemplary_workflow
243243

244244
- name: install-aiida-shell
245245
# the shell directive is necessary to properly activate the shell
@@ -254,16 +254,16 @@ jobs:
254254
verdi quicksetup --non-interactive --profile default --email aiida@localhost --first-name Giuseppe --last-name Verdi --institution Khedivial --db-backend psql_dos
255255
256256
- name: run-workflow
257-
working-directory: simple_use_case/aiida
257+
working-directory: exemplary_workflow/aiida
258258
shell: bash -l {0}
259259
run:
260-
./simple_use_case.py
260+
./exemplary_workflow.py
261261

262262
- name: upload-paper-artifact
263263
uses: actions/upload-artifact@v2
264264
with:
265265
name: paper
266-
path: ./simple_use_case/aiida/paper.pdf
266+
path: ./exemplary_workflow/aiida/paper.pdf
267267
retention-days: 1
268268
if-no-files-found: error
269269

@@ -293,11 +293,11 @@ jobs:
293293

294294
- name: run-workflow
295295
run: |
296-
cd simple_use_case/gwl
296+
cd exemplary_workflow/gwl
297297
guix workflow run workflow.w
298298
299299
- name: upload-paper-artifact
300300
uses: actions/upload-artifact@v2
301301
with:
302302
name: paper
303-
path: simple_use_case/gwl/paper.pdf
303+
path: exemplary_workflow/gwl/paper.pdf

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ reproducible research workflows, by anyone, anywhere and anytime.
4848
We greatly appreciate and encourage contributions by any users or developers of
4949
workflow tools.
5050
A list of preselected tools can be found in the [documentation](https://nfdi4ingscientificworkflowrequirements.readthedocs.io/en/latest/).
51-
If you would like to add an implementation of the [simple use case](https://nfdi4ingscientificworkflowrequirements.readthedocs.io/en/latest/docs/simpleusecase.html) for a tool
51+
If you would like to add an implementation of the [exemplary workflow](https://nfdi4ingscientificworkflowrequirements.readthedocs.io/en/latest/docs/exemplarywf.html) for a tool
5252
(not limited to the given list), or if you suggest changes to one of the
5353
existing implementations, please raise an issue and/or submit a pull request.
5454
We also encourage to start a new [discussion](https://github.com/BAMresearch/NFDI4IngScientificWorkflowRequirements/discussions)

conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
# List of patterns, relative to source directory, that match files and
4848
# directories to ignore when looking for source files.
4949
# This pattern also affects html_static_path and html_extra_path.
50-
exclude_patterns = ['conda-env','conda-env', '_build', 'Thumbs.db', '.DS_Store', 'simple_use_case']
50+
exclude_patterns = ['conda-env','conda-env', '_build', 'Thumbs.db', '.DS_Store', 'exemplary_workflow']
5151

5252

5353
# The master toctree document.
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

2-
.. _simpleusecase:
2+
.. _exemplarywf:
33

4-
Simple use case
5-
===============
4+
Exemplary workflow
5+
==================
66
As a minimal working example representative of workflows in computational science, the
77
poisson equation is solved using the finite element method for a set of predefined boundary conditions :math:`u_{\mathrm{D}}`
88
on a square domain :math:`\varOmega={(0, s)}^2, s\in\mathbb{R}^+`.
@@ -17,10 +17,10 @@ The final output of the workflow is a PDF document showing the solution :math:`u
1717
line :math:`L=\{(x, y)\in\varOmega\,\vert\,x=y\}` and the number of degrees of freedom used in the finite element model.
1818
The (directed acyclic graph of the) workflow is shown below and consists of the following processes:
1919

20-
.. |DAG| image:: ./../img/simple_use_case_dag.png
20+
.. |DAG| image:: ./../img/exemplary_wf_dag.png
2121
:class: align-right
2222
:width: 95%
23-
:alt: simple_use_case_dag
23+
:alt: exemplary_wf_dag
2424

2525
1. Partition of the computational domain using `Gmsh <http://gmsh.info/>`_, |DAG|
2626

@@ -66,13 +66,13 @@ The (directed acyclic graph of the) workflow is shown below and consists of the
6666
cp source/paper.tex ./paper.tex
6767
tectonic ./paper.tex
6868
69-
It is important to note that the `source files <https://github.com/BAMresearch/NFDI4IngScientificWorkflowRequirements/blob/main/simple_use_case/source>`_ are
69+
It is important to note that the `source files <https://github.com/BAMresearch/NFDI4IngScientificWorkflowRequirements/blob/main/exemplary_workflow/source>`_ are
7070
regarded as static inputs, i.e. changing them may break the workflow and thus
7171
only the variable domain size should be exposed as an actual input parameter.
7272
The number of degrees of freedom is written to stdout
7373
by the FEniCS script `source/poisson.py`
7474
and used here to showcase how one might deal with output of integer type (i.e. non-file output).
7575
If the tool does not support this the number of degrees of freedom is written to a file.
7676

77-
Details on the specific versions used for each software package can be found in the `conda environment specification file <https://github.com/BAMresearch/NFDI4IngScientificWorkflowRequirements/blob/main/simple_use_case/source/envs/default_env.yaml>`_.
78-
Exemplary implementations with various tools can be found `here <https://github.com/BAMresearch/NFDI4IngScientificWorkflowRequirements/tree/main/simple_use_case>`_.
77+
Details on the specific versions used for each software package can be found in the `conda environment specification file <https://github.com/BAMresearch/NFDI4IngScientificWorkflowRequirements/blob/main/exemplary_workflow/source/envs/default_env.yaml>`_.
78+
Exemplary implementations with various tools can be found `here <https://github.com/BAMresearch/NFDI4IngScientificWorkflowRequirements/tree/main/exemplary_workflow>`_.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Simple use case
1+
# Exemplary workflow
22
As a minimal working example representative of workflows in computational science,
33
the poisson equation is solved using the finite element method.
44
The workflow consists of the following processes:
@@ -10,14 +10,14 @@ The workflow consists of the following processes:
1010
5. Preparation of macro definitions,
1111
6. Generation of a PDF using [LaTeX](https://www.latex-project.org/), [Tectonic](https://tectonic-typesetting.github.io/en-US/) respectively.
1212

13-
A more extensive description can be found in the [documentation](https://nfdi4ingscientificworkflowrequirements.readthedocs.io/en/latest/docs/simpleusecase.html).
13+
A more extensive description can be found in the [documentation](https://nfdi4ingscientificworkflowrequirements.readthedocs.io/en/latest/docs/exemplarywf.html).
1414

1515
## Compute environment
1616
Details about how the compute environment is built (using [conda](https://docs.conda.io/en/latest/)) can be found in the respective sub-directory for each tool.
1717

1818
## Headless operation
19-
The ParaView version used in the examples (see the [conda environment specification file](https://github.com/BAMresearch/NFDI4IngScientificWorkflowRequirements/blob/main/simple_use_case/source/envs/default_env.yaml)) is linked against EGL to also support offscreen rendering.
19+
The ParaView version used in the examples (see the [conda environment specification file](https://github.com/BAMresearch/NFDI4IngScientificWorkflowRequirements/blob/main/exemplary_workflow/source/envs/default_env.yaml)) is linked against EGL to also support offscreen rendering.
2020
Usually, these libraries exist in case of a desktop pc where an actual screen or monitor is available.
21-
However, for headless operation, i.e. when executing the simple use case in a container, it is necessary to install aforementioned libraries since these are not installed automatically as a dependency by conda.
21+
However, for headless operation, i.e. when executing the exemplary workflow in a container, it is necessary to install aforementioned libraries since these are not installed automatically as a dependency by conda.
2222
We refer to the installation of the basic dependencies in our [github action](https://github.com/BAMresearch/NFDI4IngScientificWorkflowRequirements/blob/main/.github/actions/install-basic-deps/action.yml) to give an example.
2323
For more information about offscreen rendering with ParaView go to the [ParaView documentation](https://kitware.github.io/paraview-docs/latest/cxx/Offscreen.html).
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AiiDA
2-
This directory contains an implementation of the simple use case with [AiiDA](https://www.aiida.net/).
2+
This directory contains an implementation of the exemplary workflow with [AiiDA](https://www.aiida.net/).
33

44
## Implementation
55
Since the implementation of workflows in AiiDA is quite different from the other file
@@ -11,7 +11,7 @@ According to the [documentation](https://aiida.readthedocs.io/projects/aiida-cor
1111
> The calcfunction in AiiDA is a function decorator that transforms a regular python function in a calculation process, which automatically stores the provenance of its output in the provenance graph when executed.
1212
1313
Typically `calcfunction`s are used for short running processes to be run on the local machine, like preprocessing and postprocessing steps.
14-
One could think of a workaround, using `os.subprocess` inside a `calcfunction` to run the processes of the simple use case.
14+
One could think of a workaround, using `os.subprocess` inside a `calcfunction` to run the processes of the exemplary workflow.
1515
However, `calcfunction`s are not intended to be used to run external codes and the use of `os.subprocess` is discouraged since in this case the provenance cannot be properly captured by AiiDA.
1616

1717
### Calculation jobs
@@ -38,10 +38,10 @@ sudo apt install \
3838
git python3-dev python3-pip \
3939
postgresql postgresql-server-dev-all postgresql-client rabbitmq-server
4040
```
41-
Next, we prepare a conda environment with all the software required to run the simple use case.
41+
Next, we prepare a conda environment with all the software required to run the exemplary workflow.
4242
```sh
43-
conda env create --name aiida_simplecase --file ../source/envs/default_env.yaml
44-
conda activate aiida_simplecase
43+
conda env create --name aiida_env --file ../source/envs/default_env.yaml
44+
conda activate aiida_env
4545
```
4646
Make sure that the python version is greater than 3.8, since this is required by the `aiida-shell` plugin.
4747
Next we install the `aiida-shell` plugin, which will automatically install AiiDA as a dependency.
@@ -58,14 +58,14 @@ to setup a profile and see if everything was installed correctly by running
5858
verdi status
5959
```
6060

61-
## Running the simple use case
61+
## Running the exemplary workflow
6262
If you are using `conda`, activate your environment.
6363
```
64-
conda activate aiida_simplecase
64+
conda activate aiida_env
6565
```
66-
Make the workflow script executable (`chmod +x ./simple_use_case.py`) and run it with
66+
Make the workflow script executable (`chmod +x ./exemplary_workflow.py`) and run it with
6767
```
68-
./simple_use_case.py
68+
./exemplary_workflow.py
6969
```
7070
By default all `ShellJob`s are run on the `localhost`.
7171
Some useful commands to inspect the status of the processes run and their results stored in the database are listed below.
File renamed without changes.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ If you have [`miniconda`](https://docs.conda.io/projects/conda/en/latest/user-gu
66
installed, you can simply create a respective environment by typing
77

88
```sh
9-
conda env create --file default_env.yml --prefix ./simpleusecase
10-
conda activate ./simpleusecase
9+
conda env create --file default_env.yml --prefix ./exemplarywf
10+
conda activate ./exemplarywf
1111
```
1212

1313
Note that by specifying the `--prefix` option you can simply remove all downloaded packages afterwards
1414
by removing the folder given to `prefix`. To execute the workflow after activating the environment,
1515
simply type
1616

1717
```sh
18-
cwltool wf_run_use_case.cwl
18+
cwltool wf_run_exemplary_wf.cwl
1919
```
2020

2121
into your terminal.
@@ -24,7 +24,7 @@ Or you can use the conda dependency feature of the CWL reference runner to obtai
2424
the dependencies dynamically:
2525

2626
```sh
27-
cwltool --beta-conda-dependencies wf_run_use_case.cwl
27+
cwltool --beta-conda-dependencies wf_run_exemplary_wf.cwl
2828
```
2929

3030
Note that there exist tools to visualize, edit or create cwl workflows. For instance, you can
@@ -33,4 +33,4 @@ or you can use the [Rabix Composer](https://github.com/rabix/composer) to compos
3333
on your machine.
3434

3535
Example: ![Workflow Diagram](workflow.svg)
36-
[source](https://view.commonwl.org/workflows/github.com/BAMresearch/NFDI4IngScientificWorkflowRequirements/blob/main/simple_use_case/cwl/wf_run_use_case.cwl)
36+
[source](https://view.commonwl.org/workflows/github.com/BAMresearch/NFDI4IngScientificWorkflowRequirements/blob/main/exemplary_workflow/cwl/wf_run_exemplary_wf.cwl)

0 commit comments

Comments
 (0)