From: Jean-Philippe ARGAUD Date: Fri, 3 May 2024 11:39:03 +0000 (+0200) Subject: Documentation corrections and code performance update X-Git-Tag: V9_13_0a1~11 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=78f1dffa0e87078166d295d249c0e74173e94ff7;p=modules%2Fadao.git Documentation corrections and code performance update --- diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py index 1e3c79f..ebb23e8 100644 --- a/bin/AdaoCatalogGenerator.py +++ b/bin/AdaoCatalogGenerator.py @@ -174,7 +174,7 @@ def F_{data_name}(statut, fv=NoCheckInNS) : return FACT( SCRIPTWITHONEFUNCTION_FILE = SIMP(statut = "o", typ = "FichierNoAbs", validators=[OnlyStr(), FileExtVal('py'), FunctionVal(DirectOperatorInNS)], fr="En attente d'un nom de fichier script, avec ou sans le chemin complet pour le trouver, contenant en variable interne une seule fonction de calcul nommée DirectOperator", ang="Waiting for a script file name, with or without the full path to find it, containing as internal variable only one function named DirectOperator"), DifferentialIncrement = SIMP(statut="o", typ = "R", val_min=0, val_max=1, defaut=0.01, fr="Incrément de la perturbation dX pour calculer la dérivée, construite en multipliant X par l'incrément en évitant les valeurs nulles", ang="Increment of dX perturbation to calculate the derivative, build multiplying X by the increment avoiding null values"), CenteredFiniteDifference = SIMP(statut="o", typ = "I", into=(0, 1), defaut=0, fr="Formulation centrée (1) ou décentrée (0) pour la méthode des différences finies", ang="Centered (1) or uncentered (0) formulation for the finite differences method"), - EnableMultiProcessing = SIMP(statut="f", typ = "I", into=(0, 1), defaut=0, fr="Calculs élémentaires effectués en séquentiel (0) ou en parallèle (1) dans la méthode des différences finies", ang="Elementary calculations done sequentially (0) or in parallel (1) in the finite differences method"), + EnableWiseParallelism = SIMP(statut="f", typ = "I", into=(0, 1), defaut=0, fr="Calculs élémentaires effectués en séquentiel (0) ou en parallèle (1) dans la méthode des différences finies", ang="Elementary calculations done sequentially (0) or in parallel (1) in the finite differences method"), NumberOfProcesses = SIMP(statut="f", typ = "I", val_min=0, defaut=0, fr="Nombre de processus parallèles, 0 pour un contrôle automatique", ang="Number of parallel processes, 0 for automatic control"), ), SCRIPTWITHSWITCH_DATA = BLOC ( condition = " FROM in ( 'ScriptWithSwitch', ) ", diff --git a/doc/en/advanced.rst b/doc/en/advanced.rst index 4af91d7..86f8159 100644 --- a/doc/en/advanced.rst +++ b/doc/en/advanced.rst @@ -442,7 +442,7 @@ if these variables are not printed). Accelerating numerical derivatives calculations by using a parallel mode ------------------------------------------------------------------------ -.. index:: single: EnableMultiProcessing +.. index:: single: EnableWiseParallelism .. index:: single: NumberOfProcesses When setting an operator, as described in @@ -456,11 +456,11 @@ vector. This are these calls that can potentially be executed in parallel. Under some conditions (described right after), it is then possible to accelerate the numerical derivatives calculations by using a parallel mode for the finite differences approximation. When setting up an ADAO case, it is done -by adding the optional keyword "*EnableMultiProcessing*", set to "1" or +by adding the optional keyword "*EnableWiseParallelism*", set to "1" or "*True*". This keyword is included in the "*SCRIPTWITHONEFUNCTION*" command in the operator definition by graphical interface, or in the "*Parameters*" accompanying the command "*OneFunction*" by textual interaface. By default, -this parallel mode is disabled ("*EnableMultiProcessing=0*"). The parallel mode +this parallel mode is disabled ("*EnableWiseParallelism=0*"). The parallel mode will only use local resources (both multi-cores or multi-processors) of the computer on which execution is running, requiring by default as many resources as available. If necessary, one can reduce the available resources by limiting diff --git a/doc/en/bibliography.rst b/doc/en/bibliography.rst index 5fa69a2..66c149c 100644 --- a/doc/en/bibliography.rst +++ b/doc/en/bibliography.rst @@ -91,7 +91,7 @@ exhaustive bibliography. .. [Jazwinski70] Jazwinski A. H., *Stochastic Processes and Filtering Theory*, Academic Press, 1970 -.. [Johnson08] Johnson S. G., *The NLopt nonlinear-optimization package*, http://ab-initio.mit.edu/nlopt +.. [Johnson08] Johnson S. G., *The NLopt nonlinear-optimization package*, http://github.com/stevengj/nlopt .. [Julier95] Julier S., Uhlmann J., Durrant-Whyte H., *A new approach for filtering nonlinear systems*, in: Proceedings of the 1995 American Control Conference, IEEE, 1995 diff --git a/doc/en/images/schema_temporel_sequentiel.png b/doc/en/images/schema_temporel_sequentiel.png index 1d8d26f..345f1bb 100644 Binary files a/doc/en/images/schema_temporel_sequentiel.png and b/doc/en/images/schema_temporel_sequentiel.png differ diff --git a/doc/en/scripts/simple_ParallelFunctionTest.py b/doc/en/scripts/simple_ParallelFunctionTest.py index 7a6d6a8..66e1f5e 100644 --- a/doc/en/scripts/simple_ParallelFunctionTest.py +++ b/doc/en/scripts/simple_ParallelFunctionTest.py @@ -19,7 +19,7 @@ case.setCheckingPoint( Vector = range(30) ) case.setObservationOperator( OneFunction = SomeOperator, Parameters = { - "EnableMultiProcessingInEvaluation":True, + "EnableParallelEvaluations":True, "NumberOfProcesses":5, }, ) diff --git a/doc/en/scripts/simple_ParallelFunctionTest.rst b/doc/en/scripts/simple_ParallelFunctionTest.rst index eb902e9..7c3813b 100644 --- a/doc/en/scripts/simple_ParallelFunctionTest.rst +++ b/doc/en/scripts/simple_ParallelFunctionTest.rst @@ -17,13 +17,12 @@ satisfactory operator, these values should be close to the numerical zero. .. note:: - .. index:: single: EnableMultiProcessingInEvaluation + .. index:: single: EnableParallelEvaluations It can be useful to make sure that the evaluation of the operator is really done in parallel, and for example that there is no forced use of a parallelism acceleration, which would avoid a real parallel test. For this purpose, it is recommended to systematically use the boolean special - parameter "*EnableMultiProcessingInEvaluation*", exclusively reserved for - this purpose, of the operator declaration command. The use of this - parameter is illustrated in this example. It should not be used in any - other case. + parameter "*EnableParallelEvaluations*", exclusively reserved for this + purpose, of the operator declaration command. The use of this parameter is + illustrated in this example. diff --git a/doc/en/snippets/ModuleValidation.rst b/doc/en/snippets/ModuleValidation.rst index 2eef5e5..be79221 100644 --- a/doc/en/snippets/ModuleValidation.rst +++ b/doc/en/snippets/ModuleValidation.rst @@ -17,4 +17,4 @@ purposes only, knowing that, in case of doubt, the SALOME version sheet Scipy, 1.6.0 MatplotLib, 3.3.4 Gnuplot, 1.8 - NLopt, 2.4.2 + NLopt, 2.7.0 diff --git a/doc/en/theory.rst b/doc/en/theory.rst index 028fee8..24b4d2f 100644 --- a/doc/en/theory.rst +++ b/doc/en/theory.rst @@ -810,10 +810,10 @@ follows, particularly appropriate for iterative Kalman filtering algorithms: with **P** the state error covariance and *t* the discrete iterative time. In this scheme, the analysis **(x,P)** is obtained by means of the "*correction*" -by observing the "*prediction*" of the previous state. An another way to -understand data assimilation in dynamics, in the space of measured states and -measured observations, leads to the following representation of a sequential -form of data assimilation: +by observing the "*prediction*" of the previous state. Another way of +understanding data assimilation in dynamics, by observing the states in the +measurement space, is to represent the same sequential assimilation process as +in the previous figure in the following form: .. _schema_d_AD_sequentiel: .. figure:: images/schema_temporel_sequentiel.png diff --git a/doc/en/tui.rst b/doc/en/tui.rst index 3cef44a..0cda027 100644 --- a/doc/en/tui.rst +++ b/doc/en/tui.rst @@ -458,13 +458,13 @@ The available commands are: "*Script*" keyword, the operator is of type "*Matrix*", "*OneFunction*" or "*ThreeFunctions*" according to whether one of these variables is positioned to "*True*". The control parameters of the adjoint numerical - approximation, in the "*OneFunction*"case, can be given by a dictionary + approximation, in the "*OneFunction*" case, can be given by a dictionary through the "*Parameters*" keyword. Potential entries of this dictionary - are "*DifferentialIncrement*", "*CenteredFiniteDifference*" (similar to the - one of graphical interface). If the operator requires some complementary - fixed arguments in addition to the state :math:`\mathbf{x}`, they can be - given through the variable "*ExtraArguments*" as a named parameters - dictionary. + are "*DifferentialIncrement*", "*CenteredFiniteDifference*", + "*EnableWiseParallelism*", "*NumberOfProcesses*" (similar to the one of + graphical interface). If the operator requires some complementary fixed + arguments in addition to the state :math:`\mathbf{x}`, they can be given + through the variable "*ExtraArguments*" as a named parameters dictionary. .. index:: single: Observation .. index:: single: setObservation @@ -513,11 +513,11 @@ The available commands are: and will be considered as a vector. The control parameters of the adjoint numerical approximation, in the "*OneFunction*"case, can be given by a dictionary through the "*Parameters*" keyword. Potential entries of this - dictionary are "*DifferentialIncrement*", "*CenteredFiniteDifference*" - (similar to the one of graphical interface). If the operator requires some - complementary fixed arguments in addition to the state :math:`\mathbf{x}`, - they can be given through the variable "*ExtraArguments*" as a named - parameters dictionary. + dictionary are "*DifferentialIncrement*", "*CenteredFiniteDifference*", + "*EnableWiseParallelism*", "*NumberOfProcesses*" (similar to the one of + graphical interface). If the operator requires some complementary fixed + arguments in addition to the state :math:`\mathbf{x}`, they can be given + through the variable "*ExtraArguments*" as a named parameters dictionary. Setting the calculation, outputs, etc. ++++++++++++++++++++++++++++++++++++++ diff --git a/doc/fr/advanced.rst b/doc/fr/advanced.rst index 19cbc15..1c24c6a 100644 --- a/doc/fr/advanced.rst +++ b/doc/fr/advanced.rst @@ -478,7 +478,7 @@ coûte du temps ou de la mémoire, quel que soit le niveau de surveillance chois Accélérer les calculs de dérivées numériques en utilisant un mode parallèle --------------------------------------------------------------------------- -.. index:: single: EnableMultiProcessing +.. index:: single: EnableWiseParallelism .. index:: single: NumberOfProcesses Lors de la définition d'un opérateur, comme décrit dans le chapitre des @@ -493,12 +493,12 @@ potentiellement exécutés en parallèle. Sous certaines conditions (décrites juste après), il est possible d'accélérer les calculs de dérivées numériques en utilisant un mode parallèle pour l'approximation par différences finies. Lors de la définition d'un cas ADAO, -c'est effectué en ajoutant le mot-clé optionnel "*EnableMultiProcessing*", mis +c'est effectué en ajoutant le mot-clé optionnel "*EnableWiseParallelism*", mis à "*1*" ou à "*True*". Ce mot-clé est inclus à la commande "*SCRIPTWITHONEFUNCTION*" dans la définition de l'opérateur par interface graphique, ou aux "*Parameters*" accompagnant la commande "*OneFunction*" par interface textuelle. Par défaut, ce mode parallèle est désactivé -("*EnableMultiProcessing=0*"). Le mode parallèle utilise uniquement des +("*EnableWiseParallelism=0*"). Le mode parallèle utilise uniquement des ressources locales (à la fois multi-coeurs ou multi-processeurs) de l'ordinateur sur lequel l'exécution est en train de se dérouler, demandant par défaut autant de ressources que disponible. Si nécessaire, on peut réduire les diff --git a/doc/fr/bibliography.rst b/doc/fr/bibliography.rst index 5115f61..a4a25d9 100644 --- a/doc/fr/bibliography.rst +++ b/doc/fr/bibliography.rst @@ -91,7 +91,7 @@ néanmoins d'intention de constituer une bibliographie exhaustive. .. [Jazwinski70] Jazwinski A. H., *Stochastic Processes and Filtering Theory*, Academic Press, 1970 -.. [Johnson08] Johnson S. G., *The NLopt nonlinear-optimization package*, http://ab-initio.mit.edu/nlopt +.. [Johnson08] Johnson S. G., *The NLopt nonlinear-optimization package*, http://github.com/stevengj/nlopt .. [Julier95] Julier S., Uhlmann J., Durrant-Whyte H., *A new approach for filtering nonlinear systems*, in: Proceedings of the 1995 American Control Conference, IEEE, 1995 diff --git a/doc/fr/images/schema_temporel_sequentiel.png b/doc/fr/images/schema_temporel_sequentiel.png index 1d402de..f7035d9 100644 Binary files a/doc/fr/images/schema_temporel_sequentiel.png and b/doc/fr/images/schema_temporel_sequentiel.png differ diff --git a/doc/fr/scripts/simple_ParallelFunctionTest.py b/doc/fr/scripts/simple_ParallelFunctionTest.py index 7a6d6a8..66e1f5e 100644 --- a/doc/fr/scripts/simple_ParallelFunctionTest.py +++ b/doc/fr/scripts/simple_ParallelFunctionTest.py @@ -19,7 +19,7 @@ case.setCheckingPoint( Vector = range(30) ) case.setObservationOperator( OneFunction = SomeOperator, Parameters = { - "EnableMultiProcessingInEvaluation":True, + "EnableParallelEvaluations":True, "NumberOfProcesses":5, }, ) diff --git a/doc/fr/scripts/simple_ParallelFunctionTest.rst b/doc/fr/scripts/simple_ParallelFunctionTest.rst index 8548be4..e3da6a8 100644 --- a/doc/fr/scripts/simple_ParallelFunctionTest.rst +++ b/doc/fr/scripts/simple_ParallelFunctionTest.rst @@ -18,13 +18,13 @@ opérateur satisfaisant, ces valeurs doivent être proches du zéro numérique. .. note:: - .. index:: single: EnableMultiProcessingInEvaluation + .. index:: single: EnableParallelEvaluations Il peut être utile de s'assurer que l'évaluation de l'opérateur est réalisée réellement en parallèle, et par exemple qu'il n'y a pas d'utilisation forcée d'une accélération du parallélisme, qui éviterait ainsi un véritable test parallèle. Pour cela, il est recommandé d'utiliser systématiquement le paramètre booléen spécial - "*EnableMultiProcessingInEvaluation*", exclusivement réservé à cet usage, - de la commande de déclaration de l'opérateur. L'usage de ce paramètre est - illustré dans l'exemple présent. Il n'est à utiliser dans aucun autre cas. + "*EnableParallelEvaluations*", exclusivement réservé à cet usage, de la + commande de déclaration de l'opérateur. L'usage de ce paramètre est + illustré dans l'exemple présent. diff --git a/doc/fr/snippets/ModuleValidation.rst b/doc/fr/snippets/ModuleValidation.rst index aaa7cbb..d4dcb08 100644 --- a/doc/fr/snippets/ModuleValidation.rst +++ b/doc/fr/snippets/ModuleValidation.rst @@ -17,4 +17,4 @@ uniquement sachant que, en cas de doute, c'est la fiche de version de SALOME Scipy, 1.6.0 MatplotLib, 3.3.4 Gnuplot, 1.8 - NLopt, 2.4.2 + NLopt, 2.7.0 diff --git a/doc/fr/theory.rst b/doc/fr/theory.rst index 8dc1bec..38b416e 100644 --- a/doc/fr/theory.rst +++ b/doc/fr/theory.rst @@ -862,9 +862,9 @@ itératifs de filtrage de type Kalman : avec **P** la covariance d'erreur d'état et *t* le temps itératif discret. Dans ce schéma, l'analyse **(x,P)** est obtenue à travers la "*correction*" par l'observation de la "*prévision*" de l'état précédent. Une autre manière de -comprendre l'assimilation de données dynamique, dans l'espace des états mesurés -et observations mesurées, consiste à représenter la démarche séquentielle -d'assimilation sous la forme suivante : +comprendre l'assimilation de données dynamique, en observant les états dans +l'espace des mesures, consiste à représenter sous la forme suivante la même +démarche séquentielle d'assimilation que dans la figure précédente : .. _schema_d_AD_sequentiel: .. figure:: images/schema_temporel_sequentiel.png diff --git a/doc/fr/tui.rst b/doc/fr/tui.rst index eb42542..d2ddce9 100644 --- a/doc/fr/tui.rst +++ b/doc/fr/tui.rst @@ -479,7 +479,7 @@ Les commandes disponibles sont les suivantes : adjoint, dans le cas "*OneFunction*", peuvent être renseignés par un dictionnaire dans "*Parameters*". Les entrées potentielles de ce dictionnaire de paramètres sont "*DifferentialIncrement*", - "*CenteredFiniteDifference*", "*EnableMultiProcessing*", + "*CenteredFiniteDifference*", "*EnableWiseParallelism*", "*NumberOfProcesses*" (similaires à celles de l'interface graphique). Si l'opérateur nécessite des paramètres fixes complémentaires en plus de l'état :math:`\mathbf{x}`, ils peuvent être fournis par la variable @@ -536,7 +536,7 @@ Les commandes disponibles sont les suivantes : renseignés par un dictionnaire dans "*Parameters*". Les entrées potentielles de ce dictionnaire de paramètres sont "*DifferentialIncrement*", "*CenteredFiniteDifference*", - "*EnableMultiProcessing*", "*NumberOfProcesses*" (similaires à celles de + "*EnableWiseParallelism*", "*NumberOfProcesses*" (similaires à celles de l'interface graphique). Si l'opérateur nécessite des paramètres fixes complémentaires en plus de l'état :math:`\mathbf{x}`, ils peuvent être fournis par la variable "*ExtraArguments*" sous la forme d'un dictionnaire diff --git a/src/daComposant/daCore/BasicObjects.py b/src/daComposant/daCore/BasicObjects.py index f36c2fe..1ece284 100644 --- a/src/daComposant/daCore/BasicObjects.py +++ b/src/daComposant/daCore/BasicObjects.py @@ -453,20 +453,36 @@ class FullOperator(object): __Parameters = {} if (asDict is not None) and isinstance(asDict, dict): __Parameters.update( asDict ) - # Priorité à EnableMultiProcessingInDerivatives=True - if "EnableMultiProcessing" in __Parameters and __Parameters["EnableMultiProcessing"]: - __Parameters["EnableMultiProcessingInDerivatives"] = True - __Parameters["EnableMultiProcessingInEvaluation"] = False - if "EnableMultiProcessingInDerivatives" not in __Parameters: - __Parameters["EnableMultiProcessingInDerivatives"] = False - if __Parameters["EnableMultiProcessingInDerivatives"]: - __Parameters["EnableMultiProcessingInEvaluation"] = False - if "EnableMultiProcessingInEvaluation" not in __Parameters: - __Parameters["EnableMultiProcessingInEvaluation"] = False + # Deprecated parameters + __Parameters = self.__deprecateOpt( + collection = __Parameters, + oldn = "EnableMultiProcessing", + newn = "EnableWiseParallelism", + ) + __Parameters = self.__deprecateOpt( + collection = __Parameters, + oldn = "EnableMultiProcessingInEvaluation", + newn = "EnableParallelEvaluations", + ) + __Parameters = self.__deprecateOpt( + collection = __Parameters, + oldn = "EnableMultiProcessingInDerivatives", + newn = "EnableParallelDerivatives", + ) + # Priorité à EnableParallelDerivatives=True + if "EnableWiseParallelism" in __Parameters and __Parameters["EnableWiseParallelism"]: + __Parameters["EnableParallelDerivatives"] = True + __Parameters["EnableParallelEvaluations"] = False + if "EnableParallelDerivatives" not in __Parameters: + __Parameters["EnableParallelDerivatives"] = False + if __Parameters["EnableParallelDerivatives"]: + __Parameters["EnableParallelEvaluations"] = False + if "EnableParallelEvaluations" not in __Parameters: + __Parameters["EnableParallelEvaluations"] = False if "withIncrement" in __Parameters: # Temporaire __Parameters["DifferentialIncrement"] = __Parameters["withIncrement"] - # Le défaut est équivalent à "ReducedOverallRequirements" - __reduceM, __avoidRC = True, True + # + __reduceM, __avoidRC = True, True # Défaut if performancePrf is not None: if performancePrf == "ReducedAmountOfCalculation": __reduceM, __avoidRC = False, True @@ -474,6 +490,8 @@ class FullOperator(object): __reduceM, __avoidRC = True, False elif performancePrf == "NoSavings": __reduceM, __avoidRC = False, False + # "ReducedOverallRequirements" et tous les autres choix (y.c rien) + # sont équivalents au défaut # if asScript is not None: __Matrix, __Function = None, None @@ -557,7 +575,7 @@ class FullOperator(object): avoidingRedundancy = __Function["withAvoidingRedundancy"], toleranceInRedundancy = __Function["withToleranceInRedundancy"], lengthOfRedundancy = __Function["withLengthOfRedundancy"], - mpEnabled = __Function["EnableMultiProcessingInDerivatives"], + mpEnabled = __Function["EnableParallelDerivatives"], mpWorkers = __Function["NumberOfProcesses"], mfEnabled = __Function["withmfEnabled"], ) @@ -568,7 +586,7 @@ class FullOperator(object): avoidingRedundancy = __avoidRC, inputAsMultiFunction = inputAsMF, extraArguments = self.__extraArgs, - enableMultiProcess = __Parameters["EnableMultiProcessingInEvaluation"] ) + enableMultiProcess = __Parameters["EnableParallelEvaluations"] ) self.__FO["Tangent"] = Operator( name = self.__name + "Tangent", fromMethod = FDA.TangentOperator, @@ -594,7 +612,7 @@ class FullOperator(object): avoidingRedundancy = __avoidRC, inputAsMultiFunction = inputAsMF, extraArguments = self.__extraArgs, - enableMultiProcess = __Parameters["EnableMultiProcessingInEvaluation"] ) + enableMultiProcess = __Parameters["EnableParallelEvaluations"] ) self.__FO["Tangent"] = Operator( name = self.__name + "Tangent", fromMethod = __Function["Tangent"], @@ -620,7 +638,7 @@ class FullOperator(object): reducingMemoryUse = __reduceM, avoidingRedundancy = __avoidRC, inputAsMultiFunction = inputAsMF, - enableMultiProcess = __Parameters["EnableMultiProcessingInEvaluation"] ) + enableMultiProcess = __Parameters["EnableParallelEvaluations"] ) self.__FO["Tangent"] = Operator( name = self.__name + "Tangent", fromMatrix = __matrice, @@ -675,6 +693,16 @@ class FullOperator(object): "x.__str__() <==> str(x)" return str(self.__FO) + def __deprecateOpt(self, collection: dict, oldn: str, newn: str): + if oldn in collection: + collection[newn] = collection[oldn] + del collection[oldn] + __msg = "the parameter \"%s\" used in this case is"%(oldn,) + __msg += " deprecated and has to be replaced by \"%s\"."%(newn,) + __msg += " Please update your code." + warnings.warn(__msg, FutureWarning, stacklevel=50) + return collection + # ============================================================================== class Algorithm(object): """ diff --git a/src/daComposant/daCore/Interfaces.py b/src/daComposant/daCore/Interfaces.py index a901e77..b2a2f82 100644 --- a/src/daComposant/daCore/Interfaces.py +++ b/src/daComposant/daCore/Interfaces.py @@ -70,11 +70,12 @@ class GenericCaseViewer(object): def _initialize(self, __multilines): "Permet des pré-conversions automatiques simples de commandes ou clés" __translation = { - "Study_name" : "StudyName", # noqa: E203 - "Study_repertory" : "StudyRepertory", # noqa: E203 - "MaximumNumberOfSteps": "MaximumNumberOfIterations", - "FunctionDict" : "ScriptWithSwitch", # noqa: E203 - "FUNCTIONDICT_FILE" : "SCRIPTWITHSWITCH_FILE", # noqa: E203 + "Study_name" : "StudyName", # noqa: E203 + "Study_repertory" : "StudyRepertory", # noqa: E203 + "MaximumNumberOfSteps" : "MaximumNumberOfIterations", # noqa: E203 + "EnableMultiProcessing": "EnableWiseParallelism", + "FunctionDict" : "ScriptWithSwitch", # noqa: E203 + "FUNCTIONDICT_FILE" : "SCRIPTWITHSWITCH_FILE", # noqa: E203 } for k, v in __translation.items(): __multilines = __multilines.replace(k, v) diff --git a/src/daEficas/generator_adao.py b/src/daEficas/generator_adao.py index bfeee83..63b5627 100644 --- a/src/daEficas/generator_adao.py +++ b/src/daEficas/generator_adao.py @@ -238,7 +238,9 @@ class AdaoGenerator(PythonGenerator): self.text_da += data_name + "_ScriptWithOneFunction['DifferentialIncrement'] = " + str(float(self.dictMCVal[search_type + "SCRIPTWITHONEFUNCTION_DATA__DifferentialIncrement"])) + "\n" self.text_da += data_name + "_ScriptWithOneFunction['CenteredFiniteDifference'] = " + str(self.dictMCVal[search_type + "SCRIPTWITHONEFUNCTION_DATA__CenteredFiniteDifference"]) + "\n" if search_type + "SCRIPTWITHONEFUNCTION_DATA__EnableMultiProcessing" in self.dictMCVal.keys(): - self.text_da += data_name + "_ScriptWithOneFunction['EnableMultiProcessing'] = " + str(self.dictMCVal[search_type + "SCRIPTWITHONEFUNCTION_DATA__EnableMultiProcessing"]) + "\n" + self.text_da += data_name + "_ScriptWithOneFunction['EnableWiseParallelism'] = " + str(self.dictMCVal[search_type + "SCRIPTWITHONEFUNCTION_DATA__EnableMultiProcessing"]) + "\n" + if search_type + "SCRIPTWITHONEFUNCTION_DATA__EnableWiseParallelism" in self.dictMCVal.keys(): + self.text_da += data_name + "_ScriptWithOneFunction['EnableWiseParallelism'] = " + str(self.dictMCVal[search_type + "SCRIPTWITHONEFUNCTION_DATA__EnableWiseParallelism"]) + "\n" if search_type + "SCRIPTWITHONEFUNCTION_DATA__NumberOfProcesses" in self.dictMCVal.keys(): self.text_da += data_name + "_ScriptWithOneFunction['NumberOfProcesses'] = " + str(self.dictMCVal[search_type + "SCRIPTWITHONEFUNCTION_DATA__NumberOfProcesses"]) + "\n" self.text_da += data_name + "_config = {}\n" diff --git a/src/daEficas/traduitADAOV7_4_0ToV9_13_0.py b/src/daEficas/traduitADAOV7_4_0ToV9_13_0.py index 21b9858..6773bb7 100644 --- a/src/daEficas/traduitADAOV7_4_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV7_4_0ToV9_13_0.py @@ -79,6 +79,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "FunctionDict", "ScriptWithSwitch", fsrc ) fsrc = re.sub( "FUNCTIONDICT_FILE", "SCRIPTWITHSWITCH_FILE", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) diff --git a/src/daEficas/traduitADAOV7_5_0ToV9_13_0.py b/src/daEficas/traduitADAOV7_5_0ToV9_13_0.py index 21b9858..6773bb7 100644 --- a/src/daEficas/traduitADAOV7_5_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV7_5_0ToV9_13_0.py @@ -79,6 +79,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "FunctionDict", "ScriptWithSwitch", fsrc ) fsrc = re.sub( "FUNCTIONDICT_FILE", "SCRIPTWITHSWITCH_FILE", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) diff --git a/src/daEficas/traduitADAOV7_5_1ToV9_13_0.py b/src/daEficas/traduitADAOV7_5_1ToV9_13_0.py index 21b9858..6773bb7 100644 --- a/src/daEficas/traduitADAOV7_5_1ToV9_13_0.py +++ b/src/daEficas/traduitADAOV7_5_1ToV9_13_0.py @@ -79,6 +79,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "FunctionDict", "ScriptWithSwitch", fsrc ) fsrc = re.sub( "FUNCTIONDICT_FILE", "SCRIPTWITHSWITCH_FILE", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) diff --git a/src/daEficas/traduitADAOV7_6_0ToV9_13_0.py b/src/daEficas/traduitADAOV7_6_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV7_6_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV7_6_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV7_7_0ToV9_13_0.py b/src/daEficas/traduitADAOV7_7_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV7_7_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV7_7_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV7_8_0ToV9_13_0.py b/src/daEficas/traduitADAOV7_8_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV7_8_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV7_8_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV8_1_0ToV9_13_0.py b/src/daEficas/traduitADAOV8_1_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV8_1_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV8_1_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV8_2_0ToV9_13_0.py b/src/daEficas/traduitADAOV8_2_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV8_2_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV8_2_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV8_3_0ToV9_13_0.py b/src/daEficas/traduitADAOV8_3_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV8_3_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV8_3_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV8_4_0ToV9_13_0.py b/src/daEficas/traduitADAOV8_4_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV8_4_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV8_4_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV8_5_0ToV9_13_0.py b/src/daEficas/traduitADAOV8_5_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV8_5_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV8_5_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV8_6_0ToV9_13_0.py b/src/daEficas/traduitADAOV8_6_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV8_6_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV8_6_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV9_10_0ToV9_13_0.py b/src/daEficas/traduitADAOV9_10_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV9_10_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV9_10_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV9_11_0ToV9_13_0.py b/src/daEficas/traduitADAOV9_11_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV9_11_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV9_11_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV9_12_0ToV9_13_0.py b/src/daEficas/traduitADAOV9_12_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV9_12_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV9_12_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV9_2_0ToV9_13_0.py b/src/daEficas/traduitADAOV9_2_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV9_2_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV9_2_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV9_3_0ToV9_13_0.py b/src/daEficas/traduitADAOV9_3_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV9_3_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV9_3_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV9_4_0ToV9_13_0.py b/src/daEficas/traduitADAOV9_4_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV9_4_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV9_4_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV9_5_0ToV9_13_0.py b/src/daEficas/traduitADAOV9_5_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV9_5_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV9_5_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV9_6_0ToV9_13_0.py b/src/daEficas/traduitADAOV9_6_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV9_6_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV9_6_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV9_7_0ToV9_13_0.py b/src/daEficas/traduitADAOV9_7_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV9_7_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV9_7_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV9_8_0ToV9_13_0.py b/src/daEficas/traduitADAOV9_8_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV9_8_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV9_8_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOV9_9_0ToV9_13_0.py b/src/daEficas/traduitADAOV9_9_0ToV9_13_0.py index 7893c4c..a3bc271 100644 --- a/src/daEficas/traduitADAOV9_9_0ToV9_13_0.py +++ b/src/daEficas/traduitADAOV9_9_0ToV9_13_0.py @@ -61,6 +61,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) # diff --git a/src/daEficas/traduitADAOsansToV9_13_0.py b/src/daEficas/traduitADAOsansToV9_13_0.py index 21b9858..6773bb7 100644 --- a/src/daEficas/traduitADAOsansToV9_13_0.py +++ b/src/daEficas/traduitADAOsansToV9_13_0.py @@ -79,6 +79,7 @@ def traduc(infile=None,outfile=None,texte=None,flog=None): # ========================================================================== fsrc = jdc.getSource() fsrc = re.sub( "MaximumNumberOfSteps", "MaximumNumberOfIterations", fsrc ) + fsrc = re.sub( "EnableMultiProcessing", "EnableWiseParallelism", fsrc ) fsrc = re.sub( "FunctionDict", "ScriptWithSwitch", fsrc ) fsrc = re.sub( "FUNCTIONDICT_FILE", "SCRIPTWITHSWITCH_FILE", fsrc ) fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) diff --git a/src/daSalome/daYacsSchemaCreator/methods.py b/src/daSalome/daYacsSchemaCreator/methods.py index ae9f80a..dce1356 100644 --- a/src/daSalome/daYacsSchemaCreator/methods.py +++ b/src/daSalome/daYacsSchemaCreator/methods.py @@ -682,6 +682,8 @@ def create_yacs_proc(study_config): node_script += """ centeredDF = %s,\n"""%str(ScriptWithOneFunction['CenteredFiniteDifference']) if 'EnableMultiProcessing' in list(ScriptWithOneFunction.keys()): node_script += """ mpEnabled = %s,\n"""%str(ScriptWithOneFunction['EnableMultiProcessing']) + if 'EnableWiseParallelism' in list(ScriptWithOneFunction.keys()): + node_script += """ mpEnabled = %s,\n"""%str(ScriptWithOneFunction['EnableWiseParallelism']) if 'NumberOfProcesses' in list(ScriptWithOneFunction.keys()): node_script += """ mpWorkers = %s,\n"""%str(ScriptWithOneFunction['NumberOfProcesses']) node_script += """ )\n""" @@ -890,6 +892,8 @@ def create_yacs_proc(study_config): node_script += """ centeredDF = %s,\n"""%str(ScriptWithOneFunction['CenteredFiniteDifference']) if 'EnableMultiProcessing' in list(ScriptWithOneFunction.keys()): node_script += """ mpEnabled = %s,\n"""%str(ScriptWithOneFunction['EnableMultiProcessing']) + if 'EnableWiseParallelism' in list(ScriptWithOneFunction.keys()): + node_script += """ mpEnabled = %s,\n"""%str(ScriptWithOneFunction['EnableWiseParallelism']) if 'NumberOfProcesses' in list(ScriptWithOneFunction.keys()): node_script += """ mpWorkers = %s,\n"""%str(ScriptWithOneFunction['NumberOfProcesses']) node_script += """ )\n"""