From 1e433d597765c59f541f8f5a076b6645c5652ed5 Mon Sep 17 00:00:00 2001 From: Artur Mostowski Date: Mon, 1 Feb 2021 18:52:27 +0100 Subject: [PATCH 1/4] gflags -> absl --- deepq_mineral_shards.py | 2 +- defeat_zerglings/dqfd.py | 2 +- defeat_zerglings/run_demo_agent.py | 2 +- defeat_zerglings/train.py | 2 +- enjoy_mineral_shards.py | 2 +- tests/scripted_test.py | 2 +- train_mineral_shards.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deepq_mineral_shards.py b/deepq_mineral_shards.py index fe6d6f6..22bf71e 100644 --- a/deepq_mineral_shards.py +++ b/deepq_mineral_shards.py @@ -17,7 +17,7 @@ from pysc2.lib import features from pysc2.lib import actions -import gflags as flags +from absl import flags _PLAYER_RELATIVE = features.SCREEN_FEATURES.player_relative.index _PLAYER_FRIENDLY = 1 diff --git a/defeat_zerglings/dqfd.py b/defeat_zerglings/dqfd.py index b06a36a..a4246b2 100644 --- a/defeat_zerglings/dqfd.py +++ b/defeat_zerglings/dqfd.py @@ -19,7 +19,7 @@ from defeat_zerglings import common -import gflags as flags +from absl import flags _PLAYER_RELATIVE = features.SCREEN_FEATURES.player_relative.index diff --git a/defeat_zerglings/run_demo_agent.py b/defeat_zerglings/run_demo_agent.py index c312dcc..dc8872b 100644 --- a/defeat_zerglings/run_demo_agent.py +++ b/defeat_zerglings/run_demo_agent.py @@ -1,6 +1,6 @@ import sys -import gflags as flags +from absl import flags from baselines import deepq from pysc2.env import sc2_env from pysc2.lib import actions diff --git a/defeat_zerglings/train.py b/defeat_zerglings/train.py index 731cf9d..61d6156 100644 --- a/defeat_zerglings/train.py +++ b/defeat_zerglings/train.py @@ -1,6 +1,6 @@ import sys -import gflags as flags +from absl import flags from baselines import deepq from pysc2.env import sc2_env from pysc2.lib import actions diff --git a/enjoy_mineral_shards.py b/enjoy_mineral_shards.py index 1d1ad49..217af5b 100644 --- a/enjoy_mineral_shards.py +++ b/enjoy_mineral_shards.py @@ -1,7 +1,7 @@ import sys import baselines.common.tf_util as U -import gflags as flags +from absl import flags import numpy as np from baselines import deepq from pysc2.env import environment diff --git a/tests/scripted_test.py b/tests/scripted_test.py index 2394500..f392bb6 100644 --- a/tests/scripted_test.py +++ b/tests/scripted_test.py @@ -12,7 +12,7 @@ from pysc2.lib import features from pysc2.lib import basetest -import gflags as flags +from absl import flags import sys _NO_OP = sc2_actions.FUNCTIONS.no_op.id diff --git a/train_mineral_shards.py b/train_mineral_shards.py index 79465a5..cd4b568 100644 --- a/train_mineral_shards.py +++ b/train_mineral_shards.py @@ -1,6 +1,6 @@ import sys -import gflags as flags +from absl import flags from baselines import deepq from pysc2.env import sc2_env from pysc2.lib import actions From 265b6b80e20812752f70cb059f9e4e7e9878d866 Mon Sep 17 00:00:00 2001 From: Artur Mostowski Date: Mon, 1 Feb 2021 18:54:51 +0100 Subject: [PATCH 2/4] All arguments are passed as keyword arguments. --- defeat_zerglings/run_demo_agent.py | 2 +- defeat_zerglings/train.py | 2 +- enjoy_mineral_shards.py | 2 +- tests/scripted_test.py | 2 +- train_mineral_shards.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/defeat_zerglings/run_demo_agent.py b/defeat_zerglings/run_demo_agent.py index dc8872b..386ba59 100644 --- a/defeat_zerglings/run_demo_agent.py +++ b/defeat_zerglings/run_demo_agent.py @@ -22,7 +22,7 @@ def main(): FLAGS(sys.argv) with sc2_env.SC2Env( - "DefeatZerglingsAndBanelings", + map_name="DefeatZerglingsAndBanelings", step_mul=step_mul, visualize=True, game_steps_per_episode=steps * step_mul) as env: diff --git a/defeat_zerglings/train.py b/defeat_zerglings/train.py index 61d6156..f54de11 100644 --- a/defeat_zerglings/train.py +++ b/defeat_zerglings/train.py @@ -20,7 +20,7 @@ def main(): FLAGS(sys.argv) with sc2_env.SC2Env( - "DefeatZerglingsAndBanelings", + map_name="DefeatZerglingsAndBanelings", step_mul=step_mul, visualize=True, game_steps_per_episode=steps * step_mul) as env: diff --git a/enjoy_mineral_shards.py b/enjoy_mineral_shards.py index 217af5b..2f53b08 100644 --- a/enjoy_mineral_shards.py +++ b/enjoy_mineral_shards.py @@ -31,7 +31,7 @@ def main(): FLAGS(sys.argv) with sc2_env.SC2Env( - "CollectMineralShards", + map_name="CollectMineralShards", step_mul=step_mul, visualize=True, game_steps_per_episode=steps * step_mul) as env: diff --git a/tests/scripted_test.py b/tests/scripted_test.py index f392bb6..1461b84 100644 --- a/tests/scripted_test.py +++ b/tests/scripted_test.py @@ -28,7 +28,7 @@ def test_defeat_zerglings(self): FLAGS(sys.argv) with sc2_env.SC2Env( - "DefeatZerglingsAndBanelings", + map_name="DefeatZerglingsAndBanelings", step_mul=self.step_mul, visualize=True, game_steps_per_episode=self.steps * self.step_mul) as env: diff --git a/train_mineral_shards.py b/train_mineral_shards.py index cd4b568..f93f9c1 100644 --- a/train_mineral_shards.py +++ b/train_mineral_shards.py @@ -19,7 +19,7 @@ def main(): FLAGS(sys.argv) with sc2_env.SC2Env( - "CollectMineralShards", + map_name="CollectMineralShards", step_mul=step_mul, visualize=True) as env: From cdd1d0ddb339ddf5413d75a8cf9d3c501b6f444d Mon Sep 17 00:00:00 2001 From: Artur Mostowski Date: Mon, 1 Feb 2021 18:58:48 +0100 Subject: [PATCH 3/4] specify the list of players --- defeat_zerglings/run_demo_agent.py | 1 + defeat_zerglings/train.py | 1 + enjoy_mineral_shards.py | 1 + tests/scripted_test.py | 1 + train_mineral_shards.py | 1 + 5 files changed, 5 insertions(+) diff --git a/defeat_zerglings/run_demo_agent.py b/defeat_zerglings/run_demo_agent.py index 386ba59..3c158b5 100644 --- a/defeat_zerglings/run_demo_agent.py +++ b/defeat_zerglings/run_demo_agent.py @@ -25,6 +25,7 @@ def main(): map_name="DefeatZerglingsAndBanelings", step_mul=step_mul, visualize=True, + players=[sc2_env.Agent(sc2_env.Race.terran)], game_steps_per_episode=steps * step_mul) as env: demo_replay = [] diff --git a/defeat_zerglings/train.py b/defeat_zerglings/train.py index f54de11..73a105a 100644 --- a/defeat_zerglings/train.py +++ b/defeat_zerglings/train.py @@ -23,6 +23,7 @@ def main(): map_name="DefeatZerglingsAndBanelings", step_mul=step_mul, visualize=True, + players=[sc2_env.Agent(sc2_env.Race.terran)], game_steps_per_episode=steps * step_mul) as env: model = deepq.models.cnn_to_mlp( diff --git a/enjoy_mineral_shards.py b/enjoy_mineral_shards.py index 2f53b08..339d590 100644 --- a/enjoy_mineral_shards.py +++ b/enjoy_mineral_shards.py @@ -34,6 +34,7 @@ def main(): map_name="CollectMineralShards", step_mul=step_mul, visualize=True, + players=[sc2_env.Agent(sc2_env.Race.terran)], game_steps_per_episode=steps * step_mul) as env: model = deepq.models.cnn_to_mlp( diff --git a/tests/scripted_test.py b/tests/scripted_test.py index 1461b84..ff664c3 100644 --- a/tests/scripted_test.py +++ b/tests/scripted_test.py @@ -31,6 +31,7 @@ def test_defeat_zerglings(self): map_name="DefeatZerglingsAndBanelings", step_mul=self.step_mul, visualize=True, + players=[sc2_env.Agent(sc2_env.Race.terran)], game_steps_per_episode=self.steps * self.step_mul) as env: obs = env.step(actions=[sc2_actions.FunctionCall(_NO_OP, [])]) player_relative = obs[0].observation["screen"][_PLAYER_RELATIVE] diff --git a/train_mineral_shards.py b/train_mineral_shards.py index f93f9c1..95e2e08 100644 --- a/train_mineral_shards.py +++ b/train_mineral_shards.py @@ -21,6 +21,7 @@ def main(): with sc2_env.SC2Env( map_name="CollectMineralShards", step_mul=step_mul, + players=[sc2_env.Agent(sc2_env.Race.terran)], visualize=True) as env: model = deepq.models.cnn_to_mlp( From 91c38400affa8fbe7bf9cf30ed53f872c1ec02b2 Mon Sep 17 00:00:00 2001 From: Artur Mostowski Date: Mon, 1 Feb 2021 19:01:16 +0100 Subject: [PATCH 4/4] specify agent_interface_format --- defeat_zerglings/run_demo_agent.py | 4 ++++ defeat_zerglings/train.py | 4 ++++ enjoy_mineral_shards.py | 4 ++++ tests/scripted_test.py | 4 ++++ train_mineral_shards.py | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/defeat_zerglings/run_demo_agent.py b/defeat_zerglings/run_demo_agent.py index 3c158b5..3d06252 100644 --- a/defeat_zerglings/run_demo_agent.py +++ b/defeat_zerglings/run_demo_agent.py @@ -26,6 +26,10 @@ def main(): step_mul=step_mul, visualize=True, players=[sc2_env.Agent(sc2_env.Race.terran)], + agent_interface_format=sc2_env.AgentInterfaceFormat( + feature_dimensions=sc2_env.Dimensions( + screen=64, + minimap=64)), game_steps_per_episode=steps * step_mul) as env: demo_replay = [] diff --git a/defeat_zerglings/train.py b/defeat_zerglings/train.py index 73a105a..d65b777 100644 --- a/defeat_zerglings/train.py +++ b/defeat_zerglings/train.py @@ -24,6 +24,10 @@ def main(): step_mul=step_mul, visualize=True, players=[sc2_env.Agent(sc2_env.Race.terran)], + agent_interface_format=sc2_env.AgentInterfaceFormat( + feature_dimensions=sc2_env.Dimensions( + screen=64, + minimap=64)), game_steps_per_episode=steps * step_mul) as env: model = deepq.models.cnn_to_mlp( diff --git a/enjoy_mineral_shards.py b/enjoy_mineral_shards.py index 339d590..0f6f4d5 100644 --- a/enjoy_mineral_shards.py +++ b/enjoy_mineral_shards.py @@ -35,6 +35,10 @@ def main(): step_mul=step_mul, visualize=True, players=[sc2_env.Agent(sc2_env.Race.terran)], + agent_interface_format=sc2_env.AgentInterfaceFormat( + feature_dimensions=sc2_env.Dimensions( + screen=64, + minimap=64)), game_steps_per_episode=steps * step_mul) as env: model = deepq.models.cnn_to_mlp( diff --git a/tests/scripted_test.py b/tests/scripted_test.py index ff664c3..4474384 100644 --- a/tests/scripted_test.py +++ b/tests/scripted_test.py @@ -32,6 +32,10 @@ def test_defeat_zerglings(self): step_mul=self.step_mul, visualize=True, players=[sc2_env.Agent(sc2_env.Race.terran)], + agent_interface_format=sc2_env.AgentInterfaceFormat( + feature_dimensions=sc2_env.Dimensions( + screen=64, + minimap=64)), game_steps_per_episode=self.steps * self.step_mul) as env: obs = env.step(actions=[sc2_actions.FunctionCall(_NO_OP, [])]) player_relative = obs[0].observation["screen"][_PLAYER_RELATIVE] diff --git a/train_mineral_shards.py b/train_mineral_shards.py index 95e2e08..1d0eaa5 100644 --- a/train_mineral_shards.py +++ b/train_mineral_shards.py @@ -22,6 +22,10 @@ def main(): map_name="CollectMineralShards", step_mul=step_mul, players=[sc2_env.Agent(sc2_env.Race.terran)], + agent_interface_format=sc2_env.AgentInterfaceFormat( + feature_dimensions=sc2_env.Dimensions( + screen=64, + minimap=64)), visualize=True) as env: model = deepq.models.cnn_to_mlp(