From cfb680857a49641b10236efe90f7830ae1110445 Mon Sep 17 00:00:00 2001 From: WiemKhlifi Date: Wed, 9 Oct 2024 18:11:34 +0100 Subject: [PATCH 1/9] refactor: update configs folder --- .../{ => default/anakin}/default_ff_ippo.yaml | 6 +++++- .../{ => default/anakin}/default_ff_isac.yaml | 6 +++++- .../{ => default/anakin}/default_ff_mappo.yaml | 6 +++++- .../{ => default/anakin}/default_ff_masac.yaml | 6 +++++- .../{ => default/anakin}/default_rec_ippo.yaml | 6 +++++- .../{ => default/anakin}/default_rec_iql.yaml | 6 +++++- .../{ => default/anakin}/default_rec_mappo.yaml | 6 +++++- mava/configs/logger/ff_ippo.yaml | 4 ---- mava/configs/logger/ff_isac.yaml | 4 ---- mava/configs/logger/ff_mappo.yaml | 4 ---- mava/configs/logger/ff_masac.yaml | 4 ---- mava/configs/logger/rec_ippo.yaml | 4 ---- mava/configs/logger/rec_iql.yaml | 4 ---- mava/configs/logger/rec_mappo.yaml | 4 ---- mava/systems/ppo/anakin/ff_ippo.py | 7 ++++++- mava/systems/ppo/anakin/ff_mappo.py | 7 ++++++- mava/systems/ppo/anakin/rec_ippo.py | 7 ++++++- mava/systems/ppo/anakin/rec_mappo.py | 5 ++++- mava/systems/q_learning/anakin/rec_iql.py | 7 ++++++- mava/systems/sac/anakin/ff_isac.py | 7 ++++++- mava/systems/sac/anakin/ff_masac.py | 7 ++++++- test/integration_test.py | 14 ++++++++------ 22 files changed, 83 insertions(+), 48 deletions(-) rename mava/configs/{ => default/anakin}/default_ff_ippo.yaml (72%) rename mava/configs/{ => default/anakin}/default_ff_isac.yaml (65%) rename mava/configs/{ => default/anakin}/default_ff_mappo.yaml (72%) rename mava/configs/{ => default/anakin}/default_ff_masac.yaml (65%) rename mava/configs/{ => default/anakin}/default_rec_ippo.yaml (71%) rename mava/configs/{ => default/anakin}/default_rec_iql.yaml (70%) rename mava/configs/{ => default/anakin}/default_rec_mappo.yaml (71%) delete mode 100644 mava/configs/logger/ff_ippo.yaml delete mode 100644 mava/configs/logger/ff_isac.yaml delete mode 100644 mava/configs/logger/ff_mappo.yaml delete mode 100644 mava/configs/logger/ff_masac.yaml delete mode 100644 mava/configs/logger/rec_ippo.yaml delete mode 100644 mava/configs/logger/rec_iql.yaml delete mode 100644 mava/configs/logger/rec_mappo.yaml diff --git a/mava/configs/default_ff_ippo.yaml b/mava/configs/default/anakin/default_ff_ippo.yaml similarity index 72% rename from mava/configs/default_ff_ippo.yaml rename to mava/configs/default/anakin/default_ff_ippo.yaml index e9ea0b73c..e9a56a341 100644 --- a/mava/configs/default_ff_ippo.yaml +++ b/mava/configs/default/anakin/default_ff_ippo.yaml @@ -1,7 +1,11 @@ defaults: - - logger: ff_ippo + - logger: base_logger - arch: anakin - system: ppo/ff_ippo - network: mlp # [mlp, continuous_mlp, cnn] - env: rware # [cleaner, connector, gigastep, lbf, mabrax, matrax, rware, smax] - _self_ + +hydra: + searchpath: + - file://mava/configs diff --git a/mava/configs/default_ff_isac.yaml b/mava/configs/default/anakin/default_ff_isac.yaml similarity index 65% rename from mava/configs/default_ff_isac.yaml rename to mava/configs/default/anakin/default_ff_isac.yaml index bcdb364d4..b35239aa0 100644 --- a/mava/configs/default_ff_isac.yaml +++ b/mava/configs/default/anakin/default_ff_isac.yaml @@ -1,7 +1,11 @@ defaults: - _self_ - - logger: ff_isac + - logger: base_logger - arch: anakin - system: sac/ff_isac - network: continuous_mlp # [continuous_mlp] - env: mabrax # [mabrax] + +hydra: + searchpath: + - file://mava/configs diff --git a/mava/configs/default_ff_mappo.yaml b/mava/configs/default/anakin/default_ff_mappo.yaml similarity index 72% rename from mava/configs/default_ff_mappo.yaml rename to mava/configs/default/anakin/default_ff_mappo.yaml index 3a263d387..fbb7238c2 100644 --- a/mava/configs/default_ff_mappo.yaml +++ b/mava/configs/default/anakin/default_ff_mappo.yaml @@ -1,7 +1,11 @@ defaults: - - logger: ff_mappo + - logger: base_logger - arch: anakin - system: ppo/ff_mappo - network: mlp # [mlp, continuous_mlp, cnn] - env: rware # [cleaner, connector, gigastep, lbf, mabrax, matrax, rware, smax] - _self_ + +hydra: + searchpath: + - file://mava/configs diff --git a/mava/configs/default_ff_masac.yaml b/mava/configs/default/anakin/default_ff_masac.yaml similarity index 65% rename from mava/configs/default_ff_masac.yaml rename to mava/configs/default/anakin/default_ff_masac.yaml index 07d9207eb..596fe03fa 100644 --- a/mava/configs/default_ff_masac.yaml +++ b/mava/configs/default/anakin/default_ff_masac.yaml @@ -1,7 +1,11 @@ defaults: - _self_ - - logger: ff_masac + - logger: base_logger - arch: anakin - system: sac/ff_masac - network: continuous_mlp # [continuous_mlp] - env: mabrax # [mabrax] + +hydra: + searchpath: + - file://mava/configs diff --git a/mava/configs/default_rec_ippo.yaml b/mava/configs/default/anakin/default_rec_ippo.yaml similarity index 71% rename from mava/configs/default_rec_ippo.yaml rename to mava/configs/default/anakin/default_rec_ippo.yaml index 028ced46c..d1eddaa4c 100644 --- a/mava/configs/default_rec_ippo.yaml +++ b/mava/configs/default/anakin/default_rec_ippo.yaml @@ -1,7 +1,11 @@ defaults: - - logger: rec_ippo + - logger: base_logger - arch: anakin - system: ppo/rec_ippo - network: rnn # [rnn, rcnn] - env: rware # [cleaner, connector, gigastep, lbf, mabrax, matrax, rware, smax] - _self_ + +hydra: + searchpath: + - file://mava/configs diff --git a/mava/configs/default_rec_iql.yaml b/mava/configs/default/anakin/default_rec_iql.yaml similarity index 70% rename from mava/configs/default_rec_iql.yaml rename to mava/configs/default/anakin/default_rec_iql.yaml index d2079d0d5..7ac07bdf2 100644 --- a/mava/configs/default_rec_iql.yaml +++ b/mava/configs/default/anakin/default_rec_iql.yaml @@ -1,7 +1,11 @@ defaults: - _self_ - - logger: rec_iql + - logger: base_logger - arch: anakin - system: q_learning/rec_iql - network: rnn # [rnn, rcnn] - env: smax # [cleaner, connector, gigastep, lbf, matrax, rware, smax] + +hydra: + searchpath: + - file://mava/configs diff --git a/mava/configs/default_rec_mappo.yaml b/mava/configs/default/anakin/default_rec_mappo.yaml similarity index 71% rename from mava/configs/default_rec_mappo.yaml rename to mava/configs/default/anakin/default_rec_mappo.yaml index 9f33dc0d6..38a86e10a 100644 --- a/mava/configs/default_rec_mappo.yaml +++ b/mava/configs/default/anakin/default_rec_mappo.yaml @@ -1,7 +1,11 @@ defaults: - - logger: rec_mappo + - logger: base_logger - arch: anakin - system: ppo/rec_mappo - network: rnn # [rnn, rcnn] - env: rware # [cleaner, connector, gigastep, lbf, mabrax, matrax, rware, smax] - _self_ + +hydra: + searchpath: + - file://mava/configs diff --git a/mava/configs/logger/ff_ippo.yaml b/mava/configs/logger/ff_ippo.yaml deleted file mode 100644 index 084a5578d..000000000 --- a/mava/configs/logger/ff_ippo.yaml +++ /dev/null @@ -1,4 +0,0 @@ -defaults: - - base_logger - -system_name: ff_ippo diff --git a/mava/configs/logger/ff_isac.yaml b/mava/configs/logger/ff_isac.yaml deleted file mode 100644 index 4c4ac8896..000000000 --- a/mava/configs/logger/ff_isac.yaml +++ /dev/null @@ -1,4 +0,0 @@ -defaults: - - base_logger - -system_name: ff_isac diff --git a/mava/configs/logger/ff_mappo.yaml b/mava/configs/logger/ff_mappo.yaml deleted file mode 100644 index d9a1ebb34..000000000 --- a/mava/configs/logger/ff_mappo.yaml +++ /dev/null @@ -1,4 +0,0 @@ -defaults: - - base_logger - -system_name: ff_mappo diff --git a/mava/configs/logger/ff_masac.yaml b/mava/configs/logger/ff_masac.yaml deleted file mode 100644 index 1a2c03fd9..000000000 --- a/mava/configs/logger/ff_masac.yaml +++ /dev/null @@ -1,4 +0,0 @@ -defaults: - - base_logger - -system_name: ff_masac diff --git a/mava/configs/logger/rec_ippo.yaml b/mava/configs/logger/rec_ippo.yaml deleted file mode 100644 index 6aff4a67d..000000000 --- a/mava/configs/logger/rec_ippo.yaml +++ /dev/null @@ -1,4 +0,0 @@ -defaults: - - base_logger - -system_name: rec_ippo diff --git a/mava/configs/logger/rec_iql.yaml b/mava/configs/logger/rec_iql.yaml deleted file mode 100644 index 146ffbaf8..000000000 --- a/mava/configs/logger/rec_iql.yaml +++ /dev/null @@ -1,4 +0,0 @@ -defaults: - - base_logger - -system_name: rec_iql diff --git a/mava/configs/logger/rec_mappo.yaml b/mava/configs/logger/rec_mappo.yaml deleted file mode 100644 index 60010fb8b..000000000 --- a/mava/configs/logger/rec_mappo.yaml +++ /dev/null @@ -1,4 +0,0 @@ -defaults: - - base_logger - -system_name: rec_mappo diff --git a/mava/systems/ppo/anakin/ff_ippo.py b/mava/systems/ppo/anakin/ff_ippo.py index 8053b8e86..8738c2410 100644 --- a/mava/systems/ppo/anakin/ff_ippo.py +++ b/mava/systems/ppo/anakin/ff_ippo.py @@ -570,11 +570,16 @@ def run_experiment(_config: DictConfig) -> float: return eval_performance -@hydra.main(config_path="../../../configs", config_name="default_ff_ippo.yaml", version_base="1.2") +@hydra.main( + config_path="../../../configs/default/anakin", + config_name="default_ff_ippo.yaml", + version_base="1.2", +) def hydra_entry_point(cfg: DictConfig) -> float: """Experiment entry point.""" # Allow dynamic attributes. OmegaConf.set_struct(cfg, False) + cfg.logger.system_name = "ff_ippo" # Run experiment. eval_performance = run_experiment(cfg) diff --git a/mava/systems/ppo/anakin/ff_mappo.py b/mava/systems/ppo/anakin/ff_mappo.py index 360485751..2acd4cf6e 100644 --- a/mava/systems/ppo/anakin/ff_mappo.py +++ b/mava/systems/ppo/anakin/ff_mappo.py @@ -553,11 +553,16 @@ def run_experiment(_config: DictConfig) -> float: return eval_performance -@hydra.main(config_path="../../../configs", config_name="default_ff_mappo.yaml", version_base="1.2") +@hydra.main( + config_path="../../../configs/default/anakin", + config_name="default_ff_mappo.yaml", + version_base="1.2", +) def hydra_entry_point(cfg: DictConfig) -> float: """Experiment entry point.""" # Allow dynamic attributes. OmegaConf.set_struct(cfg, False) + cfg.logger.system_name = "ff_mappo" # Run experiment. eval_performance = run_experiment(cfg) diff --git a/mava/systems/ppo/anakin/rec_ippo.py b/mava/systems/ppo/anakin/rec_ippo.py index f94981875..72f02e859 100644 --- a/mava/systems/ppo/anakin/rec_ippo.py +++ b/mava/systems/ppo/anakin/rec_ippo.py @@ -721,11 +721,16 @@ def run_experiment(_config: DictConfig) -> float: return eval_performance -@hydra.main(config_path="../../../configs", config_name="default_rec_ippo.yaml", version_base="1.2") +@hydra.main( + config_path="../../../configs/default/anakin", + config_name="default_rec_ippo.yaml", + version_base="1.2", +) def hydra_entry_point(cfg: DictConfig) -> float: """Experiment entry point.""" # Allow dynamic attributes. OmegaConf.set_struct(cfg, False) + cfg.logger.system_name = "rec_ippo" # Run experiment. eval_performance = run_experiment(cfg) diff --git a/mava/systems/ppo/anakin/rec_mappo.py b/mava/systems/ppo/anakin/rec_mappo.py index 395df7749..aa1178912 100644 --- a/mava/systems/ppo/anakin/rec_mappo.py +++ b/mava/systems/ppo/anakin/rec_mappo.py @@ -716,12 +716,15 @@ def run_experiment(_config: DictConfig) -> float: @hydra.main( - config_path="../../../configs", config_name="default_rec_mappo.yaml", version_base="1.2" + config_path="../../../configs/default/anakin", + config_name="default_rec_mappo.yaml", + version_base="1.2", ) def hydra_entry_point(cfg: DictConfig) -> float: """Experiment entry point.""" # Allow dynamic attributes. OmegaConf.set_struct(cfg, False) + cfg.logger.system_name = "rec_mappo" # Run experiment. eval_performance = run_experiment(cfg) diff --git a/mava/systems/q_learning/anakin/rec_iql.py b/mava/systems/q_learning/anakin/rec_iql.py index fb71cbb43..73a91e8d2 100644 --- a/mava/systems/q_learning/anakin/rec_iql.py +++ b/mava/systems/q_learning/anakin/rec_iql.py @@ -658,11 +658,16 @@ def eval_act_fn( return float(eval_performance) -@hydra.main(config_path="../../../configs", config_name="default_rec_iql.yaml", version_base="1.2") +@hydra.main( + config_path="../../../configs/default/anakin", + config_name="default_rec_iql.yaml", + version_base="1.2", +) def hydra_entry_point(cfg: DictConfig) -> float: """Experiment entry point.""" # Allow dynamic attributes. OmegaConf.set_struct(cfg, False) + cfg.logger.system_name = "rec_iql" # Run experiment. final_return = run_experiment(cfg) diff --git a/mava/systems/sac/anakin/ff_isac.py b/mava/systems/sac/anakin/ff_isac.py index ed6186ac2..70271f2f3 100644 --- a/mava/systems/sac/anakin/ff_isac.py +++ b/mava/systems/sac/anakin/ff_isac.py @@ -602,11 +602,16 @@ def run_experiment(cfg: DictConfig) -> float: return eval_performance -@hydra.main(config_path="../../../configs", config_name="default_ff_isac.yaml", version_base="1.2") +@hydra.main( + config_path="../../../configs/default/anakin", + config_name="default_ff_isac.yaml", + version_base="1.2", +) def hydra_entry_point(cfg: DictConfig) -> float: """Experiment entry point.""" # Allow dynamic attributes. OmegaConf.set_struct(cfg, False) + cfg.logger.system_name = "ff_isac" # Run experiment. final_return = run_experiment(cfg) diff --git a/mava/systems/sac/anakin/ff_masac.py b/mava/systems/sac/anakin/ff_masac.py index cd1f9d76d..6dc2f244c 100644 --- a/mava/systems/sac/anakin/ff_masac.py +++ b/mava/systems/sac/anakin/ff_masac.py @@ -621,11 +621,16 @@ def run_experiment(cfg: DictConfig) -> float: return eval_performance -@hydra.main(config_path="../../../configs", config_name="default_ff_masac.yaml", version_base="1.2") +@hydra.main( + config_path="../../../configs/default/anakin", + config_name="default_ff_masac.yaml", + version_base="1.2", +) def hydra_entry_point(cfg: DictConfig) -> float: """Experiment entry point.""" # Allow dynamic attributes. OmegaConf.set_struct(cfg, False) + cfg.logger.system_name = "ff_masac" # Run experiment. final_return = run_experiment(cfg) diff --git a/test/integration_test.py b/test/integration_test.py index b0daad0e1..42f20c084 100644 --- a/test/integration_test.py +++ b/test/integration_test.py @@ -23,6 +23,8 @@ # system run all envs, but each env and each system is run at least once. # For each system we select a random environment to run. # Then for each environment we select a random system to run. +anakin_config_path = "../mava/configs/default/anakin" + ppo_systems = [ "ppo.anakin.ff_ippo", "ppo.anakin.ff_mappo", @@ -67,7 +69,7 @@ def test_ppo_system(fast_config: dict, system_path: str) -> None: _, _, system_name = system_path.split(".") env = random.choice(discrete_envs) - with initialize(version_base=None, config_path="../mava/configs/"): + with initialize(version_base=None, config_path=anakin_config_path): cfg = compose(config_name=f"default_{system_name}", overrides=[f"env={env}"]) cfg = _get_fast_config(cfg, fast_config) @@ -80,7 +82,7 @@ def test_q_learning_system(fast_config: dict, system_path: str) -> None: _, _, system_name = system_path.split(".") env = random.choice(discrete_envs) - with initialize(version_base=None, config_path="../mava/configs/"): + with initialize(version_base=None, config_path=anakin_config_path): cfg = compose(config_name=f"default_{system_name}", overrides=[f"env={env}"]) cfg = _get_fast_config(cfg, fast_config) @@ -93,7 +95,7 @@ def test_sac_system(fast_config: dict, system_path: str) -> None: _, _, system_name = system_path.split(".") env = random.choice(continuous_envs) - with initialize(version_base=None, config_path="../mava/configs/"): + with initialize(version_base=None, config_path=anakin_config_path): cfg = compose(config_name=f"default_{system_name}", overrides=[f"env={env}"]) cfg = _get_fast_config(cfg, fast_config) @@ -106,7 +108,7 @@ def test_discrete_env(fast_config: dict, env_name: str) -> None: system_path = random.choice(ppo_systems + q_learning_systems) _, _, system_name = system_path.split(".") - with initialize(version_base=None, config_path="../mava/configs/"): + with initialize(version_base=None, config_path=anakin_config_path): cfg = compose(config_name=f"default_{system_name}", overrides=[f"env={env_name}"]) cfg = _get_fast_config(cfg, fast_config) @@ -122,7 +124,7 @@ def test_discrete_cnn_env(fast_config: dict, env_name: str) -> None: network = "cnn" if "ff" in system_name else "rcnn" overrides = [f"env={env_name}", f"network={network}"] - with initialize(version_base=None, config_path="../mava/configs/"): + with initialize(version_base=None, config_path=anakin_config_path): cfg = compose(config_name=f"default_{system_name}", overrides=overrides) cfg = _get_fast_config(cfg, fast_config) @@ -138,7 +140,7 @@ def test_continuous_env(fast_config: dict, env_name: str) -> None: _, _, system_name = system_path.split(".") overrides = [f"env={env_name}", "network=continuous_mlp"] - with initialize(version_base=None, config_path="../mava/configs/"): + with initialize(version_base=None, config_path=anakin_config_path): cfg = compose(config_name=f"default_{system_name}", overrides=overrides) cfg = _get_fast_config(cfg, fast_config) From 301acee4f2cb443ea48e1a131acd5bc8a915cff0 Mon Sep 17 00:00:00 2001 From: WiemKhlifi Date: Thu, 10 Oct 2024 09:46:21 +0100 Subject: [PATCH 2/9] chore: edit systems defaults --- .../ff_ippo_store_experience.py | 2 +- .../default_ff_ippo.yaml => ff_ippo.yaml} | 0 .../default_ff_isac.yaml => ff_isac.yaml} | 0 .../default_ff_mappo.yaml => ff_mappo.yaml} | 0 .../default_ff_masac.yaml => ff_masac.yaml} | 0 .../default_rec_ippo.yaml => rec_ippo.yaml} | 0 .../default_rec_iql.yaml => rec_iql.yaml} | 0 .../default_rec_mappo.yaml => rec_mappo.yaml} | 0 mava/systems/ppo/anakin/ff_ippo.py | 4 +-- mava/systems/ppo/anakin/ff_mappo.py | 4 +-- mava/systems/ppo/anakin/rec_ippo.py | 4 +-- mava/systems/ppo/anakin/rec_mappo.py | 4 +-- mava/systems/q_learning/anakin/rec_iql.py | 4 +-- mava/systems/sac/anakin/ff_isac.py | 4 +-- mava/systems/sac/anakin/ff_masac.py | 4 +-- test/integration_test.py | 26 +++++++++---------- 16 files changed, 28 insertions(+), 28 deletions(-) rename mava/configs/default/{anakin/default_ff_ippo.yaml => ff_ippo.yaml} (100%) rename mava/configs/default/{anakin/default_ff_isac.yaml => ff_isac.yaml} (100%) rename mava/configs/default/{anakin/default_ff_mappo.yaml => ff_mappo.yaml} (100%) rename mava/configs/default/{anakin/default_ff_masac.yaml => ff_masac.yaml} (100%) rename mava/configs/default/{anakin/default_rec_ippo.yaml => rec_ippo.yaml} (100%) rename mava/configs/default/{anakin/default_rec_iql.yaml => rec_iql.yaml} (100%) rename mava/configs/default/{anakin/default_rec_mappo.yaml => rec_mappo.yaml} (100%) diff --git a/mava/advanced_usage/ff_ippo_store_experience.py b/mava/advanced_usage/ff_ippo_store_experience.py index 588003fd3..8f3297e10 100644 --- a/mava/advanced_usage/ff_ippo_store_experience.py +++ b/mava/advanced_usage/ff_ippo_store_experience.py @@ -670,7 +670,7 @@ def _reshape_experience(experience: Dict[str, chex.Array]) -> Dict[str, chex.Arr logger.stop() -@hydra.main(config_path="../configs", config_name="default_ff_ippo.yaml", version_base="1.2") +@hydra.main(config_path="../configs", config_name="ff_ippo.yaml", version_base="1.2") def hydra_entry_point(cfg: DictConfig) -> None: """Experiment entry point.""" # Allow dynamic attributes. diff --git a/mava/configs/default/anakin/default_ff_ippo.yaml b/mava/configs/default/ff_ippo.yaml similarity index 100% rename from mava/configs/default/anakin/default_ff_ippo.yaml rename to mava/configs/default/ff_ippo.yaml diff --git a/mava/configs/default/anakin/default_ff_isac.yaml b/mava/configs/default/ff_isac.yaml similarity index 100% rename from mava/configs/default/anakin/default_ff_isac.yaml rename to mava/configs/default/ff_isac.yaml diff --git a/mava/configs/default/anakin/default_ff_mappo.yaml b/mava/configs/default/ff_mappo.yaml similarity index 100% rename from mava/configs/default/anakin/default_ff_mappo.yaml rename to mava/configs/default/ff_mappo.yaml diff --git a/mava/configs/default/anakin/default_ff_masac.yaml b/mava/configs/default/ff_masac.yaml similarity index 100% rename from mava/configs/default/anakin/default_ff_masac.yaml rename to mava/configs/default/ff_masac.yaml diff --git a/mava/configs/default/anakin/default_rec_ippo.yaml b/mava/configs/default/rec_ippo.yaml similarity index 100% rename from mava/configs/default/anakin/default_rec_ippo.yaml rename to mava/configs/default/rec_ippo.yaml diff --git a/mava/configs/default/anakin/default_rec_iql.yaml b/mava/configs/default/rec_iql.yaml similarity index 100% rename from mava/configs/default/anakin/default_rec_iql.yaml rename to mava/configs/default/rec_iql.yaml diff --git a/mava/configs/default/anakin/default_rec_mappo.yaml b/mava/configs/default/rec_mappo.yaml similarity index 100% rename from mava/configs/default/anakin/default_rec_mappo.yaml rename to mava/configs/default/rec_mappo.yaml diff --git a/mava/systems/ppo/anakin/ff_ippo.py b/mava/systems/ppo/anakin/ff_ippo.py index 8738c2410..59f824f96 100644 --- a/mava/systems/ppo/anakin/ff_ippo.py +++ b/mava/systems/ppo/anakin/ff_ippo.py @@ -571,8 +571,8 @@ def run_experiment(_config: DictConfig) -> float: @hydra.main( - config_path="../../../configs/default/anakin", - config_name="default_ff_ippo.yaml", + config_path="../../../configs/default/", + config_name="ff_ippo.yaml", version_base="1.2", ) def hydra_entry_point(cfg: DictConfig) -> float: diff --git a/mava/systems/ppo/anakin/ff_mappo.py b/mava/systems/ppo/anakin/ff_mappo.py index 2acd4cf6e..8200be0f1 100644 --- a/mava/systems/ppo/anakin/ff_mappo.py +++ b/mava/systems/ppo/anakin/ff_mappo.py @@ -554,8 +554,8 @@ def run_experiment(_config: DictConfig) -> float: @hydra.main( - config_path="../../../configs/default/anakin", - config_name="default_ff_mappo.yaml", + config_path="../../../configs/default/", + config_name="ff_mappo.yaml", version_base="1.2", ) def hydra_entry_point(cfg: DictConfig) -> float: diff --git a/mava/systems/ppo/anakin/rec_ippo.py b/mava/systems/ppo/anakin/rec_ippo.py index 72f02e859..03bd67510 100644 --- a/mava/systems/ppo/anakin/rec_ippo.py +++ b/mava/systems/ppo/anakin/rec_ippo.py @@ -722,8 +722,8 @@ def run_experiment(_config: DictConfig) -> float: @hydra.main( - config_path="../../../configs/default/anakin", - config_name="default_rec_ippo.yaml", + config_path="../../../configs/default/", + config_name="rec_ippo.yaml", version_base="1.2", ) def hydra_entry_point(cfg: DictConfig) -> float: diff --git a/mava/systems/ppo/anakin/rec_mappo.py b/mava/systems/ppo/anakin/rec_mappo.py index aa1178912..291d35497 100644 --- a/mava/systems/ppo/anakin/rec_mappo.py +++ b/mava/systems/ppo/anakin/rec_mappo.py @@ -716,8 +716,8 @@ def run_experiment(_config: DictConfig) -> float: @hydra.main( - config_path="../../../configs/default/anakin", - config_name="default_rec_mappo.yaml", + config_path="../../../configs/default/", + config_name="rec_mappo.yaml", version_base="1.2", ) def hydra_entry_point(cfg: DictConfig) -> float: diff --git a/mava/systems/q_learning/anakin/rec_iql.py b/mava/systems/q_learning/anakin/rec_iql.py index 73a91e8d2..b760b3f68 100644 --- a/mava/systems/q_learning/anakin/rec_iql.py +++ b/mava/systems/q_learning/anakin/rec_iql.py @@ -659,8 +659,8 @@ def eval_act_fn( @hydra.main( - config_path="../../../configs/default/anakin", - config_name="default_rec_iql.yaml", + config_path="../../../configs/default/", + config_name="rec_iql.yaml", version_base="1.2", ) def hydra_entry_point(cfg: DictConfig) -> float: diff --git a/mava/systems/sac/anakin/ff_isac.py b/mava/systems/sac/anakin/ff_isac.py index 70271f2f3..9c158d04e 100644 --- a/mava/systems/sac/anakin/ff_isac.py +++ b/mava/systems/sac/anakin/ff_isac.py @@ -603,8 +603,8 @@ def run_experiment(cfg: DictConfig) -> float: @hydra.main( - config_path="../../../configs/default/anakin", - config_name="default_ff_isac.yaml", + config_path="../../../configs/default/", + config_name="ff_isac.yaml", version_base="1.2", ) def hydra_entry_point(cfg: DictConfig) -> float: diff --git a/mava/systems/sac/anakin/ff_masac.py b/mava/systems/sac/anakin/ff_masac.py index 6dc2f244c..605ee3378 100644 --- a/mava/systems/sac/anakin/ff_masac.py +++ b/mava/systems/sac/anakin/ff_masac.py @@ -622,8 +622,8 @@ def run_experiment(cfg: DictConfig) -> float: @hydra.main( - config_path="../../../configs/default/anakin", - config_name="default_ff_masac.yaml", + config_path="../../../configs/default/", + config_name="ff_masac.yaml", version_base="1.2", ) def hydra_entry_point(cfg: DictConfig) -> float: diff --git a/test/integration_test.py b/test/integration_test.py index 42f20c084..a9f79214a 100644 --- a/test/integration_test.py +++ b/test/integration_test.py @@ -23,7 +23,7 @@ # system run all envs, but each env and each system is run at least once. # For each system we select a random environment to run. # Then for each environment we select a random system to run. -anakin_config_path = "../mava/configs/default/anakin" +config_path = "../mava/configs/default" ppo_systems = [ "ppo.anakin.ff_ippo", @@ -69,8 +69,8 @@ def test_ppo_system(fast_config: dict, system_path: str) -> None: _, _, system_name = system_path.split(".") env = random.choice(discrete_envs) - with initialize(version_base=None, config_path=anakin_config_path): - cfg = compose(config_name=f"default_{system_name}", overrides=[f"env={env}"]) + with initialize(version_base=None, config_path=config_path): + cfg = compose(config_name=f"{system_name}", overrides=[f"env={env}"]) cfg = _get_fast_config(cfg, fast_config) _run_system(system_path, cfg) @@ -82,8 +82,8 @@ def test_q_learning_system(fast_config: dict, system_path: str) -> None: _, _, system_name = system_path.split(".") env = random.choice(discrete_envs) - with initialize(version_base=None, config_path=anakin_config_path): - cfg = compose(config_name=f"default_{system_name}", overrides=[f"env={env}"]) + with initialize(version_base=None, config_path=config_path): + cfg = compose(config_name=f"{system_name}", overrides=[f"env={env}"]) cfg = _get_fast_config(cfg, fast_config) _run_system(system_path, cfg) @@ -95,8 +95,8 @@ def test_sac_system(fast_config: dict, system_path: str) -> None: _, _, system_name = system_path.split(".") env = random.choice(continuous_envs) - with initialize(version_base=None, config_path=anakin_config_path): - cfg = compose(config_name=f"default_{system_name}", overrides=[f"env={env}"]) + with initialize(version_base=None, config_path=config_path): + cfg = compose(config_name=f"{system_name}", overrides=[f"env={env}"]) cfg = _get_fast_config(cfg, fast_config) _run_system(system_path, cfg) @@ -108,8 +108,8 @@ def test_discrete_env(fast_config: dict, env_name: str) -> None: system_path = random.choice(ppo_systems + q_learning_systems) _, _, system_name = system_path.split(".") - with initialize(version_base=None, config_path=anakin_config_path): - cfg = compose(config_name=f"default_{system_name}", overrides=[f"env={env_name}"]) + with initialize(version_base=None, config_path=config_path): + cfg = compose(config_name=f"{system_name}", overrides=[f"env={env_name}"]) cfg = _get_fast_config(cfg, fast_config) _run_system(system_path, cfg) @@ -124,8 +124,8 @@ def test_discrete_cnn_env(fast_config: dict, env_name: str) -> None: network = "cnn" if "ff" in system_name else "rcnn" overrides = [f"env={env_name}", f"network={network}"] - with initialize(version_base=None, config_path=anakin_config_path): - cfg = compose(config_name=f"default_{system_name}", overrides=overrides) + with initialize(version_base=None, config_path=config_path): + cfg = compose(config_name=f"{system_name}", overrides=overrides) cfg = _get_fast_config(cfg, fast_config) _run_system(system_path, cfg) @@ -140,8 +140,8 @@ def test_continuous_env(fast_config: dict, env_name: str) -> None: _, _, system_name = system_path.split(".") overrides = [f"env={env_name}", "network=continuous_mlp"] - with initialize(version_base=None, config_path=anakin_config_path): - cfg = compose(config_name=f"default_{system_name}", overrides=overrides) + with initialize(version_base=None, config_path=config_path): + cfg = compose(config_name=f"{system_name}", overrides=overrides) cfg = _get_fast_config(cfg, fast_config) _run_system(system_path, cfg) From 80aece48ca5543e71dd102f9f6c4dd3a2b3121f0 Mon Sep 17 00:00:00 2001 From: WiemKhlifi Date: Thu, 10 Oct 2024 10:20:58 +0100 Subject: [PATCH 3/9] chore: update config for ff_ippo_store_experience.py --- mava/advanced_usage/ff_ippo_store_experience.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mava/advanced_usage/ff_ippo_store_experience.py b/mava/advanced_usage/ff_ippo_store_experience.py index 8f3297e10..332a8586d 100644 --- a/mava/advanced_usage/ff_ippo_store_experience.py +++ b/mava/advanced_usage/ff_ippo_store_experience.py @@ -675,6 +675,7 @@ def hydra_entry_point(cfg: DictConfig) -> None: """Experiment entry point.""" # Allow dynamic attributes. OmegaConf.set_struct(cfg, False) + cfg.logger.system_name = "ff_ippo" # Run experiment. run_experiment(cfg) From 6efc5ae1f2d5c87f4b59d973fd6bb50942c02c7e Mon Sep 17 00:00:00 2001 From: WiemKhlifi Date: Thu, 10 Oct 2024 10:22:26 +0100 Subject: [PATCH 4/9] chore: update config for ff_ippo_store_experience.py --- mava/advanced_usage/ff_ippo_store_experience.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mava/advanced_usage/ff_ippo_store_experience.py b/mava/advanced_usage/ff_ippo_store_experience.py index 332a8586d..3338e970a 100644 --- a/mava/advanced_usage/ff_ippo_store_experience.py +++ b/mava/advanced_usage/ff_ippo_store_experience.py @@ -670,7 +670,7 @@ def _reshape_experience(experience: Dict[str, chex.Array]) -> Dict[str, chex.Arr logger.stop() -@hydra.main(config_path="../configs", config_name="ff_ippo.yaml", version_base="1.2") +@hydra.main(config_path="../configs/default", config_name="ff_ippo.yaml", version_base="1.2") def hydra_entry_point(cfg: DictConfig) -> None: """Experiment entry point.""" # Allow dynamic attributes. From a861c9f33432e8d6dd46fd1188c12e9d085778db Mon Sep 17 00:00:00 2001 From: WiemKhlifi Date: Thu, 10 Oct 2024 12:34:27 +0100 Subject: [PATCH 5/9] chore: small edits --- mava/systems/ppo/anakin/ff_ippo.py | 2 +- mava/systems/ppo/anakin/ff_mappo.py | 2 +- mava/systems/ppo/anakin/rec_ippo.py | 2 +- mava/systems/ppo/anakin/rec_mappo.py | 2 +- mava/systems/q_learning/anakin/rec_iql.py | 2 +- mava/systems/sac/anakin/ff_isac.py | 2 +- mava/systems/sac/anakin/ff_masac.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mava/systems/ppo/anakin/ff_ippo.py b/mava/systems/ppo/anakin/ff_ippo.py index 59f824f96..9fddad868 100644 --- a/mava/systems/ppo/anakin/ff_ippo.py +++ b/mava/systems/ppo/anakin/ff_ippo.py @@ -571,7 +571,7 @@ def run_experiment(_config: DictConfig) -> float: @hydra.main( - config_path="../../../configs/default/", + config_path="../../../configs/default", config_name="ff_ippo.yaml", version_base="1.2", ) diff --git a/mava/systems/ppo/anakin/ff_mappo.py b/mava/systems/ppo/anakin/ff_mappo.py index 8200be0f1..8728e3c16 100644 --- a/mava/systems/ppo/anakin/ff_mappo.py +++ b/mava/systems/ppo/anakin/ff_mappo.py @@ -554,7 +554,7 @@ def run_experiment(_config: DictConfig) -> float: @hydra.main( - config_path="../../../configs/default/", + config_path="../../../configs/default", config_name="ff_mappo.yaml", version_base="1.2", ) diff --git a/mava/systems/ppo/anakin/rec_ippo.py b/mava/systems/ppo/anakin/rec_ippo.py index 03bd67510..e185e9ea1 100644 --- a/mava/systems/ppo/anakin/rec_ippo.py +++ b/mava/systems/ppo/anakin/rec_ippo.py @@ -722,7 +722,7 @@ def run_experiment(_config: DictConfig) -> float: @hydra.main( - config_path="../../../configs/default/", + config_path="../../../configs/default", config_name="rec_ippo.yaml", version_base="1.2", ) diff --git a/mava/systems/ppo/anakin/rec_mappo.py b/mava/systems/ppo/anakin/rec_mappo.py index 291d35497..a28ef36eb 100644 --- a/mava/systems/ppo/anakin/rec_mappo.py +++ b/mava/systems/ppo/anakin/rec_mappo.py @@ -716,7 +716,7 @@ def run_experiment(_config: DictConfig) -> float: @hydra.main( - config_path="../../../configs/default/", + config_path="../../../configs/default", config_name="rec_mappo.yaml", version_base="1.2", ) diff --git a/mava/systems/q_learning/anakin/rec_iql.py b/mava/systems/q_learning/anakin/rec_iql.py index b760b3f68..2a3c9783c 100644 --- a/mava/systems/q_learning/anakin/rec_iql.py +++ b/mava/systems/q_learning/anakin/rec_iql.py @@ -659,7 +659,7 @@ def eval_act_fn( @hydra.main( - config_path="../../../configs/default/", + config_path="../../../configs/default", config_name="rec_iql.yaml", version_base="1.2", ) diff --git a/mava/systems/sac/anakin/ff_isac.py b/mava/systems/sac/anakin/ff_isac.py index 9c158d04e..a3a4d3430 100644 --- a/mava/systems/sac/anakin/ff_isac.py +++ b/mava/systems/sac/anakin/ff_isac.py @@ -603,7 +603,7 @@ def run_experiment(cfg: DictConfig) -> float: @hydra.main( - config_path="../../../configs/default/", + config_path="../../../configs/default", config_name="ff_isac.yaml", version_base="1.2", ) diff --git a/mava/systems/sac/anakin/ff_masac.py b/mava/systems/sac/anakin/ff_masac.py index 605ee3378..d006bb250 100644 --- a/mava/systems/sac/anakin/ff_masac.py +++ b/mava/systems/sac/anakin/ff_masac.py @@ -622,7 +622,7 @@ def run_experiment(cfg: DictConfig) -> float: @hydra.main( - config_path="../../../configs/default/", + config_path="../../../configs/default", config_name="ff_masac.yaml", version_base="1.2", ) From 8dc660f6f571ba728442701ddd27ce061fcdf208 Mon Sep 17 00:00:00 2001 From: WiemKhlifi Date: Thu, 10 Oct 2024 14:42:37 +0100 Subject: [PATCH 6/9] chore: renaming logger --- mava/configs/default/ff_ippo.yaml | 2 +- mava/configs/default/ff_isac.yaml | 2 +- mava/configs/default/ff_mappo.yaml | 2 +- mava/configs/default/ff_masac.yaml | 2 +- mava/configs/default/rec_ippo.yaml | 2 +- mava/configs/default/rec_iql.yaml | 2 +- mava/configs/default/rec_mappo.yaml | 2 +- mava/configs/logger/{base_logger.yaml => logger.yaml} | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename mava/configs/logger/{base_logger.yaml => logger.yaml} (100%) diff --git a/mava/configs/default/ff_ippo.yaml b/mava/configs/default/ff_ippo.yaml index e9a56a341..1f3619a7d 100644 --- a/mava/configs/default/ff_ippo.yaml +++ b/mava/configs/default/ff_ippo.yaml @@ -1,5 +1,5 @@ defaults: - - logger: base_logger + - logger: logger - arch: anakin - system: ppo/ff_ippo - network: mlp # [mlp, continuous_mlp, cnn] diff --git a/mava/configs/default/ff_isac.yaml b/mava/configs/default/ff_isac.yaml index b35239aa0..73150ff31 100644 --- a/mava/configs/default/ff_isac.yaml +++ b/mava/configs/default/ff_isac.yaml @@ -1,6 +1,6 @@ defaults: - _self_ - - logger: base_logger + - logger: logger - arch: anakin - system: sac/ff_isac - network: continuous_mlp # [continuous_mlp] diff --git a/mava/configs/default/ff_mappo.yaml b/mava/configs/default/ff_mappo.yaml index fbb7238c2..45c6bf2d9 100644 --- a/mava/configs/default/ff_mappo.yaml +++ b/mava/configs/default/ff_mappo.yaml @@ -1,5 +1,5 @@ defaults: - - logger: base_logger + - logger: logger - arch: anakin - system: ppo/ff_mappo - network: mlp # [mlp, continuous_mlp, cnn] diff --git a/mava/configs/default/ff_masac.yaml b/mava/configs/default/ff_masac.yaml index 596fe03fa..061f569f7 100644 --- a/mava/configs/default/ff_masac.yaml +++ b/mava/configs/default/ff_masac.yaml @@ -1,6 +1,6 @@ defaults: - _self_ - - logger: base_logger + - logger: logger - arch: anakin - system: sac/ff_masac - network: continuous_mlp # [continuous_mlp] diff --git a/mava/configs/default/rec_ippo.yaml b/mava/configs/default/rec_ippo.yaml index d1eddaa4c..71208d0c2 100644 --- a/mava/configs/default/rec_ippo.yaml +++ b/mava/configs/default/rec_ippo.yaml @@ -1,5 +1,5 @@ defaults: - - logger: base_logger + - logger: logger - arch: anakin - system: ppo/rec_ippo - network: rnn # [rnn, rcnn] diff --git a/mava/configs/default/rec_iql.yaml b/mava/configs/default/rec_iql.yaml index 7ac07bdf2..7d805699a 100644 --- a/mava/configs/default/rec_iql.yaml +++ b/mava/configs/default/rec_iql.yaml @@ -1,6 +1,6 @@ defaults: - _self_ - - logger: base_logger + - logger: logger - arch: anakin - system: q_learning/rec_iql - network: rnn # [rnn, rcnn] diff --git a/mava/configs/default/rec_mappo.yaml b/mava/configs/default/rec_mappo.yaml index 38a86e10a..72d96f0fc 100644 --- a/mava/configs/default/rec_mappo.yaml +++ b/mava/configs/default/rec_mappo.yaml @@ -1,5 +1,5 @@ defaults: - - logger: base_logger + - logger: logger - arch: anakin - system: ppo/rec_mappo - network: rnn # [rnn, rcnn] diff --git a/mava/configs/logger/base_logger.yaml b/mava/configs/logger/logger.yaml similarity index 100% rename from mava/configs/logger/base_logger.yaml rename to mava/configs/logger/logger.yaml From f29352d0af421d5f9b9ac2649400b330315b0624 Mon Sep 17 00:00:00 2001 From: WiemKhlifi Date: Thu, 10 Oct 2024 15:21:43 +0100 Subject: [PATCH 7/9] chore: testing jumanji --- mava/configs/default/ff_ippo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mava/configs/default/ff_ippo.yaml b/mava/configs/default/ff_ippo.yaml index 1f3619a7d..ab7efdcc1 100644 --- a/mava/configs/default/ff_ippo.yaml +++ b/mava/configs/default/ff_ippo.yaml @@ -3,7 +3,7 @@ defaults: - arch: anakin - system: ppo/ff_ippo - network: mlp # [mlp, continuous_mlp, cnn] - - env: rware # [cleaner, connector, gigastep, lbf, mabrax, matrax, rware, smax] + - env: rware # [cleaner, connector, gigastep, lbf, mabrax, matrax, rware, smax] # note: to test jumanji - _self_ hydra: From 38d1f5c45f925a6b58352cd2c9fa49ca2b91b277 Mon Sep 17 00:00:00 2001 From: WiemKhlifi Date: Thu, 10 Oct 2024 15:26:51 +0100 Subject: [PATCH 8/9] chore: testing jumanji --- mava/configs/default/ff_ippo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mava/configs/default/ff_ippo.yaml b/mava/configs/default/ff_ippo.yaml index ab7efdcc1..1f3619a7d 100644 --- a/mava/configs/default/ff_ippo.yaml +++ b/mava/configs/default/ff_ippo.yaml @@ -3,7 +3,7 @@ defaults: - arch: anakin - system: ppo/ff_ippo - network: mlp # [mlp, continuous_mlp, cnn] - - env: rware # [cleaner, connector, gigastep, lbf, mabrax, matrax, rware, smax] # note: to test jumanji + - env: rware # [cleaner, connector, gigastep, lbf, mabrax, matrax, rware, smax] - _self_ hydra: From d49a2acd6f6a1618f77006cfa218c96af4e3ec9e Mon Sep 17 00:00:00 2001 From: WiemKhlifi Date: Thu, 10 Oct 2024 16:07:17 +0100 Subject: [PATCH 9/9] chore: pin to old the version of jumanji --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 8dbcaeca9..ad22099e4 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -9,7 +9,7 @@ id-marl-eval @ git+https://github.com/instadeepai/marl-eval jax==0.4.30 jaxlib==0.4.30 jaxmarl -jumanji @ git+https://github.com/sash-a/jumanji # Includes a few extra MARL envs +jumanji @ git+https://github.com/sash-a/jumanji@old_jumanji # Includes a few extra MARL envs matrax @ git+https://github.com/instadeepai/matrax mujoco==3.1.3 mujoco-mjx==3.1.3