Skip to content

Commit

Permalink
deploy: a8c6666
Browse files Browse the repository at this point in the history
  • Loading branch information
tclose committed Dec 29, 2024
1 parent 1c1abe3 commit 00eb9ae
Show file tree
Hide file tree
Showing 80 changed files with 1,995 additions and 1,625 deletions.
2 changes: 1 addition & 1 deletion _sources/changes.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Release Notes
---

* big changes in ``ShellTask``, ``DockerTask`` and ``SingularityTask``
* customized input specification and output specification for ``Task``\s
* customized input definition and output definition for ``Task``\s
* adding singularity checks to Travis CI
* binding all input files to the container
* changes in ``Workflow``
Expand Down
6 changes: 3 additions & 3 deletions _sources/components.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Shell Command Tasks
The *Task* can accommodate more complex shell commands by allowing the user to
customize inputs and outputs of the commands.
One can generate an input
specification to specify names of inputs, positions in the command, types of
definition to specify names of inputs, positions in the command, types of
the inputs, and other metadata.
As a specific example, FSL's BET command (Brain
Extraction Tool) can be called on the command line as:
Expand All @@ -76,7 +76,7 @@ Shell Command Tasks
bet input_file output_file -m
Each of the command argument can be treated as a named input to the
``ShellCommandTask``, and can be included in the input specification.
``ShellCommandTask``, and can be included in the input definition.
As shown next, even an output is specified by constructing
the *out_file* field form a template:

Expand All @@ -97,7 +97,7 @@ Shell Command Tasks
( "mask", bool,
{ "help_string": "create binary mask",
"argstr": "-m", } ) ],
bases=(ShellSpec,) )
bases=(ShellDef,) )
ShellCommandTask(executable="bet",
input_spec=bet_input_spec)
Expand Down
26 changes: 13 additions & 13 deletions _sources/input_spec.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Input Specification

As it was mentioned in :ref:`shell_command_task`, the user can customize the input and output
for the `ShellCommandTask`.
In this section, more examples of the input specification will be provided.
In this section, more examples of the input definition will be provided.


Let's start from the previous example:
Expand All @@ -27,29 +27,29 @@ Let's start from the previous example:
( "mask", bool,
{ "help_string": "create binary mask",
"argstr": "-m", } ) ],
bases=(ShellSpec,) )
bases=(ShellDef,) )
ShellCommandTask(executable="bet",
input_spec=bet_input_spec)
In order to create an input specification, a new `SpecInfo` object has to be created.
In order to create an input definition, a new `SpecInfo` object has to be created.
The field `name` specifies the type of the spec and it should be always "Input" for
the input specification.
The field `bases` specifies the "base specification" you want to use (can think about it as a
`parent class`) and it will usually contains `ShellSpec` only, unless you want to build on top of
your other specification (this will not be cover in this section).
the input definition.
The field `bases` specifies the "base definition" you want to use (can think about it as a
`parent class`) and it will usually contains `ShellDef` only, unless you want to build on top of
your other definition (this will not be cover in this section).
The part that should be always customised is the `fields` part.
Each element of the `fields` is a separate input field that is added to the specification.
Each element of the `fields` is a separate input field that is added to the definition.
In this example, three-elements tuples - with name, type and dictionary with additional
information - are used.
But this is only one of the supported syntax, more options will be described below.

Adding a New Field to the Spec
Adding a New Field to the Def
------------------------------

Pydra uses `attr` classes to represent the input specification, and the full syntax for each field
Pydra uses `attr` classes to represent the input definition, and the full syntax for each field
is:

.. code-block:: python
Expand Down Expand Up @@ -152,15 +152,15 @@ In the example we used multiple keys in the metadata dictionary including `help_
`output_file_template` (`str`):
If provided, the field is treated also as an output field and it is added to the output spec.
The template can use other fields, e.g. `{file1}`.
Used in order to create an output specification.
Used in order to create an output definition.
`output_field_name` (`str`, used together with `output_file_template`)
If provided the field is added to the output spec with changed name.
Used in order to create an output specification.
Used in order to create an output definition.
`keep_extension` (`bool`, default: `True`):
A flag that specifies if the file extension should be removed from the field value.
Used in order to create an output specification.
Used in order to create an output definition.
`readonly` (`bool`, default: `False`):
If `True` the input field can't be provided by the user but it aggregates other input fields
Expand Down
18 changes: 9 additions & 9 deletions _sources/output_spec.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Output Specification

As it was mentioned in :ref:`shell_command_task`, the user can customize the input and output
for the `ShellCommandTask`.
In this section, the output specification will be covered.
In this section, the output definition will be covered.


Instead of using field with `output_file_template` in the customized `input_spec` to specify an output field,
Expand All @@ -29,26 +29,26 @@ a customized `output_spec` can be used, e.g.:
),
)
],
bases=(ShellOutSpec,),
bases=(ShellOutDef,),
)
ShellCommandTask(executable=executable,
output_spec=output_spec)
Similarly as for `input_spec`, in order to create an output specification,
Similarly as for `input_spec`, in order to create an output definition,
a new `SpecInfo` object has to be created.
The field `name` specifies the type of the spec and it should be always "Output" for
the output specification.
The field `bases` specifies the "base specification" you want to use (can think about it as a
`parent class`) and it will usually contains `ShellOutSpec` only, unless you want to build on top of
your other specification (this will not be cover in this section).
the output definition.
The field `bases` specifies the "base definition" you want to use (can think about it as a
`parent class`) and it will usually contains `ShellOutDef` only, unless you want to build on top of
your other definition (this will not be cover in this section).
The part that should be always customised is the `fields` part.
Each element of the `fields` is a separate output field that is added to the specification.
Each element of the `fields` is a separate output field that is added to the definition.
In this example, a three-elements tuple - with name, type and dictionary with additional
information - is used.
See :ref:`Input Specification section` for other recognized syntax for specification's fields
See :ref:`Input Specification section` for other recognized syntax for definition's fields
and possible types.


Expand Down
2 changes: 1 addition & 1 deletion _static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '0.1.dev1+g976fb9f',
VERSION: '0.1.dev1+ga8c6666',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
2 changes: 1 addition & 1 deletion api.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Library API (application programmer interface) &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>Library API (application programmer interface) &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/design.base.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>design.base module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>design.base module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/design.boutiques.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>design.boutiques module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>design.boutiques module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/design.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>design package &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>design package &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/design.python.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>design.python module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>design.python module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/design.shell.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>design.shell module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>design.shell module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/design.workflow.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>design.workflow module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>design.workflow module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.audit.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine.audit module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine.audit module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.core.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine.core module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine.core module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.environments.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine.environments module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine.environments module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.graph.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine.graph module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine.graph module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.helpers.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine.helpers module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine.helpers module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.helpers_file.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine.helpers_file module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine.helpers_file module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.helpers_state.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine.helpers_state module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine.helpers_state module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine package &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine package &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.run_pickled.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine.run_pickled module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine.run_pickled module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.specs.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine.specs module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine.specs module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.state.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine.state module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine.state module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.submitter.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine.submitter module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine.submitter module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
2 changes: 1 addition & 1 deletion api/engine.task.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>engine.task module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+g976fb9f documentation</title>
<title>engine.task module &mdash; Pydra: A simple dataflow engine with scalable semantics 0.1.dev1+ga8c6666 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css" />

Expand Down
Loading

0 comments on commit 00eb9ae

Please sign in to comment.