[Tasks] VMAS MPE (Vectorized)

.github/unittest/install_vmas.sh

@@ -1,4 +1,4 @@
 
-python -m pip install vmas
+python -m pip install git+https://github.com/proroklab/VectorizedMultiAgentSimulator.git
 sudo apt-get update
 sudo apt-get install python3-opengl xvfb

benchmarl/conf/task/vmas/simple_adversary.yaml

@@ -0,0 +1,7 @@
+defaults:
+  - _self_
+  - vmas_simple_adversary_config
+
+max_steps: 100
+n_agents: 3
+n_adversaries: 1

benchmarl/conf/task/vmas/simple_crypto.yaml

@@ -0,0 +1,6 @@
+defaults:
+  - _self_
+  - vmas_simple_crypto_config
+
+max_steps: 100
+dim_c: 4

benchmarl/conf/task/vmas/simple_push.yaml

@@ -0,0 +1,5 @@
+defaults:
+  - _self_
+  - vmas_simple_push_config
+
+max_steps: 100

benchmarl/conf/task/vmas/simple_reference.yaml

@@ -0,0 +1,5 @@
+defaults:
+  - _self_
+  - vmas_simple_reference_config
+
+max_steps: 100

benchmarl/conf/task/vmas/simple_speaker_listener.yaml

@@ -0,0 +1,5 @@
+defaults:
+  - _self_
+  - vmas_simple_speaker_listener_config
+
+max_steps: 100

benchmarl/conf/task/vmas/simple_spread.yaml

@@ -0,0 +1,7 @@
+defaults:
+  - _self_
+  - vmas_simple_spread_config
+
+max_steps: 100
+n_agents: 3
+obs_agents: True

benchmarl/conf/task/vmas/simple_tag.yaml

@@ -0,0 +1,17 @@
+defaults:
+  - _self_
+  - vmas_simple_tag_config
+
+max_steps: 100
+num_good_agents: 1
+num_adversaries: 3
+num_landmarks: 2
+shape_agent_rew: False
+shape_adversary_rew: False
+agents_share_rew: False
+adversaries_share_rew: True
+observe_same_team: True
+observe_pos: True
+observe_vel: True
+bound: 1.0
+respawn_at_catch: False

benchmarl/conf/task/vmas/simple_world_comm.yaml

@@ -0,0 +1,10 @@
+defaults:
+  - _self_
+  - vmas_simple_world_comm_config
+
+max_steps: 100
+num_good_agents: 2
+num_adversaries: 4
+num_landmarks: 1
+num_food: 2
+num_forests: 2

benchmarl/environments/__init__.py

@@ -34,9 +34,19 @@
 from .vmas.balance import TaskConfig as BalanceConfig
 from .vmas.navigation import TaskConfig as NavigationConfig
 from .vmas.sampling import TaskConfig as SamplingConfig
+
+from .vmas.simple_adverasary import TaskConfig as VmasSimpleAdversaryConfig
+from .vmas.simple_crypto import TaskConfig as VmasSimpleCryptoConfig
+from .vmas.simple_push import TaskConfig as VmasSimplePushConfig
+from .vmas.simple_reference import TaskConfig as VmasSimpleReferenceConfig
+from .vmas.simple_speaker_listener import TaskConfig as VmasSimpleSpeakerListenerConfig
+from .vmas.simple_spread import TaskConfig as VmasSimpleSpreadConfig
+from .vmas.simple_tag import TaskConfig as VmasSimpleTagConfig
+from .vmas.simple_world_comm import TaskConfig as VmasSimpleWorldComm
 from .vmas.transport import TaskConfig as TransportConfig
 from .vmas.wheel import TaskConfig as WheelConfig
 
+
 # This is a registry mapping task config schemas names to their python dataclass
 # It is used by hydra to validate loaded configs.
 # You will see the "envname_taskname_config" strings in the hydra defaults at the top of yaml files.
@@ -47,6 +57,14 @@
     "vmas_navigation_config": NavigationConfig,
     "vmas_transport_config": TransportConfig,
     "vmas_wheel_config": WheelConfig,
+    "vmas_simple_adversary_config": VmasSimpleAdversaryConfig,
+    "vmas_simple_crypto_config": VmasSimpleCryptoConfig,
+    "vmas_simple_push_config": VmasSimplePushConfig,
+    "vmas_simple_reference_config": VmasSimpleReferenceConfig,
+    "vmas_simple_speaker_listener_config": VmasSimpleSpeakerListenerConfig,
+    "vmas_simple_spread_config": VmasSimpleSpreadConfig,
+    "vmas_simple_tag_config": VmasSimpleTagConfig,
+    "vmas_simple_world_comm_config": VmasSimpleWorldComm,
     "pettingzoo_multiwalker_config": MultiwalkerConfig,
     "pettingzoo_waterworld_config": WaterworldConfig,
     "pettingzoo_simple_adversary_config": SimpleAdversaryConfig,

