Skip to content

Commit

Permalink
Moved SharedMemory from the template palette to the daliuge palette. …
Browse files Browse the repository at this point in the history
…Modified PyFuncApp component to actually use the new EAGLE PyFuncApp category.
  • Loading branch information
james-strauss-uwa committed Aug 18, 2022
1 parent cc1bfc9 commit fea07cc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions daliuge-engine/dlg/apps/pyfunc.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class DropParser(Enum):
# calling the function is treated as an iterable, with each individual object
# being written to its corresponding output.
# @par EAGLE_START
# @param category PythonApp
# @param category PyFuncApp
# @param tag template
# @param appclass Application Class/dlg.apps.pyfunc.PyFuncApp/String/ComponentParameter/readonly//False/False/Application class
# @param execution_time Execution Time/5/Float/ComponentParameter/readonly//False/False/Estimated execution time
Expand Down Expand Up @@ -448,7 +448,7 @@ def optionalEval(x):
_dum = [appArgs.pop(k) for k in self.func_def_keywords if k in appArgs]
logger.debug("Identified keyword arguments removed: %s",
[i['text'] for i in _dum])
pargsDict.update({k:self.parameters[k] for k in pargsDict if k in
pargsDict.update({k:self.parameters[k] for k in pargsDict if k in
self.parameters})
# if defined in both we use AppArgs values
pargsDict.update({k:appArgs[k]['value'] for k in pargsDict if k
Expand All @@ -457,7 +457,7 @@ def optionalEval(x):
else:
appArgs = {}

if ('inputs' in self.parameters and
if ('inputs' in self.parameters and
droputils.check_ports_dict(self.parameters['inputs'])):
check_len = min(len(inputs),self.fn_nargs+
len(self.arguments.kwonlyargs))
Expand Down
2 changes: 1 addition & 1 deletion daliuge-engine/dlg/data/memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def generate_reproduce_data(self):
# @details Data stored in shared memory
# @par EAGLE_START
# @param category SharedMemory
# @param tag template
# @param tag daliuge
# @param data_volume Data volume/5/Float/ComponentParameter/readwrite//False/False/Estimated size of the data contained in this node
# @param group_end Group end/False/Boolean/ComponentParameter/readwrite//False/False/Is this node the end of a group?
# @param dummy dummy//Object/InputPort/readwrite//False/False/Dummy input port
Expand Down

0 comments on commit fea07cc

Please sign in to comment.