From 358009ca2758efe5a300e74a4788c744973ecce2 Mon Sep 17 00:00:00 2001 From: ebattistella Date: Fri, 26 Sep 2025 18:07:55 -0400 Subject: [PATCH 1/3] training defaults --- engine/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/config.py b/engine/config.py index a7a3bad..898e6c1 100644 --- a/engine/config.py +++ b/engine/config.py @@ -119,11 +119,11 @@ TRAIN_DEFAULTS.update({ 'test_mode': False, 'gamma': 0.98, - 'lr': 0.00003, + 'lr': 0.000003, 'epochs': 1, 'n_procs': 8, 'max_episodes': None, # maximum number of episodes to run - 'interval_episodes_to_validation': 500, # number of episodes between model validation runs + 'interval_episodes_to_validation': 30000, # number of episodes between model validation runs 'render_view': "weighted_view", 'load_components': True, 'store_components': True, From ec0a04d87a32250ab81ee07a04da98ca99ffcd51 Mon Sep 17 00:00:00 2001 From: ebattistella Date: Mon, 29 Sep 2025 10:32:51 -0400 Subject: [PATCH 2/3] training selection config --- .../training_selection_config/real_ont.yaml | 167 ++++++++++++++++++ .../training_selection_config/real_short.yaml | 167 ++++++++++++++++++ .../simulated_ont.yaml | 167 ++++++++++++++++++ .../simulated_short.yaml | 167 ++++++++++++++++++ 4 files changed, 668 insertions(+) create mode 100644 config/training_selection_config/real_ont.yaml create mode 100644 config/training_selection_config/real_short.yaml create mode 100644 config/training_selection_config/simulated_ont.yaml create mode 100644 config/training_selection_config/simulated_short.yaml diff --git a/config/training_selection_config/real_ont.yaml b/config/training_selection_config/real_ont.yaml new file mode 100644 index 0000000..5773a95 --- /dev/null +++ b/config/training_selection_config/real_ont.yaml @@ -0,0 +1,167 @@ +Global: + n_nodes: + min: 3 + max: 5000 +real_ont3-9_0-8: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 0 + max: 8 +real_ont3-9_8-12: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 8 + max: 12 +real_ont3-9_12-16: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 12 + max: 16 +real_ont3-9_16: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 16 +real_ont10-49_0-65: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 0 + max: 65 +real_ont10-49_65-114: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 65 + max: 114 +real_ont10-49_114-170: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 114 + max: 170 +real_ont10-49_170: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 170 +real_ont50-99_0-303: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 0 + max: 303 +real_ont50-99_303-382: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 303 + max: 382 +real_ont50-99_382-482: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 382 + max: 482 +real_ont50-99_482: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 482 +real_ont100-199_0-655: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 0 + max: 655 +real_ont100-199_655-827: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 655 + max: 827 +real_ont100-199_827-1074: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 827 + max: 1074 +real_ont100-199_1074: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1074 +real_ont200-499_0-1606: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 0 + max: 1606 +real_ont200-499_1606-2194: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 1606 + max: 2194 +real_ont200-499_2194-2930: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 2194 + max: 2930 +real_ont200-499_2930: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 2930 +real_ont500-5000_0-5001: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 0 + max: 5001 +real_ont500-5000_5001-6841: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 5001 + max: 6841 +real_ont500-5000_6841-10480: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 6841 + max: 10480 +real_ont500-5000_10480: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 10480 +shuffle: False diff --git a/config/training_selection_config/real_short.yaml b/config/training_selection_config/real_short.yaml new file mode 100644 index 0000000..3208a05 --- /dev/null +++ b/config/training_selection_config/real_short.yaml @@ -0,0 +1,167 @@ +Global: + n_nodes: + min: 3 + max: 5000 +real_short3-9_0-9: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 0 + max: 9 +real_short3-9_9-14: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 9 + max: 14 +real_short3-9_14-18: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 14 + max: 18 +real_short3-9_18: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 18 +real_short10-49_0-59: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 0 + max: 59 +real_short10-49_59-101: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 59 + max: 101 +real_short10-49_101-191: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 101 + max: 191 +real_short10-49_191: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 191 +real_short50-99_0-548: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 0 + max: 548 +real_short50-99_548-735: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 548 + max: 735 +real_short50-99_735-990: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 735 + max: 990 +real_short50-99_990: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 990 +real_short100-199_0-1412: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 0 + max: 1412 +real_short100-199_1412-1866: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1412 + max: 1866 +real_short100-199_1866-2485: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1866 + max: 2485 +real_short100-199_2485: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 2485 +real_short200-499_0-3616: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 0 + max: 3616 +real_short200-499_3616-4633: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 3616 + max: 4633 +real_short200-499_4633-6485: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 4633 + max: 6485 +real_short200-499_6485: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 6485 +real_short500-5000_0-11511: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 0 + max: 11511 +real_short500-5000_11511-15636: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 11511 + max: 15636 +real_short500-5000_15636-27715: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 15636 + max: 27715 +real_short500-5000_27715: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 27715 +shuffle: False diff --git a/config/training_selection_config/simulated_ont.yaml b/config/training_selection_config/simulated_ont.yaml new file mode 100644 index 0000000..fe25a96 --- /dev/null +++ b/config/training_selection_config/simulated_ont.yaml @@ -0,0 +1,167 @@ +Global: + n_nodes: + min: 3 + max: 5000 +simu_ont3-9_0-9: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 0 + max: 9 +simu_ont3-9_9-14: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 9 + max: 14 +simu_ont3-9_14-18: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 14 + max: 18 +simu_ont3-9_18: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 18 +simu_ont10-49_0-74: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 0 + max: 74 +simu_ont10-49_74-129: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 74 + max: 129 +simu_ont10-49_129-205: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 129 + max: 205 +simu_ont10-49_205: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 205 +simu_ont50-99_0-428: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 0 + max: 428 +simu_ont50-99_428-565: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 428 + max: 565 +simu_ont50-99_565-710: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 565 + max: 710 +simu_ont50-99_710: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 710 +simu_ont100-199_0-1049: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 0 + max: 1049 +simu_ont100-199_1049-1288: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1049 + max: 1288 +simu_ont100-199_1288-1588: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1288 + max: 1588 +simu_ont100-199_1588: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1588 +simu_ont200-499_0-2355: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 0 + max: 2355 +simu_ont200-499_2355-3002: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 2355 + max: 3002 +simu_ont200-499_3002-3909: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 3002 + max: 3909 +simu_ont200-499_3909: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 3909 +simu_ont500-5000_0-6318: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 0 + max: 6318 +simu_ont500-5000_6318-7873: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 6318 + max: 7873 +simu_ont500-5000_7873-10820: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 7873 + max: 10820 +simu_ont500-5000_10820: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 10820 +shuffle: False diff --git a/config/training_selection_config/simulated_short.yaml b/config/training_selection_config/simulated_short.yaml new file mode 100644 index 0000000..b0fe674 --- /dev/null +++ b/config/training_selection_config/simulated_short.yaml @@ -0,0 +1,167 @@ +Global: + n_nodes: + min: 3 + max: 5000 +simu_short3-9_0-10: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 0 + max: 10 +simu_short3-9_10-14: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 10 + max: 14 +simu_short3-9_14-18: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 14 + max: 18 +simu_short3-9_18: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 18 +simu_short10-49_0-56: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 0 + max: 56 +simu_short10-49_56-94: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 56 + max: 94 +simu_short10-49_94-171: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 94 + max: 171 +simu_short10-49_171: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 171 +simu_short50-99_0-469: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 0 + max: 469 +simu_short50-99_469-624: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 469 + max: 624 +simu_short50-99_624-833: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 624 + max: 833 +simu_short50-99_833: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 833 +simu_short100-199_0-1184: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 0 + max: 1184 +simu_short100-199_1184-1539: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1184 + max: 1539 +simu_short100-199_1539-1998: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1539 + max: 1998 +simu_short100-199_1998: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1998 +simu_short200-499_0-3006: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 0 + max: 3006 +simu_short200-499_3006-3748: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 3006 + max: 3748 +simu_short200-499_3748-4848: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 3748 + max: 4848 +simu_short200-499_4848: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 4848 +simu_short500-5000_0-10010: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 0 + max: 10010 +simu_short500-5000_10010-12975: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 10010 + max: 12975 +simu_short500-5000_12975-19987: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 12975 + max: 19987 +simu_short500-5000_19987: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 19987 +shuffle: False From 3b8717512357bb3188f84fbc6529fe9d3b3055cd Mon Sep 17 00:00:00 2001 From: ebattistella Date: Fri, 3 Oct 2025 17:43:28 -0400 Subject: [PATCH 3/3] training and selection config --- config/finetune_long.v2.yaml | 5 + ...yaml => selection_config_ont_real.v2.yaml} | 48 ++++ ...=> selection_config_ont_simulated.v2.yaml} | 48 ++++ config/selection_config_short_real.v2.yaml | 215 ++++++++++++++++++ .../selection_config_short_simulated.v2.yaml | 215 ++++++++++++++++++ .../training_selection_config/real_short.yaml | 167 -------------- .../simulated_short.yaml | 167 -------------- config/training_short.v2.yaml | 3 + engine/config.py | 4 +- 9 files changed, 536 insertions(+), 336 deletions(-) create mode 100644 config/finetune_long.v2.yaml rename config/{training_selection_config/real_ont.yaml => selection_config_ont_real.v2.yaml} (70%) rename config/{training_selection_config/simulated_ont.yaml => selection_config_ont_simulated.v2.yaml} (70%) create mode 100644 config/selection_config_short_real.v2.yaml create mode 100644 config/selection_config_short_simulated.v2.yaml delete mode 100644 config/training_selection_config/real_short.yaml delete mode 100644 config/training_selection_config/simulated_short.yaml create mode 100644 config/training_short.v2.yaml diff --git a/config/finetune_long.v2.yaml b/config/finetune_long.v2.yaml new file mode 100644 index 0000000..9fbeacd --- /dev/null +++ b/config/finetune_long.v2.yaml @@ -0,0 +1,5 @@ +lr: 0.000003 +interval_episodes_to_validation: 30000 +panel_dataset_train: ['/path/to/ordered/combined/short/dataset'] +panel_dataset_validate: ['/path/short/real/validation', '/path/short/simulated/validation'] +pretrained_model: ['path/short/model'] \ No newline at end of file diff --git a/config/training_selection_config/real_ont.yaml b/config/selection_config_ont_real.v2.yaml similarity index 70% rename from config/training_selection_config/real_ont.yaml rename to config/selection_config_ont_real.v2.yaml index 5773a95..572eaa5 100644 --- a/config/training_selection_config/real_ont.yaml +++ b/config/selection_config_ont_real.v2.yaml @@ -9,6 +9,8 @@ real_ont3-9_0-8: n_edges: min: 0 max: 8 + size_train: 350 + size_validate: 35 real_ont3-9_8-12: n_nodes: min: 3 @@ -16,6 +18,8 @@ real_ont3-9_8-12: n_edges: min: 8 max: 12 + size_train: 350 + size_validate: 35 real_ont3-9_12-16: n_nodes: min: 3 @@ -23,12 +27,16 @@ real_ont3-9_12-16: n_edges: min: 12 max: 16 + size_train: 350 + size_validate: 35 real_ont3-9_16: n_nodes: min: 3 max: 9 n_edges: min: 16 + size_train: 350 + size_validate: 35 real_ont10-49_0-65: n_nodes: min: 10 @@ -36,6 +44,8 @@ real_ont10-49_0-65: n_edges: min: 0 max: 65 + size_train: 1900 + size_validate: 190 real_ont10-49_65-114: n_nodes: min: 10 @@ -43,6 +53,8 @@ real_ont10-49_65-114: n_edges: min: 65 max: 114 + size_train: 1900 + size_validate: 190 real_ont10-49_114-170: n_nodes: min: 10 @@ -50,12 +62,16 @@ real_ont10-49_114-170: n_edges: min: 114 max: 170 + size_train: 1900 + size_validate: 190 real_ont10-49_170: n_nodes: min: 10 max: 49 n_edges: min: 170 + size_train: 1900 + size_validate: 190 real_ont50-99_0-303: n_nodes: min: 50 @@ -63,6 +79,8 @@ real_ont50-99_0-303: n_edges: min: 0 max: 303 + size_train: 1700 + size_validate: 170 real_ont50-99_303-382: n_nodes: min: 50 @@ -70,6 +88,8 @@ real_ont50-99_303-382: n_edges: min: 303 max: 382 + size_train: 1700 + size_validate: 170 real_ont50-99_382-482: n_nodes: min: 50 @@ -77,12 +97,16 @@ real_ont50-99_382-482: n_edges: min: 382 max: 482 + size_train: 1700 + size_validate: 170 real_ont50-99_482: n_nodes: min: 50 max: 99 n_edges: min: 482 + size_train: 1700 + size_validate: 170 real_ont100-199_0-655: n_nodes: min: 100 @@ -90,6 +114,8 @@ real_ont100-199_0-655: n_edges: min: 0 max: 655 + size_train: 2100 + size_validate: 210 real_ont100-199_655-827: n_nodes: min: 100 @@ -97,6 +123,8 @@ real_ont100-199_655-827: n_edges: min: 655 max: 827 + size_train: 2100 + size_validate: 210 real_ont100-199_827-1074: n_nodes: min: 100 @@ -104,12 +132,16 @@ real_ont100-199_827-1074: n_edges: min: 827 max: 1074 + size_train: 2100 + size_validate: 210 real_ont100-199_1074: n_nodes: min: 100 max: 199 n_edges: min: 1074 + size_train: 2100 + size_validate: 210 real_ont200-499_0-1606: n_nodes: min: 200 @@ -117,6 +149,8 @@ real_ont200-499_0-1606: n_edges: min: 0 max: 1606 + size_train: 2000 + size_validate: 200 real_ont200-499_1606-2194: n_nodes: min: 200 @@ -124,6 +158,8 @@ real_ont200-499_1606-2194: n_edges: min: 1606 max: 2194 + size_train: 2000 + size_validate: 200 real_ont200-499_2194-2930: n_nodes: min: 200 @@ -131,12 +167,16 @@ real_ont200-499_2194-2930: n_edges: min: 2194 max: 2930 + size_train: 2000 + size_validate: 200 real_ont200-499_2930: n_nodes: min: 200 max: 499 n_edges: min: 2930 + size_train: 2000 + size_validate: 200 real_ont500-5000_0-5001: n_nodes: min: 500 @@ -144,6 +184,8 @@ real_ont500-5000_0-5001: n_edges: min: 0 max: 5001 + size_train: 1500 + size_validate: 150 real_ont500-5000_5001-6841: n_nodes: min: 500 @@ -151,6 +193,8 @@ real_ont500-5000_5001-6841: n_edges: min: 5001 max: 6841 + size_train: 1500 + size_validate: 150 real_ont500-5000_6841-10480: n_nodes: min: 500 @@ -158,10 +202,14 @@ real_ont500-5000_6841-10480: n_edges: min: 6841 max: 10480 + size_train: 1500 + size_validate: 150 real_ont500-5000_10480: n_nodes: min: 500 max: 5000 n_edges: min: 10480 + size_train: 1500 + size_validate: 150 shuffle: False diff --git a/config/training_selection_config/simulated_ont.yaml b/config/selection_config_ont_simulated.v2.yaml similarity index 70% rename from config/training_selection_config/simulated_ont.yaml rename to config/selection_config_ont_simulated.v2.yaml index fe25a96..747c9b6 100644 --- a/config/training_selection_config/simulated_ont.yaml +++ b/config/selection_config_ont_simulated.v2.yaml @@ -9,6 +9,8 @@ simu_ont3-9_0-9: n_edges: min: 0 max: 9 + size_train: 350 + size_validate: 35 simu_ont3-9_9-14: n_nodes: min: 3 @@ -16,6 +18,8 @@ simu_ont3-9_9-14: n_edges: min: 9 max: 14 + size_train: 350 + size_validate: 35 simu_ont3-9_14-18: n_nodes: min: 3 @@ -23,12 +27,16 @@ simu_ont3-9_14-18: n_edges: min: 14 max: 18 + size_train: 350 + size_validate: 35 simu_ont3-9_18: n_nodes: min: 3 max: 9 n_edges: min: 18 + size_train: 350 + size_validate: 35 simu_ont10-49_0-74: n_nodes: min: 10 @@ -36,6 +44,8 @@ simu_ont10-49_0-74: n_edges: min: 0 max: 74 + size_train: 1900 + size_validate: 190 simu_ont10-49_74-129: n_nodes: min: 10 @@ -43,6 +53,8 @@ simu_ont10-49_74-129: n_edges: min: 74 max: 129 + size_train: 1900 + size_validate: 190 simu_ont10-49_129-205: n_nodes: min: 10 @@ -50,12 +62,16 @@ simu_ont10-49_129-205: n_edges: min: 129 max: 205 + size_train: 1900 + size_validate: 190 simu_ont10-49_205: n_nodes: min: 10 max: 49 n_edges: min: 205 + size_train: 1900 + size_validate: 190 simu_ont50-99_0-428: n_nodes: min: 50 @@ -63,6 +79,8 @@ simu_ont50-99_0-428: n_edges: min: 0 max: 428 + size_train: 1700 + size_validate: 170 simu_ont50-99_428-565: n_nodes: min: 50 @@ -70,6 +88,8 @@ simu_ont50-99_428-565: n_edges: min: 428 max: 565 + size_train: 1700 + size_validate: 170 simu_ont50-99_565-710: n_nodes: min: 50 @@ -77,12 +97,16 @@ simu_ont50-99_565-710: n_edges: min: 565 max: 710 + size_train: 1700 + size_validate: 170 simu_ont50-99_710: n_nodes: min: 50 max: 99 n_edges: min: 710 + size_train: 1700 + size_validate: 170 simu_ont100-199_0-1049: n_nodes: min: 100 @@ -90,6 +114,8 @@ simu_ont100-199_0-1049: n_edges: min: 0 max: 1049 + size_train: 2100 + size_validate: 210 simu_ont100-199_1049-1288: n_nodes: min: 100 @@ -97,6 +123,8 @@ simu_ont100-199_1049-1288: n_edges: min: 1049 max: 1288 + size_train: 2100 + size_validate: 210 simu_ont100-199_1288-1588: n_nodes: min: 100 @@ -104,12 +132,16 @@ simu_ont100-199_1288-1588: n_edges: min: 1288 max: 1588 + size_train: 2100 + size_validate: 210 simu_ont100-199_1588: n_nodes: min: 100 max: 199 n_edges: min: 1588 + size_train: 2100 + size_validate: 210 simu_ont200-499_0-2355: n_nodes: min: 200 @@ -117,6 +149,8 @@ simu_ont200-499_0-2355: n_edges: min: 0 max: 2355 + size_train: 2000 + size_validate: 200 simu_ont200-499_2355-3002: n_nodes: min: 200 @@ -124,6 +158,8 @@ simu_ont200-499_2355-3002: n_edges: min: 2355 max: 3002 + size_train: 2000 + size_validate: 200 simu_ont200-499_3002-3909: n_nodes: min: 200 @@ -131,12 +167,16 @@ simu_ont200-499_3002-3909: n_edges: min: 3002 max: 3909 + size_train: 2000 + size_validate: 200 simu_ont200-499_3909: n_nodes: min: 200 max: 499 n_edges: min: 3909 + size_train: 2000 + size_validate: 200 simu_ont500-5000_0-6318: n_nodes: min: 500 @@ -144,6 +184,8 @@ simu_ont500-5000_0-6318: n_edges: min: 0 max: 6318 + size_train: 1500 + size_validate: 150 simu_ont500-5000_6318-7873: n_nodes: min: 500 @@ -151,6 +193,8 @@ simu_ont500-5000_6318-7873: n_edges: min: 6318 max: 7873 + size_train: 1500 + size_validate: 150 simu_ont500-5000_7873-10820: n_nodes: min: 500 @@ -158,10 +202,14 @@ simu_ont500-5000_7873-10820: n_edges: min: 7873 max: 10820 + size_train: 1500 + size_validate: 150 simu_ont500-5000_10820: n_nodes: min: 500 max: 5000 n_edges: min: 10820 + size_train: 1500 + size_validate: 150 shuffle: False diff --git a/config/selection_config_short_real.v2.yaml b/config/selection_config_short_real.v2.yaml new file mode 100644 index 0000000..572eaa5 --- /dev/null +++ b/config/selection_config_short_real.v2.yaml @@ -0,0 +1,215 @@ +Global: + n_nodes: + min: 3 + max: 5000 +real_ont3-9_0-8: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 0 + max: 8 + size_train: 350 + size_validate: 35 +real_ont3-9_8-12: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 8 + max: 12 + size_train: 350 + size_validate: 35 +real_ont3-9_12-16: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 12 + max: 16 + size_train: 350 + size_validate: 35 +real_ont3-9_16: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 16 + size_train: 350 + size_validate: 35 +real_ont10-49_0-65: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 0 + max: 65 + size_train: 1900 + size_validate: 190 +real_ont10-49_65-114: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 65 + max: 114 + size_train: 1900 + size_validate: 190 +real_ont10-49_114-170: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 114 + max: 170 + size_train: 1900 + size_validate: 190 +real_ont10-49_170: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 170 + size_train: 1900 + size_validate: 190 +real_ont50-99_0-303: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 0 + max: 303 + size_train: 1700 + size_validate: 170 +real_ont50-99_303-382: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 303 + max: 382 + size_train: 1700 + size_validate: 170 +real_ont50-99_382-482: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 382 + max: 482 + size_train: 1700 + size_validate: 170 +real_ont50-99_482: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 482 + size_train: 1700 + size_validate: 170 +real_ont100-199_0-655: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 0 + max: 655 + size_train: 2100 + size_validate: 210 +real_ont100-199_655-827: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 655 + max: 827 + size_train: 2100 + size_validate: 210 +real_ont100-199_827-1074: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 827 + max: 1074 + size_train: 2100 + size_validate: 210 +real_ont100-199_1074: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1074 + size_train: 2100 + size_validate: 210 +real_ont200-499_0-1606: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 0 + max: 1606 + size_train: 2000 + size_validate: 200 +real_ont200-499_1606-2194: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 1606 + max: 2194 + size_train: 2000 + size_validate: 200 +real_ont200-499_2194-2930: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 2194 + max: 2930 + size_train: 2000 + size_validate: 200 +real_ont200-499_2930: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 2930 + size_train: 2000 + size_validate: 200 +real_ont500-5000_0-5001: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 0 + max: 5001 + size_train: 1500 + size_validate: 150 +real_ont500-5000_5001-6841: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 5001 + max: 6841 + size_train: 1500 + size_validate: 150 +real_ont500-5000_6841-10480: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 6841 + max: 10480 + size_train: 1500 + size_validate: 150 +real_ont500-5000_10480: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 10480 + size_train: 1500 + size_validate: 150 +shuffle: False diff --git a/config/selection_config_short_simulated.v2.yaml b/config/selection_config_short_simulated.v2.yaml new file mode 100644 index 0000000..747c9b6 --- /dev/null +++ b/config/selection_config_short_simulated.v2.yaml @@ -0,0 +1,215 @@ +Global: + n_nodes: + min: 3 + max: 5000 +simu_ont3-9_0-9: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 0 + max: 9 + size_train: 350 + size_validate: 35 +simu_ont3-9_9-14: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 9 + max: 14 + size_train: 350 + size_validate: 35 +simu_ont3-9_14-18: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 14 + max: 18 + size_train: 350 + size_validate: 35 +simu_ont3-9_18: + n_nodes: + min: 3 + max: 9 + n_edges: + min: 18 + size_train: 350 + size_validate: 35 +simu_ont10-49_0-74: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 0 + max: 74 + size_train: 1900 + size_validate: 190 +simu_ont10-49_74-129: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 74 + max: 129 + size_train: 1900 + size_validate: 190 +simu_ont10-49_129-205: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 129 + max: 205 + size_train: 1900 + size_validate: 190 +simu_ont10-49_205: + n_nodes: + min: 10 + max: 49 + n_edges: + min: 205 + size_train: 1900 + size_validate: 190 +simu_ont50-99_0-428: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 0 + max: 428 + size_train: 1700 + size_validate: 170 +simu_ont50-99_428-565: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 428 + max: 565 + size_train: 1700 + size_validate: 170 +simu_ont50-99_565-710: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 565 + max: 710 + size_train: 1700 + size_validate: 170 +simu_ont50-99_710: + n_nodes: + min: 50 + max: 99 + n_edges: + min: 710 + size_train: 1700 + size_validate: 170 +simu_ont100-199_0-1049: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 0 + max: 1049 + size_train: 2100 + size_validate: 210 +simu_ont100-199_1049-1288: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1049 + max: 1288 + size_train: 2100 + size_validate: 210 +simu_ont100-199_1288-1588: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1288 + max: 1588 + size_train: 2100 + size_validate: 210 +simu_ont100-199_1588: + n_nodes: + min: 100 + max: 199 + n_edges: + min: 1588 + size_train: 2100 + size_validate: 210 +simu_ont200-499_0-2355: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 0 + max: 2355 + size_train: 2000 + size_validate: 200 +simu_ont200-499_2355-3002: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 2355 + max: 3002 + size_train: 2000 + size_validate: 200 +simu_ont200-499_3002-3909: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 3002 + max: 3909 + size_train: 2000 + size_validate: 200 +simu_ont200-499_3909: + n_nodes: + min: 200 + max: 499 + n_edges: + min: 3909 + size_train: 2000 + size_validate: 200 +simu_ont500-5000_0-6318: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 0 + max: 6318 + size_train: 1500 + size_validate: 150 +simu_ont500-5000_6318-7873: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 6318 + max: 7873 + size_train: 1500 + size_validate: 150 +simu_ont500-5000_7873-10820: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 7873 + max: 10820 + size_train: 1500 + size_validate: 150 +simu_ont500-5000_10820: + n_nodes: + min: 500 + max: 5000 + n_edges: + min: 10820 + size_train: 1500 + size_validate: 150 +shuffle: False diff --git a/config/training_selection_config/real_short.yaml b/config/training_selection_config/real_short.yaml deleted file mode 100644 index 3208a05..0000000 --- a/config/training_selection_config/real_short.yaml +++ /dev/null @@ -1,167 +0,0 @@ -Global: - n_nodes: - min: 3 - max: 5000 -real_short3-9_0-9: - n_nodes: - min: 3 - max: 9 - n_edges: - min: 0 - max: 9 -real_short3-9_9-14: - n_nodes: - min: 3 - max: 9 - n_edges: - min: 9 - max: 14 -real_short3-9_14-18: - n_nodes: - min: 3 - max: 9 - n_edges: - min: 14 - max: 18 -real_short3-9_18: - n_nodes: - min: 3 - max: 9 - n_edges: - min: 18 -real_short10-49_0-59: - n_nodes: - min: 10 - max: 49 - n_edges: - min: 0 - max: 59 -real_short10-49_59-101: - n_nodes: - min: 10 - max: 49 - n_edges: - min: 59 - max: 101 -real_short10-49_101-191: - n_nodes: - min: 10 - max: 49 - n_edges: - min: 101 - max: 191 -real_short10-49_191: - n_nodes: - min: 10 - max: 49 - n_edges: - min: 191 -real_short50-99_0-548: - n_nodes: - min: 50 - max: 99 - n_edges: - min: 0 - max: 548 -real_short50-99_548-735: - n_nodes: - min: 50 - max: 99 - n_edges: - min: 548 - max: 735 -real_short50-99_735-990: - n_nodes: - min: 50 - max: 99 - n_edges: - min: 735 - max: 990 -real_short50-99_990: - n_nodes: - min: 50 - max: 99 - n_edges: - min: 990 -real_short100-199_0-1412: - n_nodes: - min: 100 - max: 199 - n_edges: - min: 0 - max: 1412 -real_short100-199_1412-1866: - n_nodes: - min: 100 - max: 199 - n_edges: - min: 1412 - max: 1866 -real_short100-199_1866-2485: - n_nodes: - min: 100 - max: 199 - n_edges: - min: 1866 - max: 2485 -real_short100-199_2485: - n_nodes: - min: 100 - max: 199 - n_edges: - min: 2485 -real_short200-499_0-3616: - n_nodes: - min: 200 - max: 499 - n_edges: - min: 0 - max: 3616 -real_short200-499_3616-4633: - n_nodes: - min: 200 - max: 499 - n_edges: - min: 3616 - max: 4633 -real_short200-499_4633-6485: - n_nodes: - min: 200 - max: 499 - n_edges: - min: 4633 - max: 6485 -real_short200-499_6485: - n_nodes: - min: 200 - max: 499 - n_edges: - min: 6485 -real_short500-5000_0-11511: - n_nodes: - min: 500 - max: 5000 - n_edges: - min: 0 - max: 11511 -real_short500-5000_11511-15636: - n_nodes: - min: 500 - max: 5000 - n_edges: - min: 11511 - max: 15636 -real_short500-5000_15636-27715: - n_nodes: - min: 500 - max: 5000 - n_edges: - min: 15636 - max: 27715 -real_short500-5000_27715: - n_nodes: - min: 500 - max: 5000 - n_edges: - min: 27715 -shuffle: False diff --git a/config/training_selection_config/simulated_short.yaml b/config/training_selection_config/simulated_short.yaml deleted file mode 100644 index b0fe674..0000000 --- a/config/training_selection_config/simulated_short.yaml +++ /dev/null @@ -1,167 +0,0 @@ -Global: - n_nodes: - min: 3 - max: 5000 -simu_short3-9_0-10: - n_nodes: - min: 3 - max: 9 - n_edges: - min: 0 - max: 10 -simu_short3-9_10-14: - n_nodes: - min: 3 - max: 9 - n_edges: - min: 10 - max: 14 -simu_short3-9_14-18: - n_nodes: - min: 3 - max: 9 - n_edges: - min: 14 - max: 18 -simu_short3-9_18: - n_nodes: - min: 3 - max: 9 - n_edges: - min: 18 -simu_short10-49_0-56: - n_nodes: - min: 10 - max: 49 - n_edges: - min: 0 - max: 56 -simu_short10-49_56-94: - n_nodes: - min: 10 - max: 49 - n_edges: - min: 56 - max: 94 -simu_short10-49_94-171: - n_nodes: - min: 10 - max: 49 - n_edges: - min: 94 - max: 171 -simu_short10-49_171: - n_nodes: - min: 10 - max: 49 - n_edges: - min: 171 -simu_short50-99_0-469: - n_nodes: - min: 50 - max: 99 - n_edges: - min: 0 - max: 469 -simu_short50-99_469-624: - n_nodes: - min: 50 - max: 99 - n_edges: - min: 469 - max: 624 -simu_short50-99_624-833: - n_nodes: - min: 50 - max: 99 - n_edges: - min: 624 - max: 833 -simu_short50-99_833: - n_nodes: - min: 50 - max: 99 - n_edges: - min: 833 -simu_short100-199_0-1184: - n_nodes: - min: 100 - max: 199 - n_edges: - min: 0 - max: 1184 -simu_short100-199_1184-1539: - n_nodes: - min: 100 - max: 199 - n_edges: - min: 1184 - max: 1539 -simu_short100-199_1539-1998: - n_nodes: - min: 100 - max: 199 - n_edges: - min: 1539 - max: 1998 -simu_short100-199_1998: - n_nodes: - min: 100 - max: 199 - n_edges: - min: 1998 -simu_short200-499_0-3006: - n_nodes: - min: 200 - max: 499 - n_edges: - min: 0 - max: 3006 -simu_short200-499_3006-3748: - n_nodes: - min: 200 - max: 499 - n_edges: - min: 3006 - max: 3748 -simu_short200-499_3748-4848: - n_nodes: - min: 200 - max: 499 - n_edges: - min: 3748 - max: 4848 -simu_short200-499_4848: - n_nodes: - min: 200 - max: 499 - n_edges: - min: 4848 -simu_short500-5000_0-10010: - n_nodes: - min: 500 - max: 5000 - n_edges: - min: 0 - max: 10010 -simu_short500-5000_10010-12975: - n_nodes: - min: 500 - max: 5000 - n_edges: - min: 10010 - max: 12975 -simu_short500-5000_12975-19987: - n_nodes: - min: 500 - max: 5000 - n_edges: - min: 12975 - max: 19987 -simu_short500-5000_19987: - n_nodes: - min: 500 - max: 5000 - n_edges: - min: 19987 -shuffle: False diff --git a/config/training_short.v2.yaml b/config/training_short.v2.yaml new file mode 100644 index 0000000..52ff5df --- /dev/null +++ b/config/training_short.v2.yaml @@ -0,0 +1,3 @@ +lr: 0.000003 +panel_dataset_train: ['/path/to/ordered/combined/short/dataset'] +panel_dataset_validate: ['/path/short/real/validation', '/path/short/simulated/validation'] \ No newline at end of file diff --git a/engine/config.py b/engine/config.py index 898e6c1..a7a3bad 100644 --- a/engine/config.py +++ b/engine/config.py @@ -119,11 +119,11 @@ TRAIN_DEFAULTS.update({ 'test_mode': False, 'gamma': 0.98, - 'lr': 0.000003, + 'lr': 0.00003, 'epochs': 1, 'n_procs': 8, 'max_episodes': None, # maximum number of episodes to run - 'interval_episodes_to_validation': 30000, # number of episodes between model validation runs + 'interval_episodes_to_validation': 500, # number of episodes between model validation runs 'render_view': "weighted_view", 'load_components': True, 'store_components': True,