diff --git a/daliuge-engine/dlg/apps/archiving.py b/daliuge-engine/dlg/apps/archiving.py index 973da6ab8..694dc5c64 100644 --- a/daliuge-engine/dlg/apps/archiving.py +++ b/daliuge-engine/dlg/apps/archiving.py @@ -90,10 +90,8 @@ def store(self, inputDrop): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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..29d224079 100644 --- a/daliuge-engine/dlg/apps/bash_shell_app.py +++ b/daliuge-engine/dlg/apps/bash_shell_app.py @@ -349,10 +349,8 @@ def execute(self, data): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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..dd696b73e 100644 --- a/daliuge-engine/dlg/apps/crc.py +++ b/daliuge-engine/dlg/apps/crc.py @@ -87,10 +87,8 @@ def run(self): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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..44838fa21 100644 --- a/daliuge-engine/dlg/apps/dockerapp.py +++ b/daliuge-engine/dlg/apps/dockerapp.py @@ -100,10 +100,8 @@ def waitForIp(self, timeout=None): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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..9706df837 100644 --- a/daliuge-engine/dlg/apps/dynlib.py +++ b/daliuge-engine/dlg/apps/dynlib.py @@ -362,10 +362,8 @@ def addStreamingInput(self, streamingInputDrop, back=True): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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..a28f5b262 100644 --- a/daliuge-engine/dlg/apps/mpi.py +++ b/daliuge-engine/dlg/apps/mpi.py @@ -58,10 +58,8 @@ # \~English Number of cores used # @param[in] cparam/group_end Group end/False/Boolean/readwrite/False/ # \~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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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..ef91bf6aa 100644 --- a/daliuge-engine/dlg/apps/plasma.py +++ b/daliuge-engine/dlg/apps/plasma.py @@ -59,10 +59,8 @@ # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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/ @@ -159,10 +157,8 @@ def dropCompleted(self, uid, drop_state): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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/ @@ -238,10 +234,8 @@ def run(self): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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/ @@ -313,10 +307,8 @@ def run(self, **kwargs): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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..b65958f02 100644 --- a/daliuge-engine/dlg/apps/pyfunc.py +++ b/daliuge-engine/dlg/apps/pyfunc.py @@ -116,10 +116,8 @@ def import_using_code(code): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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..243759c1e 100644 --- a/daliuge-engine/dlg/apps/scp.py +++ b/daliuge-engine/dlg/apps/scp.py @@ -54,10 +54,8 @@ # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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..1b80fe161 100644 --- a/daliuge-engine/dlg/apps/simple.py +++ b/daliuge-engine/dlg/apps/simple.py @@ -79,10 +79,8 @@ def run(self): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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 @@ -117,7 +115,7 @@ def run(self): # @param tag daliuge # @param[in] cparam/appclass Application Class/dlg.apps.simple.CopyApp/String/readonly/False/ # \~English Application class -# @param[in] param/bufsize buffer size/65536/Integer/readwrite/ +# @param[in] cparam/bufsize buffer size/65536/Integer/readwrite/False/ # \~English Application class # @param[in] cparam/execution_time Execution Time/5/Float/readonly/False/ # \~English Estimated execution time @@ -125,10 +123,8 @@ def run(self): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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 @@ -180,10 +176,8 @@ def copyRecursive(self, inputDrop): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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 @@ -220,10 +214,8 @@ def run(self): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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/ @@ -306,10 +298,8 @@ def _getArray(self): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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/ @@ -391,12 +381,24 @@ def averageArray(self): ## # @brief GenericNpyGatherApp # @details A BarrierAppDrop that combines one or more inputs using cummulative operations. +# @par EAGLE_START # @param category PythonApp -# @param[in] param/appclass Application Class/dlg.apps.simple.GenericNpyGatherApp/String/readonly/ +# @param tag daliuge +# @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 rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed +# @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) @@ -494,10 +496,8 @@ def combine_inputs(self): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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/ @@ -559,10 +559,8 @@ def run(self): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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/ @@ -621,10 +619,8 @@ def run(self): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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/ @@ -692,10 +688,8 @@ def run(self): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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/ @@ -783,10 +777,8 @@ def condition(self): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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..f08d9f187 100644 --- a/daliuge-engine/dlg/apps/socket_listener.py +++ b/daliuge-engine/dlg/apps/socket_listener.py @@ -65,10 +65,8 @@ # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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..61b763756 100644 --- a/daliuge-engine/dlg/drop.py +++ b/daliuge-engine/dlg/drop.py @@ -2676,10 +2676,8 @@ def initialize(self, **kwargs): # \~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_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/input_error_threshold "Input error rate (%)"/0/Integer/readwrite/False/ +# \~English the allowed failure rate of the inputs (in percent), before this component goes to ERROR state and is not executed # @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/tools/xml2palette/xml2palette.py b/tools/xml2palette/xml2palette.py index 8e979dce8..fc2076456 100644 --- a/tools/xml2palette/xml2palette.py +++ b/tools/xml2palette/xml2palette.py @@ -739,7 +739,7 @@ def process_compounddef(compounddef): if __name__ == "__main__": - logging.basicConfig(format="%(asctime)s - %(message)s", datefmt="%d-%b-%y %H:%M:%S") + logging.basicConfig(format="%(asctime)s - %(message)s", datefmt="%d-%b-%y %H:%M:%S", level = logging.INFO) (inputdir, tag, outputfile) = get_options_from_command_line(sys.argv[1:]) @@ -816,6 +816,7 @@ def process_compounddef(compounddef): # if the node tag matches the command line tag, or no tag was specified on the command line, add the node to the list to output if n["tag"] == tag or tag == "": + logging.info("Adding component: " + n["text"]) nodes.append(n) # check if gitrepo and version params were found and cache the values