amend

facebookresearch · Jun 10, 2024 · 397b322 · 397b322
1 parent f113546
commit 397b322
Show file tree

Hide file tree

Showing 40 changed files with 78 additions and 58 deletions.
diff --git a/benchmarl/__init__.py b/benchmarl/__init__.py
@@ -22,7 +22,6 @@
     def _load_hydra_schemas():
         from hydra.core.config_store import ConfigStore
 
-        import benchmarl.environments
         from benchmarl.algorithms import algorithm_config_registry
         from benchmarl.environments import _task_class_registry
         from benchmarl.experiment import ExperimentConfig

diff --git a/benchmarl/conf/task/pettingzoo/multiwalker.yaml b/benchmarl/conf/task/pettingzoo/multiwalker.yaml
@@ -1,6 +1,6 @@
 defaults:
-  - _self_
   - pettingzoo_multiwalker_config
+  - _self_
 
 task: "multiwalker_v9"
 # number of bipedal walker agents in environment

diff --git a/benchmarl/conf/task/pettingzoo/simple_adversary.yaml b/benchmarl/conf/task/pettingzoo/simple_adversary.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - pettingzoo_simple_adversary_config
+  - _self_
+
 
 task: "simple_adversary_v3"
 N: 2

diff --git a/benchmarl/conf/task/pettingzoo/simple_crypto.yaml b/benchmarl/conf/task/pettingzoo/simple_crypto.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - pettingzoo_simple_crypto_config
+  - _self_
+
 
 task: "simple_crypto_v3"
 max_cycles: 100
diff --git a/benchmarl/conf/task/pettingzoo/simple_push.yaml b/benchmarl/conf/task/pettingzoo/simple_push.yaml
@@ -1,6 +1,7 @@
 defaults:
+  -  pettingzoo_simple_push_config
   - _self_
-  - pettingzoo_simple_push_config
+
 
 task: "simple_push_v3"
 max_cycles: 100
diff --git a/benchmarl/conf/task/pettingzoo/simple_reference.yaml b/benchmarl/conf/task/pettingzoo/simple_reference.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - pettingzoo_simple_reference_config
+  - _self_
+
 
 task: "simple_reference_v3"
 max_cycles: 100

diff --git a/benchmarl/conf/task/pettingzoo/simple_speaker_listener.yaml b/benchmarl/conf/task/pettingzoo/simple_speaker_listener.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - pettingzoo_simple_speaker_listener_config
+  - _self_
+
 
 task: "simple_speaker_listener_v4"
 max_cycles: 100
diff --git a/benchmarl/conf/task/pettingzoo/simple_spread.yaml b/benchmarl/conf/task/pettingzoo/simple_spread.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - pettingzoo_simple_spread_config
+  - _self_
+
 
 task: "simple_spread_v3"
 max_cycles: 100

diff --git a/benchmarl/conf/task/pettingzoo/simple_tag.yaml b/benchmarl/conf/task/pettingzoo/simple_tag.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - pettingzoo_simple_tag_config
+  - _self_
+
 
 task: "simple_tag_v3"
 num_good: 2

diff --git a/benchmarl/conf/task/pettingzoo/simple_world_comm.yaml b/benchmarl/conf/task/pettingzoo/simple_world_comm.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - pettingzoo_simple_world_comm_config
+  - _self_
+
 
 task: "simple_world_comm_v3"
 num_good: 2

diff --git a/benchmarl/conf/task/pettingzoo/waterworld.yaml b/benchmarl/conf/task/pettingzoo/waterworld.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - pettingzoo_waterworld_config
+  - _self_
+
 
 task: "waterworld_v4"
 max_cycles: 500

diff --git a/benchmarl/conf/task/vmas/balance.yaml b/benchmarl/conf/task/vmas/balance.yaml
@@ -1,7 +1,6 @@
 defaults:
-  - _self_
   - vmas_balance_config
-
+  - _self_
 
 max_steps: 100
 n_agents: 4

