[RLlib] utils/spaces ... (#8608)

rllib/agents/ars/ars_tf_policy.py

@@ -11,7 +11,7 @@ from ray.rllib.models import ModelCatalog
 from ray.rllib.policy.sample_batch import SampleBatch
 from ray.rllib.utils.filter import get_filter
 from ray.rllib.utils.framework import try_import_tf
-from ray.rllib.utils.space_utils import unbatch
+from ray.rllib.utils.spaces.space_utils import unbatch
 
 tf = try_import_tf()
 

rllib/agents/es/es_tf_policy.py

@@ -11,7 +11,8 @@ from ray.rllib.policy.sample_batch import SampleBatch
 from ray.rllib.utils import try_import_tree
 from ray.rllib.utils.filter import get_filter
 from ray.rllib.utils.framework import try_import_tf
-from ray.rllib.utils.space_utils import get_base_struct_from_space, unbatch
+from ray.rllib.utils.spaces.space_utils import get_base_struct_from_space, \
+    unbatch
 
 tf = try_import_tf()
 tree = try_import_tree()

rllib/agents/es/es_torch_policy.py

@@ -10,7 +10,7 @@ from ray.rllib.policy.sample_batch import SampleBatch
 from ray.rllib.policy.torch_policy_template import build_torch_policy
 from ray.rllib.utils.filter import get_filter
 from ray.rllib.utils.framework import try_import_torch
-from ray.rllib.utils.space_utils import unbatch
+from ray.rllib.utils.spaces.space_utils import unbatch
 from ray.rllib.utils.torch_ops import convert_to_torch_tensor
 
 torch, _ = try_import_torch()

rllib/evaluation/episode.py

@@ -5,7 +5,7 @@ import random
 from ray.rllib.env.base_env import _DUMMY_AGENT_ID
 from ray.rllib.utils import try_import_tree
 from ray.rllib.utils.annotations import DeveloperAPI
-from ray.rllib.utils.space_utils import flatten_to_single_ndarray
+from ray.rllib.utils.spaces.space_utils import flatten_to_single_ndarray
 
 tree = try_import_tree()
 

rllib/evaluation/sampler.py

@@ -18,7 +18,8 @@ from ray.rllib.offline import InputReader
 from ray.rllib.utils import try_import_tree
 from ray.rllib.utils.annotations import override
 from ray.rllib.utils.debug import summarize
-from ray.rllib.utils.space_utils import flatten_to_single_ndarray, unbatch
+from ray.rllib.utils.spaces.space_utils import flatten_to_single_ndarray, \
+    unbatch
 from ray.rllib.utils.tf_run_builder import TFRunBuilder
 
 tree = try_import_tree()

rllib/examples/env/nested_space_repeat_after_me_env.py

@@ -3,7 +3,7 @@ from gym.spaces import Box, Dict, Discrete, Tuple
 import numpy as np
 
 from ray.rllib.utils import try_import_tree
-from ray.rllib.utils.space_utils import flatten_space
+from ray.rllib.utils.spaces.space_utils import flatten_space
 
 tree = try_import_tree()
 

rllib/models/catalog.py

@@ -5,7 +5,6 @@ import numpy as np
 
 from ray.tune.registry import RLLIB_MODEL, RLLIB_PREPROCESSOR, \
     RLLIB_ACTION_DIST, _global_registry
-from ray.rllib.models.extra_spaces import Simplex
 from ray.rllib.models.action_dist import ActionDistribution
 from ray.rllib.models.modelv2 import ModelV2
 from ray.rllib.models.preprocessors import get_preprocessor
@@ -25,7 +24,8 @@ from ray.rllib.utils import try_import_tf, try_import_tree
 from ray.rllib.utils.annotations import DeveloperAPI, PublicAPI
 from ray.rllib.utils.deprecation import deprecation_warning, DEPRECATED_VALUE
 from ray.rllib.utils.error import UnsupportedSpaceException
-from ray.rllib.utils.space_utils import flatten_space
+from ray.rllib.utils.spaces.simplex import Simplex
+from ray.rllib.utils.spaces.space_utils import flatten_space
 
 tf = try_import_tf()
 tree = try_import_tree()

rllib/models/tf/tf_action_dist.py

@@ -7,7 +7,7 @@ from ray.rllib.utils import MIN_LOG_NN_OUTPUT, MAX_LOG_NN_OUTPUT, \
     SMALL_NUMBER, try_import_tree
 from ray.rllib.utils.annotations import override, DeveloperAPI
 from ray.rllib.utils.framework import try_import_tf, try_import_tfp
-from ray.rllib.utils.space_utils import get_base_struct_from_space
+from ray.rllib.utils.spaces.space_utils import get_base_struct_from_space
 
 tf = try_import_tf()
 tfp = try_import_tfp()

rllib/models/torch/torch_action_dist.py

@@ -8,7 +8,7 @@ from ray.rllib.utils.annotations import override
 from ray.rllib.utils.framework import try_import_torch
 from ray.rllib.utils.numpy import SMALL_NUMBER, MIN_LOG_NN_OUTPUT, \
     MAX_LOG_NN_OUTPUT
-from ray.rllib.utils.space_utils import get_base_struct_from_space
+from ray.rllib.utils.spaces.space_utils import get_base_struct_from_space
 from ray.rllib.utils.torch_ops import atanh
 
 torch, nn = try_import_torch()

rllib/policy/eager_tf_policy.py

@@ -13,7 +13,7 @@ from ray.rllib.policy.sample_batch import SampleBatch
 from ray.rllib.utils import add_mixins
 from ray.rllib.utils.annotations import override
 from ray.rllib.utils.framework import try_import_tf
-from ray.rllib.utils.space_utils import flatten_to_single_ndarray
+from ray.rllib.utils.spaces.space_utils import flatten_to_single_ndarray
 
 tf = try_import_tf()
 logger = logging.getLogger(__name__)

rllib/policy/policy.py

@@ -7,7 +7,7 @@ from ray.rllib.utils import try_import_tree
 from ray.rllib.utils.annotations import DeveloperAPI
 from ray.rllib.utils.exploration.exploration import Exploration
 from ray.rllib.utils.from_config import from_config
-from ray.rllib.utils.space_utils import get_base_struct_from_space, \
+from ray.rllib.utils.spaces.space_utils import get_base_struct_from_space, \
     unbatch
 
 tree = try_import_tree()

rllib/rollout.py

@@ -16,7 +16,7 @@ from ray.rllib.env.base_env import _DUMMY_AGENT_ID
 from ray.rllib.evaluation.worker_set import WorkerSet
 from ray.rllib.policy.sample_batch import DEFAULT_POLICY_ID
 from ray.rllib.utils.deprecation import deprecation_warning
-from ray.rllib.utils.space_utils import flatten_to_single_ndarray
+from ray.rllib.utils.spaces.space_utils import flatten_to_single_ndarray
 from ray.tune.utils import merge_dicts
 from ray.tune.registry import get_trainable_cls
 

rllib/utils/exploration/random.py

@@ -9,7 +9,7 @@ from ray.rllib.utils.exploration.exploration import Exploration
 from ray.rllib.utils import force_tuple
 from ray.rllib.utils.framework import try_import_tf, try_import_torch, \
     TensorType
-from ray.rllib.utils.space_utils import get_base_struct_from_space
+from ray.rllib.utils.spaces.space_utils import get_base_struct_from_space
 
 tf = try_import_tf()
 torch, _ = try_import_torch()