Merge branch 'main' of https://github.com/ymahlau/albatross

ymahlau · Dec 4, 2023 · df5ea0a · df5ea0a
2 parents 1339b06 + b57414e
commit df5ea0a
Show file tree

Hide file tree

Showing 41 changed files with 6,163 additions and 261 deletions.
diff --git a/config/cfg_luis_proxy_aa_0.yaml b/config/cfg_luis_proxy_aa_0.yaml
@@ -10,7 +10,7 @@ data:
       quick_start_buffer_path: null
       start_wait_n_samples: 500000
   compile_mode: max-autotune
-  compile_model: true
+  compile_model: false
   data_qsize: 10
   distributor_out_qsize: 10
   evaluator_cfg:
@@ -26,7 +26,7 @@ data:
       eval_rate_sec: 60
       num_episodes:
       - 100
-      - 20
+      - 2
       prevent_draw: false
       save_checkpoints: false
       self_play: true
@@ -140,7 +140,7 @@ data:
       project_name: overcooked
       updater_bucket_size: 1000
       wandb_mode: offline
-      worker_episode_bucket_size: 2
+      worker_episode_bucket_size: 5
   max_batch_size: 15000
   max_cpu_evaluator: 1
   max_cpu_inference_server: 2
@@ -151,7 +151,7 @@ data:
   merge_inference_update_gpu: false
   net_cfg:
     __module__: src.network.resnet
-    __name__: OvercookedResNetConfig5x5
+    __name__: OvercookedResNetConfig9x9
     data:
       activation_type:
         __module__: src.network.utils
@@ -173,8 +173,13 @@ data:
         - 3
         - 1
         - 1
-      - - 128
+      - - 64
+        - 1
+        - 3
+        - 0
         - 1
+      - - 128
+        - 2
         - 3
         - 1
         - 1
@@ -367,7 +372,7 @@ data:
             data:
               active_wait_time: 0.05
               init_temperatures: null
-              max_clip_value: .inf
+              max_clip_value: 30
               min_clip_value: -.inf
               policy_prediction: true
               random_symmetry: false
@@ -430,4 +435,4 @@ data:
       use_symmetries: true
 hydra:
   run:
-    dir: ./outputs/${now:%Y-%m-%d}/${now:%H-%M-%S}_luis_proxy_aa
+    dir: ./outputs/${now:%Y-%m-%d}/${now:%H-%M-%S}_luis_proxy_aa_0
diff --git a/config/cfg_luis_proxy_aa_1.yaml b/config/cfg_luis_proxy_aa_1.yaml
@@ -10,7 +10,7 @@ data:
       quick_start_buffer_path: null
       start_wait_n_samples: 500000
   compile_mode: max-autotune
-  compile_model: true
+  compile_model: false
   data_qsize: 10
   distributor_out_qsize: 10
   evaluator_cfg:
@@ -26,7 +26,7 @@ data:
       eval_rate_sec: 60
       num_episodes:
       - 100
-      - 20
+      - 2
       prevent_draw: false
       save_checkpoints: false
       self_play: true
@@ -140,7 +140,7 @@ data:
       project_name: overcooked
       updater_bucket_size: 1000
       wandb_mode: offline
-      worker_episode_bucket_size: 2
+      worker_episode_bucket_size: 5
   max_batch_size: 15000
   max_cpu_evaluator: 1
   max_cpu_inference_server: 2
@@ -151,7 +151,7 @@ data:
   merge_inference_update_gpu: false
   net_cfg:
     __module__: src.network.resnet
-    __name__: OvercookedResNetConfig5x5
+    __name__: OvercookedResNetConfig9x9
     data:
       activation_type:
         __module__: src.network.utils
@@ -161,7 +161,97 @@ data:
         __module__: src.network.vision_net
         __name__: EquivarianceType
         value: NONE
-      game_cfg: null
+      game_cfg:
+        __module__: src.game.overcooked.config
+        __name__: AsymmetricAdvantageOvercookedConfig
+        data:
+          board:
+          - - 1
+            - 1
+            - 1
+            - 1
+            - 1
+            - 1
+            - 1
+            - 1
+            - 1
+          - - 3
+            - 0
+            - 1
+            - 5
+            - 1
+            - 3
+            - 1
+            - 0
+            - 5
+          - - 1
+            - 0
+            - 0
+            - 0
+            - 4
+            - 0
+            - 0
+            - 0
+            - 1
+          - - 1
+            - 0
+            - 0
+            - 0
+            - 4
+            - 0
+            - 0
+            - 0
+            - 1
+          - - 1
+            - 1
+            - 1
+            - 2
+            - 1
+            - 2
+            - 1
+            - 1
+            - 1
+          cooking_time: 20
+          flat_obs: false
+          h: 5
+          horizon: 400
+          num_actions: 6
+          num_players: 2
+          reward_cfg:
+            __module__: src.game.overcooked.config
+            __name__: OvercookedRewardConfig
+            data:
+              dish_pickup: 3
+              placement_in_pot: 3
+              soup_delivery: 20
+              soup_pickup: 5
+              start_cooking: 3
+          reward_scaling_factor: 1
+          single_temperature_input: true
+          start_pos:
+            __module__: src.misc.serialization
+            __name__: TupleWrapper
+            data:
+              data:
+              - __module__: src.misc.serialization
+                __name__: TupleWrapper
+                data:
+                  data:
+                  - 6
+                  - 2
+                  - 0
+                  - 0
+              - __module__: src.misc.serialization
+                __name__: TupleWrapper
+                data:
+                  data:
+                  - 1
+                  - 3
+                  - 0
+                  - 0
+          temperature_input: true
+          unstuck_behavior: false
+          w: 9
       layer_specs:
       - - 32
         - 3
@@ -173,9 +263,14 @@ data:
         - 3
         - 1
         - 1
-      - - 128
+      - - 64
         - 1
         - 3
+        - 0
+        - 1
+      - - 128
+        - 2
+        - 3
         - 1
         - 1
       - - 256
@@ -367,7 +462,7 @@ data:
             data:
               active_wait_time: 0.05
               init_temperatures: null
-              max_clip_value: .inf
+              max_clip_value: 30
               min_clip_value: -.inf
               policy_prediction: true
               random_symmetry: false
@@ -430,4 +525,4 @@ data:
       use_symmetries: true
 hydra:
   run:
-    dir: ./outputs/${now:%Y-%m-%d}/${now:%H-%M-%S}_luis_proxy_aa
+    dir: ./outputs/${now:%Y-%m-%d}/${now:%H-%M-%S}_luis_proxy_aa_1