diff --git a/benchmarl/conf/task/vmas/ball_passage.yaml b/benchmarl/conf/task/vmas/ball_passage.yaml
@@ -1,6 +1,6 @@
 defaults:
-  - _self_
   - vmas_ball_passage_config
+  - _self_
 
 max_steps: 500
 n_passages: 1

diff --git a/benchmarl/conf/task/vmas/ball_trajectory.yaml b/benchmarl/conf/task/vmas/ball_trajectory.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_ball_trajectory_config
+  - _self_
+
 
 max_steps: 100
 joints: True
diff --git a/benchmarl/conf/task/vmas/buzz_wire.yaml b/benchmarl/conf/task/vmas/buzz_wire.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_buzz_wire_config
+  - _self_
+
 
 max_steps: 100
 random_start_angle: True

diff --git a/benchmarl/conf/task/vmas/discovery.yaml b/benchmarl/conf/task/vmas/discovery.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_discovery_config
+  - _self_
+
 
 max_steps: 100
 n_agents: 5

diff --git a/benchmarl/conf/task/vmas/dispersion.yaml b/benchmarl/conf/task/vmas/dispersion.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_dispersion_config
+  - _self_
+
 
 
 max_steps: 100

diff --git a/benchmarl/conf/task/vmas/dropout.yaml b/benchmarl/conf/task/vmas/dropout.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_dropout_config
+  - _self_
+
 
 
 max_steps: 100

diff --git a/benchmarl/conf/task/vmas/flocking.yaml b/benchmarl/conf/task/vmas/flocking.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_flocking_config
+  - _self_
+
 
 max_steps: 100
 n_agents: 4

diff --git a/benchmarl/conf/task/vmas/give_way.yaml b/benchmarl/conf/task/vmas/give_way.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_give_way_config
+  - _self_
+
 
 max_steps: 100
 mirror_passage: False

diff --git a/benchmarl/conf/task/vmas/joint_passage.yaml b/benchmarl/conf/task/vmas/joint_passage.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_joint_passage_config
+  - _self_
+
 
 max_steps: 500
 n_passages: 1

diff --git a/benchmarl/conf/task/vmas/joint_passage_size.yaml b/benchmarl/conf/task/vmas/joint_passage_size.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_joint_passage_size_config
+  - _self_
+
 
 max_steps: 500
 n_passages: 3

diff --git a/benchmarl/conf/task/vmas/multi_give_way.yaml b/benchmarl/conf/task/vmas/multi_give_way.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_multi_give_way_config
+  - _self_
+
 
 max_steps: 200
 agent_collision_penalty: -0.1
diff --git a/benchmarl/conf/task/vmas/navigation.yaml b/benchmarl/conf/task/vmas/navigation.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_navigation_config
+  - _self_
+
 
 
 max_steps: 100

diff --git a/benchmarl/conf/task/vmas/passage.yaml b/benchmarl/conf/task/vmas/passage.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_passage_config
+  - _self_
+
 
 max_steps: 500
 n_passages: 1

diff --git a/benchmarl/conf/task/vmas/reverse_transport.yaml b/benchmarl/conf/task/vmas/reverse_transport.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_reverse_transport_config
+  - _self_
+
 
 max_steps: 100
 n_agents: 4

diff --git a/benchmarl/conf/task/vmas/sampling.yaml b/benchmarl/conf/task/vmas/sampling.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_sampling_config
+  - _self_
+
 
 
 max_steps: 100

diff --git a/benchmarl/conf/task/vmas/simple_adversary.yaml b/benchmarl/conf/task/vmas/simple_adversary.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_simple_adversary_config
+  - _self_
+
 
 max_steps: 100
 n_agents: 3

diff --git a/benchmarl/conf/task/vmas/simple_crypto.yaml b/benchmarl/conf/task/vmas/simple_crypto.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_simple_crypto_config
+  - _self_
+
 
 max_steps: 100
 dim_c: 4
