Skip to content

Commit

Permalink
Internal change
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 549639416
Change-Id: Ia0f59725d013133d43a8f8ed0b284821d250e706
  • Loading branch information
jagapiou authored and Copybara-Service committed Jul 20, 2023
1 parent b0b6db7 commit e58aa9b
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 20 deletions.
5 changes: 2 additions & 3 deletions meltingpot/human_players/level_playing_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@

import collections
import enum

from typing import Any, Callable, Dict, Mapping, Optional, Sequence, Tuple
import dm_env

import dm_env
import dmlab2d
from ml_collections import config_dict
import numpy as np
import pygame

import dmlab2d
from meltingpot.utils.substrates import builder

WHITE = (255, 255, 255)
Expand Down
7 changes: 3 additions & 4 deletions meltingpot/utils/substrates/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,15 @@
from typing import Any, Optional, Union

from absl import logging
from ml_collections import config_dict
import tree

import dmlab2d
from dmlab2d import runfiles_helper
from dmlab2d import settings_helper
from ml_collections import config_dict
import tree

from meltingpot.utils.substrates import game_object_utils
from meltingpot.utils.substrates.wrappers import reset_wrapper


Settings = Union[config_dict.ConfigDict, Mapping[str, Any]]

_MAX_SEED = 2 ** 32 - 1
Expand Down
2 changes: 1 addition & 1 deletion meltingpot/utils/substrates/wrappers/base_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

from absl.testing import absltest
from absl.testing import parameterized

import dmlab2d

from meltingpot.utils.substrates.wrappers import base

_WRAPPED_METHODS = tuple([
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
from unittest import mock

from absl.testing import absltest

import dm_env
import dmlab2d
import numpy as np

import dmlab2d
from meltingpot.utils.substrates.wrappers import collective_reward_wrapper

RGB_SPEC = dm_env.specs.Array(shape=(2, 1), dtype=np.int8)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@

from absl.testing import absltest
from absl.testing import parameterized

import dm_env
import dmlab2d
import numpy as np

import dmlab2d
from meltingpot.utils.substrates.wrappers import discrete_action_wrapper

MOVE_SPEC = dm_env.specs.BoundedArray(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
from unittest import mock

from absl.testing import absltest

import dm_env
import dmlab2d
import numpy as np

import dmlab2d
from meltingpot.utils.substrates.wrappers import multiplayer_wrapper

ACT_SPEC = dm_env.specs.BoundedArray(
Expand Down
2 changes: 1 addition & 1 deletion meltingpot/utils/substrates/wrappers/observables.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

import chex
import dm_env
import dmlab2d
import reactivex

import dmlab2d
from meltingpot.utils.substrates.wrappers import base


Expand Down
3 changes: 1 addition & 2 deletions meltingpot/utils/substrates/wrappers/observables_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@
from typing import Mapping, Union

import dm_env
import dmlab2d
import numpy as np
from reactivex import subject

import dmlab2d
from meltingpot.utils.substrates.wrappers import observables


Action = Union[int, float, np.ndarray]


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

from absl.testing import absltest
from absl.testing import parameterized

import dmlab2d

from meltingpot.utils.substrates.wrappers import observables_wrapper


Expand Down
2 changes: 1 addition & 1 deletion meltingpot/utils/substrates/wrappers/reset_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
from typing import Callable

import dm_env

import dmlab2d

from meltingpot.utils.substrates.wrappers import base


Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ profile = "google"
# TODO remove once https://github.com/PyCQA/isort/pull/2149 submitted.
line_length = 1000
single_line_exclusions = ["collections.abc", "typing"]
known_local_folder = ["dmlab2d", "meltingpot"]
known_local_folder = ["meltingpot"]

[tool.pyink]
line-length = 80
Expand Down

0 comments on commit e58aa9b

Please sign in to comment.