Merge branch 'main' of https://github.com/Kaiyotech/Opti

Kaiyotech · Jul 11, 2023 · 0a22690 · 0a22690
2 parents 39f260d + 07781fd
commit 0a22690
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/learner_gp.py b/learner_gp.py
@@ -154,7 +154,7 @@
         disable_gradient_logging=True,
     )
 
-    alg.load("GP_saves/Opti_1682965527.8770707/Opti_42050/checkpoint.pt")
+    alg.load("GP_saves/Opti_1683132125.3858902/Opti_42240/checkpoint.pt")
 
 
     alg.agent.optimizer.param_groups[0]["lr"] = logger.config.actor_lr

diff --git a/worker_gp.py b/worker_gp.py
@@ -61,9 +61,9 @@
     non_latest_version_prob = [1, 0, 0, 0]  # [0.825, 0.0826, 0.0578, 0.0346]  # this includes past_version and pretrained
     deterministic_streamer = True
     force_old_deterministic = False
-    gamemode_weights = {'1v1': 0.30, '2v2': 0.25, '3v3': 0.45}
+    gamemode_weights = {'1v1': 0, '2v2': 1, '3v3': 0}
     visualize = False
-    simulator = False
+    simulator = True
     batch_mode = True
     team_size = 3
     dynamic_game = True
@@ -167,7 +167,6 @@
                              TimeoutCondition(fps * 300),
                              ],
         reward_function=rew,
-        tick_skip=frame_skip,
     )
 
     # local Redis
@@ -218,6 +217,7 @@
                                 simulator=simulator,
                                 visualize=False,
                                 live_progress=False,
+                                tick_skip=Constants_gp.FRAME_SKIP,
                                 )
 
     worker.env._match._obs_builder.env = worker.env  # noqa

diff --git a/worker_selector.py b/worker_selector.py
@@ -573,6 +573,7 @@ def setup_streamer():
                                 # parser_boost_split=parser.get_model_action_size(),
                                 # initial_choice_block_indices=[2, 37],
                                 # initial_choice_block_weight=0.5,
+                                tick_skip=Constants_selector.FRAME_SKIP,
                                 )
 
     worker.env._match._obs_builder.env = worker.env