Skip to content

Commit 407afcf

Browse files
committed
Change training schedule
1 parent 1212bf4 commit 407afcf

File tree

5 files changed

+174
-0
lines changed

5 files changed

+174
-0
lines changed

diploma_thesis/configuration/experiments/jsp/GRAPH-NN/experiments/5 (DQN)/experiment.yml

+28
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,28 @@ marl_dqn_4_flexible_gat: &marl_dqn_4_flexible_gat
209209
- *default_mods
210210
# - 'util/action_selector/sample.yml'
211211

212+
###############################################################################################
213+
214+
dqn_1_flexible_gcn: &dqn_1_flexible_gcn
215+
base_path: 'configuration/experiments/jsp/GRAPH-NN/flexible_machine.yml'
216+
template: '5/flexible_gcn'
217+
mod_dirs:
218+
- 'configuration/mods/machine/mods'
219+
mods:
220+
- 'agent/dqn/ddqn.yml'
221+
- *default_mods
222+
223+
dqn_3_flexible_gcn: &dqn_3_flexible_gcn
224+
base_path: 'configuration/experiments/jsp/GRAPH-NN/flexible_machine.yml'
225+
template: '5/flexible_gcn'
226+
mod_dirs:
227+
- 'configuration/mods/machine/mods'
228+
mods:
229+
- 'agent/dqn/ddqn.yml'
230+
- 'agent/dqn/prioritized.yml'
231+
- 'agent/dqn/dueling.yml'
232+
- *default_mods
233+
# - 'util/action_selector/sample.yml'
212234

213235
###############################################################################################
214236

@@ -327,6 +349,12 @@ task:
327349
- *dqn_1_flexible
328350
# - *marl_dqn_2_flexible
329351
- *dqn_3_flexible
352+
- output_dir: 'Flexible GCN'
353+
machine_agent:
354+
parameters:
355+
- *dqn_1_flexible_gcn
356+
# - *marl_dqn_2_flexible
357+
- *dqn_3_flexible_gcn
330358
# - output_dir: 'Flexible GAT'
331359
# machine_agent:
332360
# parameters:

diploma_thesis/configuration/experiments/jsp/GRAPH-NN/experiments/5 (PPO)/experiment.yml

+23
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,25 @@ ppo_4: &ppo_4
9696
- [ 'util/infrastructure/cuda.yml']
9797
- [ 'util/train_schedule/on_store.yml']
9898

99+
ppo_5: &ppo_5
100+
base_path: 'configuration/experiments/jsp/GRAPH-NN/flexible_machine.yml'
101+
template: '5/flexible_gcn'
102+
mod_dirs:
103+
- ['configuration/mods/machine/mods']
104+
mods:
105+
__factory__:
106+
- [ 'util/optimizer/grad_norm.yml' ]
107+
- [
108+
'__none__',
109+
'agent/ppo/p3or.yml'
110+
]
111+
- [
112+
'__none__',
113+
# 'util/agent/multi_agent.yml'
114+
]
115+
- [ 'util/infrastructure/cuda.yml']
116+
- [ 'util/train_schedule/on_store.yml']
117+
99118
###############################################################################################
100119

101120
reward: &reward
@@ -206,6 +225,10 @@ task:
206225
machine_agent:
207226
parameters:
208227
*ppo_3
228+
- output_dir: 'Flexible GCN'
229+
machine_agent:
230+
parameters:
231+
*ppo_5
209232
# - output_dir: 'Flexible GAT'
210233
# machine_agent:
211234
# parameters:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
encoder:
3+
kind: 'custom'
4+
parameters:
5+
is_homogeneous: True
6+
is_undirected: False
7+
is_local: False
8+
append_target_mask: False
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
2+
layers:
3+
4+
# Actor
5+
6+
- kind: 'graph_model'
7+
parameters:
8+
layers:
9+
- kind: 'layer_norm'
10+
parameters:
11+
signature: 'x -> x'
12+
normalized_shape: 17
13+
- kind: 'linear'
14+
parameters:
15+
dim: 128
16+
activation: 'relu'
17+
signature: 'x -> x'
18+
- kind: 'gcn'
19+
parameters:
20+
in_channels: -1
21+
out_channels: 128
22+
num_layers: 2
23+
normalize: True
24+
improved: True
25+
hidden_channels: 128
26+
- kind: 'mask'
27+
28+
signature: 'graph -> actions_hidden, actions_batch'
29+
30+
- kind: 'layer_norm'
31+
parameters:
32+
signature: 'actions_hidden -> actions_hidden'
33+
normalized_shape: 128
34+
- kind: 'linear'
35+
parameters:
36+
dim: 128
37+
activation: 'relu'
38+
signature: 'actions_hidden -> actions_hidden'
39+
- kind: 'linear'
40+
parameters:
41+
dim: 128
42+
activation: 'relu'
43+
signature: 'actions_hidden -> actions_hidden'
44+
45+
- kind: 'mean_pool'
46+
parameters:
47+
signature: 'actions_hidden, actions_batch -> actions_value'
48+
49+
- kind: 'linear'
50+
parameters:
51+
dim: 128
52+
activation: 'relu'
53+
signature: 'actions_value -> actions_value'
54+
55+
- kind: 'merge_graph'
56+
parameters:
57+
kind: 'concat'
58+
signature: 'actions_batch, actions_hidden, actions_value -> actions_hidden'
59+
60+
- kind: 'linear'
61+
parameters:
62+
dim: 128
63+
activation: 'relu'
64+
signature: 'actions_hidden -> actions_hidden'
65+
66+
- kind: 'linear'
67+
parameters:
68+
dim: 1
69+
activation: 'none'
70+
signature: 'actions_value -> actions_value'
71+
72+
# Critic
73+
74+
- kind: 'graph_model'
75+
parameters:
76+
layers:
77+
- kind: 'gcn'
78+
parameters:
79+
in_channels: -1
80+
out_channels: 128
81+
num_layers: 2
82+
normalize: True
83+
improved: True
84+
hidden_channels: 128
85+
- kind: 'mask'
86+
87+
signature: 'graph -> values_hidden, values_batch'
88+
89+
- kind: 'mean_pool'
90+
parameters:
91+
signature: 'values_hidden, values_batch -> values_hidden'
92+
93+
- kind: 'layer_norm'
94+
parameters:
95+
signature: 'values_hidden -> values_hidden'
96+
normalized_shape: 128
97+
98+
- kind: 'linear'
99+
parameters:
100+
dim: 128
101+
activation: 'relu'
102+
signature: 'values_hidden -> values_hidden'
103+
- kind: 'linear'
104+
parameters:
105+
dim: 128
106+
activation: 'relu'
107+
signature: 'values_hidden -> values_hidden'
108+
109+
- kind: 'output'
110+
parameters:
111+
value: 'values_hidden'
112+
actor_value: 'actions_value'
113+
actions: 'actions_hidden'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
rules: 'all'

0 commit comments

Comments
 (0)