mettagrid 0.2.0.26__tar.gz → 0.2.0.27__tar.gz

{mettagrid-0.2.0.26 → mettagrid-0.2.0.27}/.bazelrc

@@ -20,15 +20,16 @@ build:dbg --compilation_mode=dbg
 build:dbg --copt=-O0
 build:dbg --copt=-g
 build:dbg --strip=never
-build:dbg --copt=-fsanitize=address
-build:dbg --copt=-fsanitize=undefined
-build:dbg --copt=-fsanitize=float-divide-by-zero
-build:dbg --copt=-fno-sanitize-recover=all
+# AddressSanitizer disabled - causes issues on macOS with Python extensions
+# build:dbg --copt=-fsanitize=address
+# build:dbg --copt=-fsanitize=undefined
+# build:dbg --copt=-fsanitize=float-divide-by-zero
+# build:dbg --copt=-fno-sanitize-recover=all
 build:dbg --copt=-fstack-protector-strong
-build:dbg --linkopt=-fsanitize=address
-build:dbg --linkopt=-fsanitize=undefined
-build:dbg --linkopt=-fsanitize=float-divide-by-zero
-build:dbg --test_env=ASAN_OPTIONS=detect_leaks=0
+# build:dbg --linkopt=-fsanitize=address
+# build:dbg --linkopt=-fsanitize=undefined
+# build:dbg --linkopt=-fsanitize=float-divide-by-zero
+# build:dbg --test_env=ASAN_OPTIONS=detect_leaks=0
 
 # Test configuration
 test --test_output=errors