benchmarl/environments/vmas/common.py

@@ -22,6 +22,14 @@ class VmasTask(Task):
     NAVIGATION = None
     TRANSPORT = None
     WHEEL = None
+    SIMPLE_ADVERSARY = None
+    SIMPLE_CRYPTO = None
+    SIMPLE_PUSH = None
+    SIMPLE_REFERENCE = None
+    SIMPLE_SPEAKER_LISTENER = None
+    SIMPLE_SPREAD = None
+    SIMPLE_TAG = None
+    SIMPLE_WORLD_COMM = None
 
     def get_env_fun(
         self,

benchmarl/environments/vmas/simple_adverasary.py

@@ -0,0 +1,14 @@
+#  Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+#  This source code is licensed under the license found in the
+#  LICENSE file in the root directory of this source tree.
+#
+
+from dataclasses import dataclass, MISSING
+
+
+@dataclass
+class TaskConfig:
+    max_steps: int = MISSING
+    n_agents: int = MISSING
+    n_adversaries: int = MISSING

benchmarl/environments/vmas/simple_crypto.py

@@ -0,0 +1,13 @@
+#  Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+#  This source code is licensed under the license found in the
+#  LICENSE file in the root directory of this source tree.
+#
+
+from dataclasses import dataclass, MISSING
+
+
+@dataclass
+class TaskConfig:
+    max_steps: int = MISSING
+    dim_c: int = MISSING

benchmarl/environments/vmas/simple_push.py

@@ -0,0 +1,12 @@
+#  Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+#  This source code is licensed under the license found in the
+#  LICENSE file in the root directory of this source tree.
+#
+
+from dataclasses import dataclass, MISSING
+
+
+@dataclass
+class TaskConfig:
+    max_steps: int = MISSING

benchmarl/environments/vmas/simple_reference.py

@@ -0,0 +1,12 @@
+#  Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+#  This source code is licensed under the license found in the
+#  LICENSE file in the root directory of this source tree.
+#
+
+from dataclasses import dataclass, MISSING
+
+
+@dataclass
+class TaskConfig:
+    max_steps: int = MISSING

benchmarl/environments/vmas/simple_speaker_listener.py

@@ -0,0 +1,12 @@
+#  Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+#  This source code is licensed under the license found in the
+#  LICENSE file in the root directory of this source tree.
+#
+
+from dataclasses import dataclass, MISSING
+
+
+@dataclass
+class TaskConfig:
+    max_steps: int = MISSING

benchmarl/environments/vmas/simple_spread.py

@@ -0,0 +1,14 @@
+#  Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+#  This source code is licensed under the license found in the
+#  LICENSE file in the root directory of this source tree.
+#
+
+from dataclasses import dataclass, MISSING
+
+
+@dataclass
+class TaskConfig:
+    max_steps: int = MISSING
+    obs_agents: bool = MISSING
+    n_agents: int = MISSING

benchmarl/environments/vmas/simple_tag.py

@@ -0,0 +1,24 @@
+#  Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+#  This source code is licensed under the license found in the
+#  LICENSE file in the root directory of this source tree.
+#
+
+from dataclasses import dataclass, MISSING
+
+
+@dataclass
+class TaskConfig:
+    max_steps: int = MISSING
+    num_good_agents: int = MISSING
+    num_adversaries: int = MISSING
+    num_landmarks: int = MISSING
+    shape_agent_rew: bool = MISSING
+    shape_adversary_rew: bool = MISSING
+    agents_share_rew: bool = MISSING
+    adversaries_share_rew: bool = MISSING
+    observe_same_team: bool = MISSING
+    observe_pos: bool = MISSING
+    observe_vel: bool = MISSING
+    bound: float = MISSING
+    respawn_at_catch: bool = MISSING

benchmarl/environments/vmas/simple_world_comm.py

@@ -0,0 +1,17 @@
+#  Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+#  This source code is licensed under the license found in the
+#  LICENSE file in the root directory of this source tree.
+#
+
+from dataclasses import dataclass, MISSING
+
+
+@dataclass
+class TaskConfig:
+    max_steps: int = MISSING
+    num_good_agents: int = MISSING
+    num_adversaries: int = MISSING
+    num_landmarks: int = MISSING
+    num_food: int = MISSING
+    num_forests: int = MISSING

test/test_vmas.py

@@ -13,7 +13,6 @@
     IppoConfig,
     IsacConfig,
     MaddpgConfig,
-    MappoConfig,
     MasacConfig,
     QmixConfig,
     VdnConfig,
@@ -57,7 +56,7 @@ def test_all_algos(
         )
         experiment.run()
 
-    @pytest.mark.parametrize("algo_config", [MappoConfig, QmixConfig])
+    @pytest.mark.parametrize("algo_config", [IppoConfig, MasacConfig])
     @pytest.mark.parametrize("task", list(VmasTask))
     def test_all_tasks(
         self,