diff --git a/benchmarl/conf/task/vmas/simple_push.yaml b/benchmarl/conf/task/vmas/simple_push.yaml
@@ -1,5 +1,6 @@
 defaults:
-  - _self_
   - vmas_simple_push_config
+  - _self_
+
 
 max_steps: 100
diff --git a/benchmarl/conf/task/vmas/simple_reference.yaml b/benchmarl/conf/task/vmas/simple_reference.yaml
@@ -1,5 +1,6 @@
 defaults:
-  - _self_
   - vmas_simple_reference_config
+  - _self_
+
 
 max_steps: 100
diff --git a/benchmarl/conf/task/vmas/simple_speaker_listener.yaml b/benchmarl/conf/task/vmas/simple_speaker_listener.yaml
@@ -1,5 +1,6 @@
 defaults:
-  - _self_
   - vmas_simple_speaker_listener_config
+  - _self_
+
 
 max_steps: 100
diff --git a/benchmarl/conf/task/vmas/simple_spread.yaml b/benchmarl/conf/task/vmas/simple_spread.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_simple_spread_config
+  - _self_
+
 
 max_steps: 100
 n_agents: 3

diff --git a/benchmarl/conf/task/vmas/simple_tag.yaml b/benchmarl/conf/task/vmas/simple_tag.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_simple_tag_config
+  - _self_
+
 
 max_steps: 100
 num_good_agents: 1

diff --git a/benchmarl/conf/task/vmas/simple_world_comm.yaml b/benchmarl/conf/task/vmas/simple_world_comm.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_simple_world_comm_config
+  - _self_
+
 
 max_steps: 100
 num_good_agents: 2

diff --git a/benchmarl/conf/task/vmas/transport.yaml b/benchmarl/conf/task/vmas/transport.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_transport_config
+  - _self_
+
 
 
 max_steps: 100

diff --git a/benchmarl/conf/task/vmas/wheel.yaml b/benchmarl/conf/task/vmas/wheel.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_wheel_config
+  - _self_
+
 
 max_steps: 100
 n_agents: 4

diff --git a/benchmarl/conf/task/vmas/wind_flocking.yaml b/benchmarl/conf/task/vmas/wind_flocking.yaml
@@ -1,6 +1,7 @@
 defaults:
-  - _self_
   - vmas_wind_flocking_config
+  - _self_
+
 
 max_steps: 100
 horizon: 100

diff --git a/benchmarl/environments/common.py b/benchmarl/environments/common.py
@@ -7,8 +7,7 @@
 from __future__ import annotations
 
 import importlib
-import os
-import os.path as osp
+
 import warnings
 from enum import Enum
 from pathlib import Path
@@ -41,23 +40,12 @@ def _type_check_task_config(
 
 
 def _get_task_config_class(environemnt_name: str, task_name: str):
-    if not task_name.endswith(".py"):
-        task_name += ".py"
-
-    pathname = None
-    for dirpath, _, filenames in os.walk(
-        Path(osp.dirname(__file__)) / environemnt_name
-    ):
-        if task_name in filenames:
-            pathname = os.path.join(dirpath, task_name)
-            break
-
-    if pathname is not None:
-        spec = importlib.util.spec_from_file_location("", pathname)
-        module = importlib.util.module_from_spec(spec)
-        spec.loader.exec_module(module)
+    try:
+        module = importlib.import_module(
+            f"{'.'.join(__name__.split('.')[:-1])}.{environemnt_name}.{task_name}"
+        )
         return module.TaskConfig
-    else:
+    except ModuleNotFoundError:
         return None
 
 

diff --git a/examples/extending/task/conf/task/customenv/task_1.yaml b/examples/extending/task/conf/task/customenv/task_1.yaml
@@ -1,6 +1,6 @@
 defaults:
-  - _self_
   - customenv_task_1_config
+  - _self_
 
 n_borks: 3
 win_on_dork: True