{mettagrid-0.2.0.26 → mettagrid-0.2.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mettagrid
-Version: 0.2.0.26
+Version: 0.2.0.27
 Summary: A fast grid-based open-ended MARL environment
 Author-email: David Bloomin <daveey@gmail.com>
 License-Expression: MIT
@@ -59,7 +59,10 @@ when near it. The altar has a cooldown period between uses.
 
 - Using the heart altar costs `altar.use_cost energy`. So, no matter how much energy you have, you are always dumping
   the same amount of energy in it and getting the same amount of reward.
-- After the heart altar is used, it is unable to be used for altar.cooldown timesteps.
+- After the heart altar is used, it is unable to be used for the next value in
+  `altar.cooldown` (defaults to a single delay) timesteps. The cooldown field
+  accepts either an integer or a list of integers; when a list is provided the
+  altar cycles through those delays.
 - A single use of the heart altar gives you a single unit of reward: if
   `target._type_id == ObjectType.AltarT: self.env._rewards[actor_id] += 1`
 
@@ -76,7 +79,9 @@ cooldown period.
   - see `this.output_energy = cfg[b"energy_output.r1"]` in the Converter cppclass
 - Using the converter increments resource 2 by one and decrements resource 1 by 1
 - There is currently no use for `converter.energy_output.r2` and `converter.energy_output.r3`
-- After the converter is used, it is unable to be used for `converter.cooldown` timesteps
+- After the converter is used, it waits for the next value in `converter.cooldown`
+  before it can be used again. Supplying a list of integers causes the converter
+  to cycle through the provided schedule.
 
 ### Generator
 
@@ -86,7 +91,8 @@ The `Generator` object produces resources that agents can harvest. Agents can ga
 to them and taking the `use` action. Generators have a specified capacity and replenish resources over time.
 
 - Using the generator once gives one resource 1
-- After the generator is used, it is unable to be used for `generator.cooldown` timesteps
+- After the generator is used, it is unable to be used for the next value in
+  `generator.cooldown` timesteps
 
 ### Wall
 
@@ -96,7 +102,9 @@ The `Wall` object acts as an impassable barrier in the environment, restricting
 
 ### Cooldown
 
-The `cooldown` property determines how long before objects can be used again.
+The `cooldown` property holds one or more delays that determine how long
+objects wait before they can be used again. When provided as a list, the delays
+are applied cyclically.
 
 ## Actions
 

{mettagrid-0.2.0.26 → mettagrid-0.2.0.27}/README.md

@@ -38,7 +38,10 @@ when near it. The altar has a cooldown period between uses.
 
 - Using the heart altar costs `altar.use_cost energy`. So, no matter how much energy you have, you are always dumping
   the same amount of energy in it and getting the same amount of reward.
-- After the heart altar is used, it is unable to be used for altar.cooldown timesteps.
+- After the heart altar is used, it is unable to be used for the next value in
+  `altar.cooldown` (defaults to a single delay) timesteps. The cooldown field
+  accepts either an integer or a list of integers; when a list is provided the
+  altar cycles through those delays.
 - A single use of the heart altar gives you a single unit of reward: if
   `target._type_id == ObjectType.AltarT: self.env._rewards[actor_id] += 1`
 
@@ -55,7 +58,9 @@ cooldown period.
   - see `this.output_energy = cfg[b"energy_output.r1"]` in the Converter cppclass
 - Using the converter increments resource 2 by one and decrements resource 1 by 1
 - There is currently no use for `converter.energy_output.r2` and `converter.energy_output.r3`
-- After the converter is used, it is unable to be used for `converter.cooldown` timesteps
+- After the converter is used, it waits for the next value in `converter.cooldown`
+  before it can be used again. Supplying a list of integers causes the converter
+  to cycle through the provided schedule.
 
 ### Generator
 
@@ -65,7 +70,8 @@ The `Generator` object produces resources that agents can harvest. Agents can ga
 to them and taking the `use` action. Generators have a specified capacity and replenish resources over time.
 
 - Using the generator once gives one resource 1
-- After the generator is used, it is unable to be used for `generator.cooldown` timesteps
+- After the generator is used, it is unable to be used for the next value in
+  `generator.cooldown` timesteps
 
 ### Wall
 
@@ -75,7 +81,9 @@ The `Wall` object acts as an impassable barrier in the environment, restricting
 
 ### Cooldown
 
-The `cooldown` property determines how long before objects can be used again.
+The `cooldown` property holds one or more delays that determine how long
+objects wait before they can be used again. When provided as a list, the delays
+are applied cyclically.
 
 ## Actions
 

{mettagrid-0.2.0.26 → mettagrid-0.2.0.27}/benchmarks/test_mettagrid_env_benchmark.cpp

@@ -26,7 +26,7 @@ static std::unique_ptr<py::scoped_interpreter> g_python_guard;
 // wrapper layer. When that refactoring is complete, we should be able to:
 // 1. Remove all pybind11 includes from this benchmark
 // 2. Remove the Python interpreter initialization
-// 3. Work directly with C++ types (std::vector, std::map, etc.)
+// 3. Work directly with C++ types (std::vector, std::unordered_map, etc.)
 //
 // We'll know we've succeeded when this file has zero references to pybind11!
 
@@ -34,16 +34,19 @@ static std::unique_ptr<py::scoped_interpreter> g_python_guard;
 GameConfig CreateBenchmarkConfig(size_t num_agents) {
   std::vector<std::string> resource_names = {"ore", "heart"};
 
-  std::shared_ptr<ActionConfig> action_cfg = std::make_shared<ActionConfig>(
-      std::map<InventoryItem, InventoryQuantity>(), std::map<InventoryItem, InventoryProbability>());
+  std::shared_ptr<ActionConfig> action_cfg =
+      std::make_shared<ActionConfig>(std::unordered_map<InventoryItem, InventoryQuantity>(),
+                                     std::unordered_map<InventoryItem, InventoryProbability>());
 
   std::shared_ptr<AttackActionConfig> attack_cfg =
-      std::make_shared<AttackActionConfig>(std::map<InventoryItem, InventoryQuantity>(),
-                                           std::map<InventoryItem, InventoryProbability>(),
-                                           std::map<InventoryItem, InventoryQuantity>());
+      std::make_shared<AttackActionConfig>(std::unordered_map<InventoryItem, InventoryQuantity>(),
+                                           std::unordered_map<InventoryItem, InventoryProbability>(),
+                                           std::unordered_map<InventoryItem, InventoryQuantity>());
 
-  std::shared_ptr<ChangeGlyphActionConfig> change_glyph_cfg = std::make_shared<ChangeGlyphActionConfig>(
-      std::map<InventoryItem, InventoryQuantity>(), std::map<InventoryItem, InventoryProbability>(), 4);
+  std::shared_ptr<ChangeGlyphActionConfig> change_glyph_cfg =
+      std::make_shared<ChangeGlyphActionConfig>(std::unordered_map<InventoryItem, InventoryQuantity>(),
+                                                std::unordered_map<InventoryItem, InventoryProbability>(),
+                                                4);
 
   // GameConfig expects a vector of pairs for actions (ordered list)
   std::vector<std::pair<std::string, std::shared_ptr<ActionConfig>>> actions_cfg;
@@ -57,7 +60,7 @@ GameConfig CreateBenchmarkConfig(size_t num_agents) {
   actions_cfg.push_back({"get_items", action_cfg});
   actions_cfg.push_back({"change_glyph", change_glyph_cfg});
 
-  std::map<std::string, std::shared_ptr<GridObjectConfig>> objects_cfg;
+  std::unordered_map<std::string, std::shared_ptr<GridObjectConfig>> objects_cfg;
 
   objects_cfg["wall"] = std::make_shared<WallConfig>(1, "wall", false);
   objects_cfg["agent.team1"] = std::make_shared<AgentConfig>(0, "agent", 0, "team1");
@@ -110,35 +113,22 @@ py::list CreateDefaultMap(size_t num_agents_per_team = 2) {
 
 // Utility function to generate valid random actions
 py::array_t<int> GenerateValidRandomActions(MettaGrid* env, size_t num_agents, std::mt19937* gen) {
-  // Get the maximum argument values for each action type
-  py::list max_args = env->max_action_args();
-  size_t num_actions = py::len(env->action_names());
+  // MettaGrid supports both flat action indices and (action, arg) pairs.
+  // The Python benchmarks use the flat variant, so mirror that here to keep
+  // parity and avoid manual bounds calculations for each action handler.
+  py::list action_names = env->action_names();
+  const size_t num_flat_actions = py::len(action_names);
+  if (num_flat_actions == 0) {
+    throw std::runtime_error("MettaGrid returned no available actions");
+  }
 
-  // Create actions array
-  std::vector<py::ssize_t> shape = {static_cast<py::ssize_t>(num_agents), 2};
+  std::vector<py::ssize_t> shape = {static_cast<py::ssize_t>(num_agents)};
   py::array_t<int> actions(shape);
-  auto actions_ptr = static_cast<int*>(actions.request().ptr);
-
-  // Initialize distributions
-  std::uniform_int_distribution<> action_dist(0, static_cast<int>(num_actions) - 1);
+  auto* actions_ptr = static_cast<int*>(actions.request().ptr);
 
+  std::uniform_int_distribution<> action_dist(0, static_cast<int>(num_flat_actions) - 1);
   for (size_t i = 0; i < num_agents; ++i) {
-    // Choose random action type
-    int action_type = action_dist(*gen);
-
-    // Get max allowed argument for this action type
-    int max_arg = py::cast<int>(max_args[static_cast<size_t>(action_type)]);
-
-    // Choose random valid argument (0 to max_arg inclusive)
-    int action_arg = 0;
-    if (max_arg > 0) {
-      std::uniform_int_distribution<> arg_dist(0, max_arg);
-      action_arg = arg_dist(*gen);
-    }
-
-    // Set the action values
-    actions_ptr[i * 2] = action_type;
-    actions_ptr[i * 2 + 1] = action_arg;
+    actions_ptr[i] = action_dist(*gen);
   }
 
   return actions;

{mettagrid-0.2.0.26 → mettagrid-0.2.0.27}/benchmarks/test_mettagrid_env_benchmark.py

@@ -40,7 +40,7 @@ def environment(num_agents: int):
 
     print(f"\nConfiguring environment with {num_agents} agents")
 
-    env = MettaGridEnv(cfg, render_mode="human")
+    env = MettaGridEnv(cfg)
 
     # Verify deterministic grid generation
     assert env.initial_grid_hash == expected_grid_hash, (
@@ -154,7 +154,7 @@ def test_create_env_performance(benchmark):
 
     def create_and_reset():
         """Create a new environment and reset it."""
-        env = MettaGridEnv(MettaGridConfig(), render_mode="human")
+        env = MettaGridEnv(MettaGridConfig())
         obs = env.reset()
         # Cleanup
         del env

mettagrid-0.2.0.27/configs/maps/navigation_sequence/boxout.map

@@ -0,0 +1,28 @@
+type: mettagrid.map_builder.ascii.AsciiMapBuilder
+map_data: |-
+  ################################
+  #............m.................#
+  #..............................#
+  #...########################...#
+  #...#......................#...#
+  #...#...######.#########...#...#
+  #...#...#..............#...#..n#
+  #...#...#..#########...#...#...#
+  #...#...#..#..@....#...#...#...#
+  #...#...#..#.......#...#...#...#
+  #...#...#..#.......#...#.......#
+  #...#...#..#...........#...#...#
+  #...#...#..#########...#...#.._#
+  #...#...#..............#...#...#
+  #...#...################...#...#
+  #...#......................#...#
+  #...########################...#
+  #..............................#
+  ################################
+char_to_name_map:
+  "#": wall
+  ".": empty
+  "m": mine_red
+  "n": generator_red
+  "@": agent.agent
+  "_": altar

mettagrid-0.2.0.27/configs/maps/navigation_sequence/choose_wisely.map

@@ -0,0 +1,39 @@
+type: mettagrid.map_builder.ascii.AsciiMapBuilder
+map_data: |-
+  ##################################
+  #...........#....................#
+  #...#...#...#....................#
+  #...#...#...#....................#
+  #...#...#...#....................#
+  #...#...#...#....................#
+  #####...#...#....................#
+  #...#...#...#....................#
+  #...#...#...#....................#
+  #...#...#...#....................#
+  #.n.#...#.n.#....................#
+  #####...##########################
+  #................................#
+  #......................@.........#
+  #................................#
+  #................................#
+  #####...##############...#########
+  #._.#...#._.#.....#.m.#...#.m.#..#
+  #...#...#...#.....#...#...#...#..#
+  #...#...#...#.....#...#...#...#..#
+  #...#...#...#.....#...#...#...#..#
+  #####...#...#.....#####...#...#..#
+  #...#...#...#.....#...#...#...#..#
+  #...#...#...#.....#...#...#...#..#
+  #...#...#...#.....#...#...#..##..#
+  #...#...#...#.....#...#...#...#..#
+  #...#...#...#.....#...#...#...#..#
+  #...#...#...#.....#...#...#...#..#
+  #...........#.....#...........#..#
+  ##################################
+char_to_name_map:
+  "#": wall
+  ".": empty
+  "n": generator_red
+  "@": agent.agent
+  "_": altar
+  "m": mine_red

mettagrid-0.2.0.27/configs/maps/navigation_sequence/corners.map

@@ -0,0 +1,28 @@
+type: mettagrid.map_builder.ascii.AsciiMapBuilder
+map_data: |-
+  ################################
+  #............m.................#
+  #..............................#
+  #...########################...#
+  #...#......................#...#
+  #...#......................#...#
+  #...#......#########.......#..n#
+  #...#......#...............#...#
+  #...#......#...............#...#
+  #...#......#.@........######...#
+  #...#......#############.......#
+  #...#......#...............#...#
+  #...#......#...............#.._#
+  #...#......###########.....#...#
+  #...#......................#...#
+  #...#......................#...#
+  #...########################...#
+  #..............................#
+  ################################
+char_to_name_map:
+  "#": wall
+  ".": empty
+  "m": mine_red
+  "n": generator_red
+  "@": agent.agent
+  "_": altar

mettagrid-0.2.0.27/configs/maps/navigation_sequence/corridors.map

@@ -0,0 +1,35 @@
+type: mettagrid.map_builder.ascii.AsciiMapBuilder
+map_data: |-
+  ##########################################################################
+  ##########################################################################
+  #######################......########################......###.._..#######
+  #######################......########################......###.....#######
+  #######################......########################......###.....#######
+  ####.....##############......#####..n..##############......###.....#######
+  ####.....##############......#####.....##############......###.....#######
+  ####.....##############......#####.....##############......###.....#######
+  ####.....#####....#####......#####.....#####....#####......###.....#######
+  ####.....#####....####.......#####.....#####....####.......###.....#######
+  #..................................................................#######
+  #..................................................................#######
+  #@.................................................................#######
+  #..................................................................#######
+  #..................................................................#######
+  ###...m..####.....###############......####.....############.......#######
+  ###......####.....###############......####.....############.......#######
+  #############.....#########################.....############.......#######
+  #############.....#########################.....############.......#######
+  #############.....#########################.....##########################
+  #############.....#########################.....##########################
+  #############.....#########################.....##########################
+  #############.....#########################.....##########################
+  ##########################################################################
+  ##########################################################################
+  ##########################################################################
+char_to_name_map:
+  "#": wall
+  ".": empty
+  "_": altar
+  "n": generator_red
+  "@": agent.agent
+  "m": mine_red

mettagrid-0.2.0.27/configs/maps/navigation_sequence/cylinder.map

@@ -0,0 +1,45 @@
+type: mettagrid.map_builder.ascii.AsciiMapBuilder
+map_data: |-
+  ################################
+  #..............................#
+  #..............................#
+  #..............................#
+  #..............................#
+  #..............................#
+  #.....####################.....#
+  #..............n...............#
+  #.....####################.....#
+  #..............................#
+  #.....@........................#
+  #...............#######........#
+  #..................m...........#
+  #...............#######........#
+  #..............................#
+  #..............................#
+  #..............................#
+  #..............................#
+  #...........#..#...............#
+  #...........#..#...............#
+  #...........#..#...............#
+  #...........#..#...............#
+  #...........#..#...............#
+  #...........#._#...............#
+  #...........#..#...............#
+  #...........#..#...............#
+  #...........#..#...............#
+  #...........#..#...............#
+  #...........#..#...............#
+  #..............................#
+  #..............................#
+  #..............................#
+  #..............................#
+  #..............................#
+  #..............................#
+  ################################
+char_to_name_map:
+  "#": wall
+  ".": empty
+  "n": generator_red
+  "@": agent.agent
+  "m": mine_red
+  "_": altar

mettagrid-0.2.0.27/configs/maps/navigation_sequence/cylinder_easy.map

@@ -0,0 +1,30 @@
+type: mettagrid.map_builder.ascii.AsciiMapBuilder
+map_data: |-
+  ########################################
+  #......................................#
+  #......................................#
+  #......................................#
+  #......#######.........................#
+  #.........m............................#
+  #......#######.........................#
+  #......................................#
+  #......................................#
+  #..............@.............#.#.......#
+  #............................#.#.......#
+  #............................#n#.......#
+  #............................#.#.......#
+  #............................#.#.......#
+  #......................................#
+  #......................................#
+  #.............#.#......................#
+  #.............#_#......................#
+  #.............#.#......................#
+  #......................................#
+  ########################################
+char_to_name_map:
+  "#": wall
+  ".": empty
+  "m": mine_red
+  "@": agent.agent
+  "n": generator_red
+  "_": altar

mettagrid-0.2.0.27/configs/maps/navigation_sequence/easy_memory.map

@@ -0,0 +1,43 @@
+type: mettagrid.map_builder.ascii.AsciiMapBuilder
+map_data: |-
+  ##############
+  ##############
+  ##############
+  ##############
+  ##############
+  ##...........#
+  ##...........#
+  ##...........#
+  ##...#...#...#
+  ##...#...#...#
+  ##...#...#...#
+  ##...#...#...#
+  ##...#...#...#
+  ##...#...#...#
+  ##.n.#.@_#m..#
+  ##############
+  ##############
+  ##############
+  ##############
+  ##############
+  ##...........#
+  ##...........#
+  ##...........#
+  ##...#...#...#
+  ##...#...#...#
+  ##...#...#...#
+  ##...#...#...#
+  ##...#...#...#
+  ##...#...#...#
+  ##...#...#...#
+  ##..m#_@.#n..#
+  ##############
+  ##############
+  ##############
+char_to_name_map:
+  "#": wall
+  ".": empty
+  "n": generator_red
+  "@": agent.agent
+  "_": altar
+  "m": mine_red

mettagrid-0.2.0.27/configs/maps/navigation_sequence/emptyspace_outofsight.map

@@ -0,0 +1,56 @@
+type: mettagrid.map_builder.ascii.AsciiMapBuilder
+map_data: |-
+  ########################################
+  #......................................#
+  #..............................m.......#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #..................@...................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #n.....................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #......................................#
+  #..............................._......#
+  ########################################
+char_to_name_map:
+  "#": wall
+  ".": empty
+  "m": mine_red
+  "@": agent.agent
+  "n": generator_red
+  "_": altar

mettagrid-0.2.0.27/configs/maps/navigation_sequence/hall_of_mirrors.map

@@ -0,0 +1,36 @@
+type: mettagrid.map_builder.ascii.AsciiMapBuilder
+map_data: |-
+  #############################
+  #....#...#...#....#.@._#..n.#
+  #....#...#...#....#....#....#
+  #....#...#...#....#....#....#
+  #....#...#...#....#....#....#
+  #....#...#...#....#....#....#
+  #....#...#...#....#....#....#
+  #....#...#...#....#....#....#
+  #....#...#...#....#....#....#
+  #....#...#...#....#...##....#
+  #...........................#
+  #...........................#
+  #...........................#
+  #...........................#
+  #...........................#
+  #...........................#
+  #...........................#
+  #...........................#
+  #...........................#
+  #...........................#
+  #...........................#
+  #.......m...................#
+  #...........................#
+  #...........................#
+  #...........................#
+  #...........................#
+  #############################
+char_to_name_map:
+  "#": wall
+  ".": empty
+  "@": agent.agent
+  "_": altar
+  "n": generator_red
+  "m": mine_red

mettagrid-0.2.0.27/configs/maps/navigation_sequence/hard_memory.map

@@ -0,0 +1,74 @@
+type: mettagrid.map_builder.ascii.AsciiMapBuilder
+map_data: |-
+  #############
+  #############
+  #############
+  #############
+  #...........#
+  #...........#
+  #...........#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #..n#.@_#m..#
+  #############
+  #############
+  #############
+  #############
+  #############
+  #...........#
+  #...........#
+  #...........#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #...#...#...#
+  #..m#_@.#n..#
+  #############
+  #############
+  #############
+  #############
+  #############
+  #############
+char_to_name_map:
+  "#": wall
+  ".": empty
+  "n": generator_red
+  "@": agent.agent
+  "_": altar
+  "m": mine_red