Update tests to reflect changes

JMGaljaard · Sep 6, 2022 · 92c4a7d · 92c4a7d
1 parent b5e2518
commit 92c4a7d
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 6 deletions.
diff --git a/configs/test/test_experiment.json b/configs/test/test_experiment.json
@@ -27,8 +27,7 @@
          "epoch_save_end_suffix": "end"
       },
       "reproducibility": {
-         "torch_seed": 2053695854357871005,
-         "arrival_seed": 123
+         "seeds": [44]
       }
    }
 }
diff --git a/experiments/test/data_parallel.yaml b/experiments/test/data_parallel.yaml
@@ -1,3 +1,4 @@
+replication: -1
 batch_size: 1
 test_batch_size: 1
 cuda: True

diff --git a/experiments/test/data_parallel_non_default.yaml b/experiments/test/data_parallel_non_default.yaml
@@ -1,3 +1,4 @@
+replication: 2
 batch_size: 1
 test_batch_size: 1
 cuda: True

diff --git a/experiments/test/federated.yaml b/experiments/test/federated.yaml
@@ -1,3 +1,4 @@
+replication: -1
 batch_size: 1
 test_batch_size: 1
 cuda: false

diff --git a/experiments/test/federated_non_default.yaml b/experiments/test/federated_non_default.yaml
@@ -1,3 +1,4 @@
+replication: 2
 batch_size: 1
 test_batch_size: 1
 cuda: true

diff --git a/experiments/test/parsing/data_parallel_parsed.yaml b/experiments/test/parsing/data_parallel_parsed.yaml
@@ -1,3 +1,4 @@
+replication: -1
 batch_size: 500
 test_batch_size: 1000
 cuda: False
@@ -11,5 +12,5 @@ dataset: fashion-mnist
 max_epoch: 44
 learning_rate: 1e3
 learning_rate_decay: 0.0002
-seed: 2053695854357871005
+seed: 2746317213
 loss: MSELoss
diff --git a/experiments/test/parsing/federated_parsed.yaml b/experiments/test/parsing/federated_parsed.yaml
@@ -1,3 +1,4 @@
+replication: -1
 batch_size: 1
 test_batch_size: 1
 cuda: True

diff --git a/fltk/nets/util/reproducability.py b/fltk/nets/util/reproducability.py
@@ -40,7 +40,7 @@ def init_reproducibility(config: Optional[ExecutionConfig] = None, seed: Optiona
 
 
     torch.manual_seed(torch_seed)
-    if config.cuda:
+    if seed or (config and config.cuda):
         torch.cuda.manual_seed_all(torch_seed)
         cuda_reproducible_backend(True)
     np.random.seed(rand_seed)

diff --git a/tests/nets/reproducibility_test.py b/tests/nets/reproducibility_test.py
@@ -30,9 +30,9 @@ class TestReproducibleNet(unittest.TestCase):
             map(lambda x: [x], models)
         )
         def test_reproducible_initialization(self, network_class: Type[torch.nn.Module]): # pylint: disable=missing-function-docstring
-            init_reproducibility()
+            init_reproducibility(seed=42)
             param_1: OrderedDict[str, torch.nn.Module] = network_class().state_dict()
-            init_reproducibility()
+            init_reproducibility(seed=42)
             param_2: OrderedDict[str, torch.nn.Module] = network_class().state_dict()
 
             for key, value in param_1.items():