From 0babcf23d1ad6e0d94cbb33a3a8f90cc3d0ac04f Mon Sep 17 00:00:00 2001 From: RuanJohn Date: Wed, 16 Feb 2022 08:51:00 +0200 Subject: [PATCH 1/4] Fixed archecture_type typo in network.py files --- mava/systems/tf/mad4pg/networks.py | 6 +++--- mava/systems/tf/maddpg/networks.py | 12 ++++++------ mava/systems/tf/madqn/networks.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mava/systems/tf/mad4pg/networks.py b/mava/systems/tf/mad4pg/networks.py index 2f9046052..8b8daf5a7 100644 --- a/mava/systems/tf/mad4pg/networks.py +++ b/mava/systems/tf/mad4pg/networks.py @@ -37,7 +37,7 @@ def make_default_networks( policy_networks_layer_sizes: Union[Dict[str, Sequence], Sequence] = None, critic_networks_layer_sizes: Union[Dict[str, Sequence], Sequence] = (512, 512, 256), sigma: float = 0.3, - archecture_type: ArchitectureType = ArchitectureType.feedforward, + architecture_type: ArchitectureType = ArchitectureType.feedforward, num_atoms: int = 51, seed: Optional[int] = None, ) -> Mapping[str, types.TensorTransformation]: @@ -54,7 +54,7 @@ def make_default_networks( critic_networks_layer_sizes: size of critic networks. sigma: hyperparameters used to add Gaussian noise for simple exploration. Defaults to 0.3. - archecture_type: archecture used + architecture_type: architecture used for agent networks. Can be feedforward or recurrent. Defaults to ArchitectureType.feedforward. @@ -77,7 +77,7 @@ def make_default_networks( policy_networks_layer_sizes=policy_networks_layer_sizes, critic_networks_layer_sizes=critic_networks_layer_sizes, sigma=sigma, - archecture_type=archecture_type, + architecture_type=architecture_type, vmin=vmin, vmax=vmax, num_atoms=num_atoms, diff --git a/mava/systems/tf/maddpg/networks.py b/mava/systems/tf/maddpg/networks.py index 2336eef98..0e134872c 100644 --- a/mava/systems/tf/maddpg/networks.py +++ b/mava/systems/tf/maddpg/networks.py @@ -38,7 +38,7 @@ def make_default_networks( policy_networks_layer_sizes: Union[Dict[str, Sequence], Sequence] = None, critic_networks_layer_sizes: Union[Dict[str, Sequence], Sequence] = (512, 512, 256), sigma: float = 0.3, - archecture_type: ArchitectureType = ArchitectureType.feedforward, + architecture_type: ArchitectureType = ArchitectureType.feedforward, vmin: Optional[float] = None, vmax: Optional[float] = None, num_atoms: Optional[int] = None, @@ -57,7 +57,7 @@ def make_default_networks( critic_networks_layer_sizes: size of critic networks. sigma: hyperparameters used to add Gaussian noise for simple exploration. Defaults to 0.3. - archecture_type: archecture used + architecture_type: architecture used for agent networks. Can be feedforward or recurrent. Defaults to ArchitectureType.feedforward. @@ -70,7 +70,7 @@ def make_default_networks( """ # Set Policy function and layer size # Default size per arch type. - if archecture_type == ArchitectureType.feedforward: + if architecture_type == ArchitectureType.feedforward: if not policy_networks_layer_sizes: policy_networks_layer_sizes = ( 256, @@ -78,7 +78,7 @@ def make_default_networks( 256, ) policy_network_func = snt.Sequential - elif archecture_type == ArchitectureType.recurrent: + elif architecture_type == ArchitectureType.recurrent: if not policy_networks_layer_sizes: policy_networks_layer_sizes = (128, 128) policy_network_func = snt.DeepRNN @@ -130,13 +130,13 @@ def make_default_networks( # An optional network to process observations observation_network = tf2_utils.to_sonnet_module(tf.identity) # Create the policy network. - if archecture_type == ArchitectureType.feedforward: + if architecture_type == ArchitectureType.feedforward: policy_network = [ networks.LayerNormMLP( policy_networks_layer_sizes[key], activate_final=True, seed=seed ), ] - elif archecture_type == ArchitectureType.recurrent: + elif architecture_type == ArchitectureType.recurrent: policy_network = [ networks.LayerNormMLP( policy_networks_layer_sizes[key][:-1], diff --git a/mava/systems/tf/madqn/networks.py b/mava/systems/tf/madqn/networks.py index ec4615acf..5aee4201c 100644 --- a/mava/systems/tf/madqn/networks.py +++ b/mava/systems/tf/madqn/networks.py @@ -49,7 +49,7 @@ def make_default_networks( agent_net_keys: specifies what network each agent uses. net_spec_keys: specifies the specs of each network. value_networks_layer_sizes: size of value networks. - archecture_type: archecture used + architecture_type: architecture used for agent networks. Can be feedforward or recurrent. Defaults to ArchitectureType.feedforward. seed: random seed for network initialization. From 28beb4b9fe19cabc98d6e24db4bac370e41a8d99 Mon Sep 17 00:00:00 2001 From: RuanJohn Date: Wed, 16 Feb 2022 08:57:08 +0200 Subject: [PATCH 2/4] chore: added missing docstrings --- .../simple_spread/recurrent/decentralised/run_mad4pg.py | 7 ++++++- .../simple_spread/recurrent/decentralised/run_maddpg.py | 7 ++++++- .../simple_spread/recurrent/state_based/run_maddpg.py | 7 ++++++- .../multiwalker/recurrent/decentralised/run_maddpg.py | 8 +++++++- examples/robocup/recurrent/state_based/run_mad4pg.py | 8 +++++++- 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/examples/debugging/simple_spread/recurrent/decentralised/run_mad4pg.py b/examples/debugging/simple_spread/recurrent/decentralised/run_mad4pg.py index 4c61e78c2..d97436277 100644 --- a/examples/debugging/simple_spread/recurrent/decentralised/run_mad4pg.py +++ b/examples/debugging/simple_spread/recurrent/decentralised/run_mad4pg.py @@ -48,6 +48,11 @@ def main(_: Any) -> None: + """Run example. + + Args: + _ (Any): None + """ # Environment. environment_factory = functools.partial( @@ -61,7 +66,7 @@ def main(_: Any) -> None: mad4pg.make_default_networks, vmin=-10, vmax=50, - archecture_type=ArchitectureType.recurrent, + architecture_type=ArchitectureType.recurrent, ) # Checkpointer appends "Checkpoints" to checkpoint_dir. diff --git a/examples/debugging/simple_spread/recurrent/decentralised/run_maddpg.py b/examples/debugging/simple_spread/recurrent/decentralised/run_maddpg.py index c07ed9b72..55b40bb0b 100644 --- a/examples/debugging/simple_spread/recurrent/decentralised/run_maddpg.py +++ b/examples/debugging/simple_spread/recurrent/decentralised/run_maddpg.py @@ -48,6 +48,11 @@ def main(_: Any) -> None: + """Run example. + + Args: + _ (Any): None + """ # Environment. environment_factory = functools.partial( @@ -58,7 +63,7 @@ def main(_: Any) -> None: # Networks. network_factory = lp_utils.partial_kwargs( - maddpg.make_default_networks, archecture_type=ArchitectureType.recurrent + maddpg.make_default_networks, architecture_type=ArchitectureType.recurrent ) # Checkpointer appends "Checkpoints" to checkpoint_dir. diff --git a/examples/debugging/simple_spread/recurrent/state_based/run_maddpg.py b/examples/debugging/simple_spread/recurrent/state_based/run_maddpg.py index dff02dd2b..913535ba5 100644 --- a/examples/debugging/simple_spread/recurrent/state_based/run_maddpg.py +++ b/examples/debugging/simple_spread/recurrent/state_based/run_maddpg.py @@ -49,6 +49,11 @@ def main(_: Any) -> None: + """Run example. + + Args: + _ (Any): None + """ # Environment. environment_factory = functools.partial( @@ -60,7 +65,7 @@ def main(_: Any) -> None: # Networks. network_factory = lp_utils.partial_kwargs( - maddpg.make_default_networks, archecture_type=ArchitectureType.recurrent + maddpg.make_default_networks, architecture_type=ArchitectureType.recurrent ) # Checkpointer appends "Checkpoints" to checkpoint_dir. diff --git a/examples/petting_zoo/sisl/multiwalker/recurrent/decentralised/run_maddpg.py b/examples/petting_zoo/sisl/multiwalker/recurrent/decentralised/run_maddpg.py index 81f679a7c..0f659f29e 100644 --- a/examples/petting_zoo/sisl/multiwalker/recurrent/decentralised/run_maddpg.py +++ b/examples/petting_zoo/sisl/multiwalker/recurrent/decentralised/run_maddpg.py @@ -51,6 +51,12 @@ def main(_: Any) -> None: + """Run example. + + Args: + _ (Any): None + """ + # Environment. environment_factory = functools.partial( pettingzoo_utils.make_environment, @@ -60,7 +66,7 @@ def main(_: Any) -> None: # Networks. network_factory = lp_utils.partial_kwargs( - maddpg.make_default_networks, archecture_type=ArchitectureType.recurrent + maddpg.make_default_networks, architecture_type=ArchitectureType.recurrent ) # Checkpointer appends "Checkpoints" to checkpoint_dir. diff --git a/examples/robocup/recurrent/state_based/run_mad4pg.py b/examples/robocup/recurrent/state_based/run_mad4pg.py index 18c89d24b..c01589d7e 100644 --- a/examples/robocup/recurrent/state_based/run_mad4pg.py +++ b/examples/robocup/recurrent/state_based/run_mad4pg.py @@ -41,13 +41,19 @@ def main(_: Any) -> None: + """Run example. + + Args: + _ (Any): None + """ + # Environment. environment_factory = lp_utils.partial_kwargs(robocup_utils.make_environment) # Networks. network_factory = lp_utils.partial_kwargs( mad4pg.make_default_networks, - archecture_type=ArchitectureType.recurrent, + architecture_type=ArchitectureType.recurrent, vmin=-5, vmax=5, ) From a1fa5ea3559392d2297257ad8a84a745699c6cb8 Mon Sep 17 00:00:00 2001 From: RuanJohn Date: Wed, 16 Feb 2022 08:58:52 +0200 Subject: [PATCH 3/4] fix: fixed archecture_type typo in system tests --- tests/systems/mad4pg_system_test.py | 2 +- tests/systems/maddpg_system_test.py | 2 +- tests/systems/madqn_system_test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/systems/mad4pg_system_test.py b/tests/systems/mad4pg_system_test.py index 6189efeeb..12cb0cc1d 100644 --- a/tests/systems/mad4pg_system_test.py +++ b/tests/systems/mad4pg_system_test.py @@ -93,7 +93,7 @@ def test_recurrent_mad4pg_on_debugging_env(self) -> None: # networks network_factory = lp_utils.partial_kwargs( mad4pg.make_default_networks, - archecture_type=ArchitectureType.recurrent, + architecture_type=ArchitectureType.recurrent, policy_networks_layer_sizes=(32, 32), vmin=-10, vmax=50, diff --git a/tests/systems/maddpg_system_test.py b/tests/systems/maddpg_system_test.py index 9604a7897..def0b1bbc 100644 --- a/tests/systems/maddpg_system_test.py +++ b/tests/systems/maddpg_system_test.py @@ -92,7 +92,7 @@ def test_recurrent_maddpg_on_debugging_env(self) -> None: # networks network_factory = lp_utils.partial_kwargs( maddpg.make_default_networks, - archecture_type=ArchitectureType.recurrent, + architecture_type=ArchitectureType.recurrent, policy_networks_layer_sizes=(32, 32), ) diff --git a/tests/systems/madqn_system_test.py b/tests/systems/madqn_system_test.py index 0b4bfce5e..1f161f66d 100644 --- a/tests/systems/madqn_system_test.py +++ b/tests/systems/madqn_system_test.py @@ -95,7 +95,7 @@ def test_recurrent_madqn_on_debugging_env(self) -> None: # networks network_factory = lp_utils.partial_kwargs( madqn.make_default_networks, - architecture_type=ArchitectureType.recurrent, + architecture_typee=ArchitectureType.recurrent, value_networks_layer_sizes=(32, 32), ) From d8eb2546185b0a1f7aa445db4a2696b2377f566e Mon Sep 17 00:00:00 2001 From: RuanJohn Date: Wed, 16 Feb 2022 09:09:24 +0200 Subject: [PATCH 4/4] chore: typo fix in madqn system test --- tests/systems/madqn_system_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/systems/madqn_system_test.py b/tests/systems/madqn_system_test.py index 1f161f66d..0b4bfce5e 100644 --- a/tests/systems/madqn_system_test.py +++ b/tests/systems/madqn_system_test.py @@ -95,7 +95,7 @@ def test_recurrent_madqn_on_debugging_env(self) -> None: # networks network_factory = lp_utils.partial_kwargs( madqn.make_default_networks, - architecture_typee=ArchitectureType.recurrent, + architecture_type=ArchitectureType.recurrent, value_networks_layer_sizes=(32, 32), )