diff --git a/daliuge-engine/dlg/apps/archiving.py b/daliuge-engine/dlg/apps/archiving.py index 973da6ab8..186cb1741 100644 --- a/daliuge-engine/dlg/apps/archiving.py +++ b/daliuge-engine/dlg/apps/archiving.py @@ -92,8 +92,6 @@ def store(self, inputDrop): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[in] aparam/ngasSrv NGAS Server URL/localhost/String/readwrite/False/ diff --git a/daliuge-engine/dlg/apps/bash_shell_app.py b/daliuge-engine/dlg/apps/bash_shell_app.py index b80e36b2b..1784e72d1 100644 --- a/daliuge-engine/dlg/apps/bash_shell_app.py +++ b/daliuge-engine/dlg/apps/bash_shell_app.py @@ -351,8 +351,6 @@ def execute(self, data): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @par EAGLE_END diff --git a/daliuge-engine/dlg/apps/crc.py b/daliuge-engine/dlg/apps/crc.py index b7d83b4a8..34f44d69a 100644 --- a/daliuge-engine/dlg/apps/crc.py +++ b/daliuge-engine/dlg/apps/crc.py @@ -89,8 +89,6 @@ def run(self): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[out] port/data Data/String/ diff --git a/daliuge-engine/dlg/apps/dockerapp.py b/daliuge-engine/dlg/apps/dockerapp.py index 719d8a702..6a3684d31 100644 --- a/daliuge-engine/dlg/apps/dockerapp.py +++ b/daliuge-engine/dlg/apps/dockerapp.py @@ -102,8 +102,6 @@ def waitForIp(self, timeout=None): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[in] cparam/user User//String/readwrite/False/ @@ -281,7 +279,7 @@ def initialize(self, **kwargs): # who originally started the DALiuGE process as well. The information is passed through # from the host to the engine container (if run as docker) and then further to any # container running as a component. - + pw = pwd.getpwuid(os.getuid()) self._user = pw.pw_name # use current user by default self._userid = pw.pw_uid @@ -474,7 +472,7 @@ def run(self): logger.debug("No command specified, executing container without!") c = DockerApp._get_client() - + logger.debug(f"Final user for container: {self._user}:{self._userid}") # Create container self.container = c.containers.create( diff --git a/daliuge-engine/dlg/apps/dynlib.py b/daliuge-engine/dlg/apps/dynlib.py index 1c4c63ebb..64273ea31 100644 --- a/daliuge-engine/dlg/apps/dynlib.py +++ b/daliuge-engine/dlg/apps/dynlib.py @@ -364,8 +364,6 @@ def addStreamingInput(self, streamingInputDrop, back=True): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @par EAGLE_END diff --git a/daliuge-engine/dlg/apps/mpi.py b/daliuge-engine/dlg/apps/mpi.py index 4082ad058..a54a0d3d7 100644 --- a/daliuge-engine/dlg/apps/mpi.py +++ b/daliuge-engine/dlg/apps/mpi.py @@ -60,8 +60,6 @@ # \~English Is this node the end of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @par EAGLE_END diff --git a/daliuge-engine/dlg/apps/plasma.py b/daliuge-engine/dlg/apps/plasma.py index 8e5330641..3f66c86dd 100644 --- a/daliuge-engine/dlg/apps/plasma.py +++ b/daliuge-engine/dlg/apps/plasma.py @@ -61,8 +61,6 @@ # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[in] port/plasma_ms_input Plasma MS Input/Measurement Set/ @@ -161,8 +159,6 @@ def dropCompleted(self, uid, drop_state): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[in] port/input_file Input File/File/ @@ -240,8 +236,6 @@ def run(self): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[in] port/plasma_ms_input Plasma MS Input/Measurement Set/ @@ -315,8 +309,6 @@ def run(self, **kwargs): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[in] port/input_ms Input MS/Measurement Set/ diff --git a/daliuge-engine/dlg/apps/pyfunc.py b/daliuge-engine/dlg/apps/pyfunc.py index d6a6b892f..e67300481 100644 --- a/daliuge-engine/dlg/apps/pyfunc.py +++ b/daliuge-engine/dlg/apps/pyfunc.py @@ -118,8 +118,6 @@ def import_using_code(code): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[in] aparam/func_name Function Name//String/readwrite/False/ diff --git a/daliuge-engine/dlg/apps/scp.py b/daliuge-engine/dlg/apps/scp.py index 9d01f1a5c..d9a70c8c9 100644 --- a/daliuge-engine/dlg/apps/scp.py +++ b/daliuge-engine/dlg/apps/scp.py @@ -56,8 +56,6 @@ # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[in] aparam/remoteUser Remote User//String/readwrite/False/ diff --git a/daliuge-engine/dlg/apps/simple.py b/daliuge-engine/dlg/apps/simple.py index 31528cdbd..8063912ae 100644 --- a/daliuge-engine/dlg/apps/simple.py +++ b/daliuge-engine/dlg/apps/simple.py @@ -81,8 +81,6 @@ def run(self): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @par EAGLE_END @@ -127,8 +125,6 @@ def run(self): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @par EAGLE_END @@ -182,8 +178,6 @@ def copyRecursive(self, inputDrop): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @par EAGLE_END @@ -222,8 +216,6 @@ def run(self): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[out] port/array Array/Array/ @@ -308,8 +300,6 @@ def _getArray(self): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[in] port/array Array/array/ @@ -392,11 +382,21 @@ def averageArray(self): # @brief GenericNpyGatherApp # @details A BarrierAppDrop that combines one or more inputs using cummulative operations. # @param category PythonApp -# @param[in] param/appclass Application Class/dlg.apps.simple.GenericNpyGatherApp/String/readonly/ +# @param[in] cparam/appclass Application Class/dlg.apps.simple.GenericNpyGatherApp/String/readonly/False/ # \~English Application class -# @param[in] param/function Function/sum/String/readwrite/ +# @param[in] cparam/execution_time Execution Time/5/Float/readonly/False/ +# \~English Estimated execution time +# @param[in] cparam/num_cpus No. of CPUs/1/Integer/readonly/False/ +# \~English Number of cores used +# @param[in] cparam/group_start Group start/False/Boolean/readwrite/False/ +# \~English Is this node the start of a group? +# @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ +# \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state +# @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ +# \~English Specifies the number of times the 'run' method will be executed before finally giving up +# @param[in] cparam/function Function/sum/String/readwrite/False/ # \~English The function used for gathering -# @param[in] param/function reduce_axes/None/String/readonly/ +# @param[in] cparam/function reduce_axes/None/String/readonly/False/ # \~English The ndarray axes to reduce, None reduces all axes for sum, prod, max, min functions # @param[in] port/array Array/npy/ # \~English Port for the input array(s) @@ -496,8 +496,6 @@ def combine_inputs(self): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[out] port/hello Hello/String/ @@ -561,8 +559,6 @@ def run(self): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[out] port/content Content/String/ @@ -623,8 +619,6 @@ def run(self): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[out] port/array Array/Array/ @@ -694,8 +688,6 @@ def run(self): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[in] aparam/scatter_axes Scatter Axes//String/readwrite/False/ @@ -785,8 +777,6 @@ def condition(self): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[out] port/array Array/array/ diff --git a/daliuge-engine/dlg/apps/socket_listener.py b/daliuge-engine/dlg/apps/socket_listener.py index b29bf92a3..7f4bf7f08 100644 --- a/daliuge-engine/dlg/apps/socket_listener.py +++ b/daliuge-engine/dlg/apps/socket_listener.py @@ -67,8 +67,6 @@ # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @param[in] aparam/host Host/127.0.0.1/String/readwrite/False/ diff --git a/daliuge-engine/dlg/drop.py b/daliuge-engine/dlg/drop.py index 471756550..85422d859 100644 --- a/daliuge-engine/dlg/drop.py +++ b/daliuge-engine/dlg/drop.py @@ -2678,8 +2678,6 @@ def initialize(self, **kwargs): # \~English Is this node the start of a group? # @param[in] cparam/input_error_threshold "Input error threshold (0 and 100)"/0/Integer/readwrite/False/ # \~English Indicates the tolerance to erroneous effective inputs, and after which the application will not be run but moved to the ERROR state -# @param[in] cparam/n_effective_inputs Number of effective inputs/-1/Integer/readwrite/False/ -# \~English Application will block until this number of inputs have moved to the COMPLETED state. Special value of -1 means that all inputs are considered as effective # @param[in] cparam/n_tries Number of tries/1/Integer/readwrite/False/ # \~English Specifies the number of times the 'run' method will be executed before finally giving up # @par EAGLE_END