Skip to content
Snippets Groups Projects
Commit d58add06 authored by Philip ABBET's avatar Philip ABBET
Browse files

Fix the 'Executor' class

parent f294df35
No related branches found
No related tags found
1 merge request!8Refactoring and support of dataset providing in a container
...@@ -102,11 +102,11 @@ class Executor(object): ...@@ -102,11 +102,11 @@ class Executor(object):
for name, channel in self.data['inputs'].items(): for name, channel in self.data['inputs'].items():
group = self.input_list.group(channel) group = self.input_list.group(channel)
if group is None: if group is None:
group = inputs.InputGroup(channel, (channel == main_channel), group = inputs.RemoteInputGroup(channel, (channel == main_channel),
socket=self.socket) socket=self.socket)
self.input_list.add(group) self.input_list.add(group)
thisformat = self.algorithm.dataformats[self.algorithm.input_map[name]] thisformat = self.algorithm.dataformats[self.algorithm.input_map[name]]
group.add(inputs.Input(name, thisformat, self.socket)) group.add(inputs.RemoteInput(name, thisformat, self.socket))
logger.debug("Loaded input list with %d group(s) and %d input(s)", logger.debug("Loaded input list with %d group(s) and %d input(s)",
self.input_list.nbGroups(), len(self.input_list)) self.input_list.nbGroups(), len(self.input_list))
...@@ -115,7 +115,7 @@ class Executor(object): ...@@ -115,7 +115,7 @@ class Executor(object):
self.output_list = outputs.OutputList() self.output_list = outputs.OutputList()
for name, channel in self.data['outputs'].items(): for name, channel in self.data['outputs'].items():
thisformat = self.algorithm.dataformats[self.algorithm.output_map[name]] thisformat = self.algorithm.dataformats[self.algorithm.output_map[name]]
self.output_list.add(outputs.Output(name, thisformat, self.socket)) self.output_list.add(outputs.RemoteOutput(name, thisformat, self.socket))
logger.debug("Loaded output list with %d output(s)", logger.debug("Loaded output list with %d output(s)",
len(self.output_list)) len(self.output_list))
...@@ -126,7 +126,7 @@ class Executor(object): ...@@ -126,7 +126,7 @@ class Executor(object):
# Retrieve dataformats in the JSON of the algorithm # Retrieve dataformats in the JSON of the algorithm
analysis_format = self.algorithm.result_dataformat() analysis_format = self.algorithm.result_dataformat()
analysis_format.name = 'analysis:' + self.algorithm.name analysis_format.name = 'analysis:' + self.algorithm.name
self.output_list.add(outputs.Output(name, analysis_format, self.socket)) self.output_list.add(outputs.RemoteOutput(name, analysis_format, self.socket))
logger.debug("Loaded output list for analyzer (1 single output)") logger.debug("Loaded output list for analyzer (1 single output)")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment