hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-06 10:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add validation to ray.ray_constants.env_integer (#15541)

Browse source
This commit is contained in:
Sumanth Ratna 2021-05-05 03:32:45 -04:00 • committed by GitHub
parent d8fcac892b
commit b45840737e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
python/ray/ray_constants.py
View file

@ -9,7 +9,14 @@ logger = logging.getLogger(__name__)
def env_integer(key, default): def env_integer(key, default):
if key in os.environ: if key in os.environ:
value = os.environ[key]
if value.isdigit():
return int(os.environ[key]) return int(os.environ[key])
logger.debug(f"Found {key} in environment, but value must "
f"be an integer. Got: {value}. Returning "
f"provided default {default}.")
return default
return default return default

2
python/ray/tune/integration/docker.py
View file

@ -5,7 +5,7 @@ from ray import services
from ray.autoscaler.sdk import rsync, configure_logging from ray.autoscaler.sdk import rsync, configure_logging
from ray.tune.syncer import NodeSyncer from ray.tune.syncer import NodeSyncer
from ray.tune.sync_client import SyncClient from ray.tune.sync_client import SyncClient
from ray.tune.utils import env_integer from ray.ray_constants import env_integer
class DockerSyncer(NodeSyncer): class DockerSyncer(NodeSyncer):

2
python/ray/tune/syncer.py
View file

@ -17,7 +17,7 @@ from ray.tune.callback import Callback
from ray.tune.checkpoint_manager import Checkpoint from ray.tune.checkpoint_manager import Checkpoint
from ray.tune.result import NODE_IP from ray.tune.result import NODE_IP
from ray.util.debug import log_once from ray.util.debug import log_once
from ray.tune.utils.util import env_integer from ray.ray_constants import env_integer
from ray.tune.cluster_info import get_ssh_key, get_ssh_user from ray.tune.cluster_info import get_ssh_key, get_ssh_user
from ray.tune.sync_client import (CommandBasedClient, get_sync_client, from ray.tune.sync_client import (CommandBasedClient, get_sync_client,
get_cloud_sync_client, NOOP) get_cloud_sync_client, NOOP)

4
python/ray/tune/utils/__init__.py
View file

@ -3,12 +3,12 @@ from ray.tune.utils.util import (
pin_in_object_store, unflattened_lookup, UtilMonitor, pin_in_object_store, unflattened_lookup, UtilMonitor,
validate_save_restore, warn_if_slow, diagnose_serialization, validate_save_restore, warn_if_slow, diagnose_serialization,
detect_checkpoint_function, detect_reporter, detect_config_single, detect_checkpoint_function, detect_reporter, detect_config_single,
env_integer, wait_for_gpu) wait_for_gpu)
__all__ = [ __all__ = [
"deep_update", "date_str", "flatten_dict", "get_pinned_object", "deep_update", "date_str", "flatten_dict", "get_pinned_object",
"merge_dicts", "pin_in_object_store", "unflattened_lookup", "UtilMonitor", "merge_dicts", "pin_in_object_store", "unflattened_lookup", "UtilMonitor",
"validate_save_restore", "warn_if_slow", "diagnose_serialization", "validate_save_restore", "warn_if_slow", "diagnose_serialization",
"detect_checkpoint_function", "detect_reporter", "detect_config_single", "detect_checkpoint_function", "detect_reporter", "detect_config_single",
"env_integer", "wait_for_gpu" "wait_for_gpu"
] ]

11
python/ray/tune/utils/util.py
View file

@ -184,17 +184,6 @@ def is_nan_or_inf(value):
return np.isnan(value) or np.isinf(value) return np.isnan(value) or np.isinf(value)
def env_integer(key, default):
# TODO(rliaw): move into ray.constants
if key in os.environ:
value = os.environ[key]
if value.isdigit():
return int(os.environ[key])
raise ValueError(f"Found {key} in environment, but value must "
f"be an integer. Got: {value}.")
return default
def merge_dicts(d1, d2): def merge_dicts(d1, d2):
""" """
Args: Args: