Skip to content

adding description to State, some cleaning #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
djarecka merged 3 commits into from
Aug 19, 2019
Merged

adding description to State, some cleaning #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99f1389
removing functions from auxiliary that are not used anymore
djarecka Aug 19, 2019
13e7988
renaming auxiliary to helpers_state; adding description to the State …
djarecka Aug 19, 2019
c331364
changing assert for time of the execution (it was too strict)
djarecka Aug 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions pydra/engine/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from tempfile import mkdtemp

from . import state
from . import auxiliary as aux
from . import helpers_state as hlpst
from .specs import File, BaseSpec, RuntimeSpec, Result, SpecInfo, LazyField, TaskHook
from .helpers import (
make_klass,
Expand Down Expand Up @@ -54,11 +54,6 @@ class TaskBase:
_cache_dir = None # Working directory in which to operate
_references = None # List of references for a task

# dj: do we need it??
input_spec = BaseSpec
output_spec = BaseSpec

# TODO: write state should be removed
def __init__(
self,
name: str,
Expand Down Expand Up @@ -351,7 +346,7 @@ def split(self, splitter, **kwargs):
self.inputs = dc.replace(self.inputs, **kwargs)
# dj:??, check if I need it
self.state_inputs = kwargs
splitter = aux.change_splitter(splitter, self.name)
splitter = hlpst.add_name_splitter(splitter, self.name)
if self.state:
raise Exception("splitter has been already set")
else:
Expand All @@ -376,7 +371,7 @@ def combine(self, combiner):
def get_input_el(self, ind):
"""collecting all inputs required to run the node (for specific state element)"""
if ind is not None:
# TODO: doesnt work properly for more cmplicated wf
# TODO: doesnt work properly for more cmplicated wf (check if still an issue)
state_dict = self.state.states_val[ind]
input_ind = self.state.inputs_ind[ind]
inputs_dict = {}
Expand Down Expand Up @@ -417,7 +412,7 @@ def done(self):

def _combined_output(self):
combined_results = []
for (gr, ind_l) in self.state.final_groups_mapping.items():
for (gr, ind_l) in self.state.final_combined_ind_mapping.items():
combined_results.append([])
for ind in ind_l:
result = load_result(self.checksum_states(ind), self.cache_locations)
Expand Down
Loading