feat: Updated pettingzoo.

instadeepai · Apr 19, 2022 · ecb90a6 · ecb90a6
1 parent 7b77152
commit ecb90a6
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 14 deletions.
diff --git a/examples/tf/petting_zoo/atari/pong/recurrent/decentralised/run_madqn.py b/examples/tf/petting_zoo/atari/pong/recurrent/decentralised/run_madqn.py
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Example running recurrent MADQN on Atari Pong."""
+# You will need to install AutoRom, follow instructions in OPTIONAL_INSTALL.md.
 
 import functools
 from datetime import datetime

diff --git a/examples/tf/petting_zoo/butterfly/cooperative_pong/feedforward/decentralised/run_mappo.py b/examples/tf/petting_zoo/butterfly/cooperative_pong/feedforward/decentralised/run_mappo.py
@@ -37,7 +37,7 @@
 )
 flags.DEFINE_string(
     "env_name",
-    "cooperative_pong_v3",
+    "cooperative_pong_v5",
     "Pettingzoo environment name, e.g. pong (str).",
 )
 

diff --git a/examples/tf/petting_zoo/sisl/multiwalker/feedforward/centralised/run_maddpg.py b/examples/tf/petting_zoo/sisl/multiwalker/feedforward/centralised/run_maddpg.py
@@ -39,7 +39,7 @@
 
 flags.DEFINE_string(
     "env_name",
-    "multiwalker_v7",
+    "multiwalker_v8",
     "Pettingzoo environment name, e.g. pong (str).",
 )
 flags.DEFINE_string(

diff --git a/examples/tf/petting_zoo/sisl/multiwalker/feedforward/decentralised/run_mad4pg.py b/examples/tf/petting_zoo/sisl/multiwalker/feedforward/decentralised/run_mad4pg.py
@@ -38,7 +38,7 @@
 
 flags.DEFINE_string(
     "env_name",
-    "multiwalker_v7",
+    "multiwalker_v8",
     "Pettingzoo environment name, e.g. pong (str).",
 )
 flags.DEFINE_string(

diff --git a/examples/tf/petting_zoo/sisl/multiwalker/feedforward/decentralised/run_mad4pg_record.py b/examples/tf/petting_zoo/sisl/multiwalker/feedforward/decentralised/run_mad4pg_record.py
@@ -39,7 +39,7 @@
 
 flags.DEFINE_string(
     "env_name",
-    "multiwalker_v7",
+    "multiwalker_v8",
     "Pettingzoo environment name, e.g. pong (str).",
 )
 flags.DEFINE_string(

diff --git a/examples/tf/petting_zoo/sisl/multiwalker/feedforward/decentralised/run_maddpg.py b/examples/tf/petting_zoo/sisl/multiwalker/feedforward/decentralised/run_maddpg.py
@@ -38,7 +38,7 @@
 
 flags.DEFINE_string(
     "env_name",
-    "multiwalker_v7",
+    "multiwalker_v8",
     "Pettingzoo environment name, e.g. pong (str).",
 )
 flags.DEFINE_string(

diff --git a/examples/tf/petting_zoo/sisl/multiwalker/feedforward/decentralised/run_mappo.py b/examples/tf/petting_zoo/sisl/multiwalker/feedforward/decentralised/run_mappo.py
@@ -37,7 +37,7 @@
 
 flags.DEFINE_string(
     "env_name",
-    "multiwalker_v7",
+    "multiwalker_v8",
     "Pettingzoo environment name, e.g. pong (str).",
 )
 flags.DEFINE_string(

diff --git a/examples/tf/petting_zoo/sisl/multiwalker/recurrent/decentralised/run_mad4pg.py b/examples/tf/petting_zoo/sisl/multiwalker/recurrent/decentralised/run_mad4pg.py
@@ -39,7 +39,7 @@
 
 flags.DEFINE_string(
     "env_name",
-    "multiwalker_v7",
+    "multiwalker_v8",
     "Pettingzoo environment name, e.g. pong (str).",
 )
 flags.DEFINE_string(

diff --git a/examples/tf/petting_zoo/sisl/multiwalker/recurrent/decentralised/run_maddpg.py b/examples/tf/petting_zoo/sisl/multiwalker/recurrent/decentralised/run_maddpg.py
@@ -39,7 +39,7 @@
 
 flags.DEFINE_string(
     "env_name",
-    "multiwalker_v7",
+    "multiwalker_v8",
     "Pettingzoo environment name, e.g. pong (str).",
 )
 flags.DEFINE_string(

diff --git a/setup.py b/setup.py
@@ -47,9 +47,9 @@
 ] + tf_requirements
 
 pettingzoo_requirements = [
-    "pettingzoo~=1.13.1",
+    "pettingzoo~=1.17.0",
     "multi_agent_ale_py",
-    "supersuit==3.3.1",
+    "supersuit==3.3.4",
     "pygame",
     "pysc2",
 ]

diff --git a/tests/environment_loops/environment_loop_test.py b/tests/environment_loops/environment_loop_test.py
@@ -30,8 +30,8 @@
         # Real Environments
         EnvSpec("pettingzoo.mpe.simple_spread_v2", EnvType.Parallel),
         EnvSpec("pettingzoo.mpe.simple_spread_v2", EnvType.Sequential),
-        EnvSpec("pettingzoo.sisl.multiwalker_v7", EnvType.Parallel),
-        EnvSpec("pettingzoo.sisl.multiwalker_v7", EnvType.Sequential),
+        EnvSpec("pettingzoo.sisl.multiwalker_v8", EnvType.Parallel),
+        EnvSpec("pettingzoo.sisl.multiwalker_v8", EnvType.Sequential),
     ],
 )
 class TestEnvironmentLoop:

diff --git a/tests/wrappers/wrapper_test.py b/tests/wrappers/wrapper_test.py
@@ -47,8 +47,8 @@
     [
         EnvSpec("pettingzoo.mpe.simple_spread_v2", EnvType.Parallel),
         EnvSpec("pettingzoo.mpe.simple_spread_v2", EnvType.Sequential),
-        EnvSpec("pettingzoo.sisl.multiwalker_v7", EnvType.Parallel),
-        EnvSpec("pettingzoo.sisl.multiwalker_v7", EnvType.Sequential),
+        EnvSpec("pettingzoo.sisl.multiwalker_v8", EnvType.Parallel),
+        EnvSpec("pettingzoo.sisl.multiwalker_v8", EnvType.Sequential),
         EnvSpec("flatland", EnvType.Parallel, EnvSource.Flatland)
         if _has_flatland
         else None,