From d4c598e8ffabe8bd1c7a615133586ec5b3c99fc4 Mon Sep 17 00:00:00 2001 From: achiefa Date: Thu, 1 Aug 2024 09:43:12 +0100 Subject: [PATCH] Moving collect over replcias in n3fit_data --- n3fit/src/n3fit/scripts/n3fit_exec.py | 9 +++------ validphys2/src/validphys/n3fit_data.py | 3 ++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/n3fit/src/n3fit/scripts/n3fit_exec.py b/n3fit/src/n3fit/scripts/n3fit_exec.py index 2f600fed12..767768a219 100755 --- a/n3fit/src/n3fit/scripts/n3fit_exec.py +++ b/n3fit/src/n3fit/scripts/n3fit_exec.py @@ -127,18 +127,15 @@ def from_yaml(cls, o, *args, **kwargs): if fps := file_content["fitting"].get("savepseudodata", True): if fps != True: raise TypeError(f"fitting::savepseudodata is neither True nor False ({fps})") - if len(kwargs["environment"].replicas) != 1: + #if len(kwargs["environment"].replicas) != 1: #raise ConfigError( # "Cannot request that multiple replicas are fitted and that " # "pseudodata is saved. Either set `fitting::savepseudodata` " # "to `false` or fit replicas one at a time." #) - training_action = collect(namespace + "training_pseudodata", ("replicas",)) - validation_action = collect(namespace + "validation_pseudodata", ("replicas",)) - else: # take same namespace configuration on the pseudodata_table action. - training_action = namespace + "training_pseudodata" - validation_action = namespace + "validation_pseudodata" + training_action = namespace + "training_pseudodata" + validation_action = namespace + "validation_pseudodata" N3FIT_FIXED_CONFIG['actions_'].extend((training_action, validation_action)) diff --git a/validphys2/src/validphys/n3fit_data.py b/validphys2/src/validphys/n3fit_data.py index 9ad0cf0165..c807f60df4 100644 --- a/validphys2/src/validphys/n3fit_data.py +++ b/validphys2/src/validphys/n3fit_data.py @@ -374,7 +374,8 @@ def replica_nnseed_fitting_data_dict(replica, exps_fitting_data_dict, replica_nn """ return (replica, exps_fitting_data_dict, replica_nnseed) - +replicas_training_pseudodata = collect("training_pseudodata", ("replicas",)) +replicas_validationf_pseudodata = collect("validation_pseudodata", ("replicas",)) replicas_nnseed_fitting_data_dict = collect("replica_nnseed_fitting_data_dict", ("replicas",)) groups_replicas_indexed_make_replica = collect( "indexed_make_replica", ("replicas", "group_dataset_inputs_by_experiment")