diff --git a/source/tests/pt/model/test_model.py b/source/tests/pt/model/test_model.py index 69ec88f5d7..82aa88dd6f 100644 --- a/source/tests/pt/model/test_model.py +++ b/source/tests/pt/model/test_model.py @@ -276,14 +276,7 @@ def test_consistency(self): my_ds = DpLoaderSet( self.systems, self.batch_size, - model_params={ - "descriptor": { - "type": "se_e2_a", - "sel": self.sel, - "rcut": self.rcut, - }, - "type_map": self.type_map, - }, + self.type_map ) my_ds.add_data_requirement(energy_data_requirement) my_model = get_model( diff --git a/source/tests/pt/model/test_saveload_dpa1.py b/source/tests/pt/model/test_saveload_dpa1.py index 408afbef43..04f6ee1b13 100644 --- a/source/tests/pt/model/test_saveload_dpa1.py +++ b/source/tests/pt/model/test_saveload_dpa1.py @@ -49,14 +49,7 @@ def get_dataset(config): dataset = DpLoaderSet( systems, batch_size, - model_params={ - "descriptor": { - "type": "dpa1", - "sel": sel, - "rcut": rcut, - }, - "type_map": type_map, - }, + type_map ) data_stat_nbatch = model_config.get("data_stat_nbatch", 10) sampled = make_stat_input(dataset.systems, dataset.dataloaders, data_stat_nbatch) diff --git a/source/tests/pt/model/test_saveload_se_e2_a.py b/source/tests/pt/model/test_saveload_se_e2_a.py index 382f119c30..f0119128d7 100644 --- a/source/tests/pt/model/test_saveload_se_e2_a.py +++ b/source/tests/pt/model/test_saveload_se_e2_a.py @@ -49,14 +49,7 @@ def get_dataset(config): dataset = DpLoaderSet( systems, batch_size, - model_params={ - "descriptor": { - "type": "se_e2_a", - "sel": sel, - "rcut": rcut, - }, - "type_map": type_map, - }, + type_map ) data_stat_nbatch = model_config.get("data_stat_nbatch", 10) sampled = make_stat_input(dataset.systems, dataset.dataloaders, data_stat_nbatch) diff --git a/source/tests/pt/test_sampler.py b/source/tests/pt/test_sampler.py index 25980cc144..4f1091c936 100644 --- a/source/tests/pt/test_sampler.py +++ b/source/tests/pt/test_sampler.py @@ -46,14 +46,7 @@ def setUp(self): self.my_dataset = DpLoaderSet( self.systems, self.batch_size, - model_params={ - "descriptor": { - "type": "se_e2_a", - "sel": self.sel, - "rcut": self.rcut, - }, - "type_map": model_config["type_map"], - }, + model_config["type_map"], seed=10, shuffle=False, ) diff --git a/source/tests/pt/test_stat.py b/source/tests/pt/test_stat.py index e69caad502..51ca903bc2 100644 --- a/source/tests/pt/test_stat.py +++ b/source/tests/pt/test_stat.py @@ -137,14 +137,7 @@ def setUp(self): self.my_dataset = DpLoaderSet( self.systems, self.batch_size, - model_params={ - "descriptor": { - "type": "se_e2_a", - "sel": self.sel, - "rcut": self.rcut, - }, - "type_map": model_config["type_map"], - }, + model_config["type_map"], seed=10, ) self.filter_neuron = model_config["descriptor"]["neuron"]