Remove future imports (#6724)

* Remove all __future__ imports from RLlib.

* Remove (object) again from tf_run_builder.py::TFRunBuilder.

* Fix 2xLINT warnings.

* Fix broken appo_policy import (must be appo_tf_policy)

* Remove future imports from all other ray files (not just RLlib).

* Remove future imports from all other ray files (not just RLlib).

* Remove future import blocks that contain `unicode_literals` as well.
Revert appo_tf_policy.py to appo_policy.py (belongs to another PR).

* Add two empty lines before Schedule class.

* Put back __future__ imports into determine_tests_to_run.py. Fails otherwise on a py2/print related error.
This commit is contained in:
Sven
2020-01-09 09:15:48 +01:00
committed by Eric Liang
parent ca454c5c1b
commit 60d4d5e1aa
498 changed files with 87 additions and 2071 deletions
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import ray
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import ray
@@ -1,9 +1,5 @@
# This workload tests repeatedly killing actors and submitting tasks to them.
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import sys
import time
-4
View File
@@ -1,9 +1,5 @@
# This workload tests running APEX
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import ray
from ray.cluster_utils import Cluster
from ray.tune import run_experiments
@@ -1,9 +1,5 @@
# This workload tests running IMPALA with remote envs
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import ray
from ray.tune import run_experiments
from ray.cluster_utils import Cluster
@@ -1,9 +1,5 @@
# This workload tests submitting many actor methods.
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import time
import numpy as np
@@ -1,9 +1,5 @@
# This workload tests many drivers using the same cluster.
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import time
import ray
@@ -1,9 +1,5 @@
# This workload tests submitting and getting many tasks over and over.
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import time
import numpy as np
@@ -1,9 +1,5 @@
# This workload tests repeatedly killing a node and adding a new node.
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import time
import ray
-4
View File
@@ -1,9 +1,5 @@
# This workload tests running PBT
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import ray
from ray.tune import run_experiments
from ray.tune.schedulers import PopulationBasedTraining
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import argparse
import logging
import numpy as np
-4
View File
@@ -1,9 +1,5 @@
#!/usr/bin/env python
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import logging
import numpy as np
import sys
-4
View File
@@ -1,9 +1,5 @@
#!/usr/bin/env python
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import logging
import time
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from .cython_simple import simple_func, fib, fib_int, \
fib_cpdef, fib_cdef, simple_class
from .masked_log import masked_log
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import ray
import click
import inspect
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import os
from setuptools import setup
from Cython.Build import cythonize
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import os
import scipy.optimize
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import atoma
from flask import Flask, jsonify, request
from flask_cors import CORS
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from collections import Counter
import os
import sys
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from collections import Counter
import sys
import time
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import os
import sys
"""
@@ -1,10 +1,6 @@
# This file is used by CrossLanguageInvocationTest.java to test cross-language
# invocation.
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import six
import ray
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import os
from os.path import dirname
import sys
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import copy
import inspect
import logging
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import copy
import hashlib
import json
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from distutils.version import StrictVersion
import json
import os
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import random
import threading
from collections import defaultdict
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import copy
import hashlib
import json
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import os
import logging
try: # py3
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import os
import logging
import time
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from uuid import uuid4
from threading import RLock
import time
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import kubernetes
from kubernetes.config.config_exception import ConfigException
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import logging
from kubernetes import client
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import logging
from ray.autoscaler.kubernetes import core_api, log_prefix
-5
View File
@@ -1,7 +1,2 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
def bootstrap_local(config):
return config
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from filelock import FileLock
from threading import RLock
import json
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import datetime
import logging
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import importlib
import logging
import os
-4
View File
@@ -1,9 +1,5 @@
"""The Ray autoscaler uses tags/labels to associate metadata with instances."""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
# Tag for the name of the node
TAG_RAY_NODE_NAME = "ray-node-name"
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
try: # py3
from shlex import quote
except ImportError: # py2
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import logging
import time
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
try:
import aiohttp.web
except ImportError:
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from .gcs_flush_policy import (set_flushing_policy, GcsFlushPolicy,
SimpleGcsFlushPolicy)
from .named_actors import get_actor, register_actor
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import ray
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import ray
import numpy as np
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from . import random
from . import linalg
from .core import (BLOCK_SIZE, DistArray, assemble, zeros, ones, copy, eye,
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import ray.experimental.array.remote as ra
import ray
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import ray.experimental.array.remote as ra
import ray
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import ray.experimental.array.remote as ra
import ray
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from . import random
from . import linalg
from .core import (zeros, zeros_like, ones, eye, dot, vstack, hstack, subarray,
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import ray
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import ray
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import ray
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import os
import time
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import ray
_local = {} # dict for local mode
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from multiprocessing import TimeoutError
import os
import time
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import ray
import ray.cloudpickle as pickle
from ray.experimental.internal_kv import _internal_kv_get, _internal_kv_put
-5
View File
@@ -1,8 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
class NoReturn:
"""Do not store the return value in the object store.
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from collections import deque
import time
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import os
import torch
import torch.nn as nn
@@ -4,10 +4,6 @@
It gets to 75% validation accuracy in 25 epochs, and 79% after 50 epochs.
(it"s still underfitting at that point, though).
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import argparse
from tensorflow.keras.datasets import cifar10
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import argparse
import tensorflow as tf
from tensorflow.keras.models import Sequential
@@ -8,10 +8,6 @@ in the documentation.
# yapf: disable
# __torch_train_example__
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import argparse
import numpy as np
import torch
@@ -8,10 +8,6 @@ in the documentation.
"""
# __torch_tune_example__
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import torch
import torch.nn as nn
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from ray.experimental.sgd.pytorch.pytorch_trainer import (PyTorchTrainer,
PyTorchTrainable)
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import collections
from filelock import FileLock
import logging
@@ -1,9 +1,5 @@
#!/usr/bin/env python
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import argparse
import os
import torch
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import collections
from filelock import FileLock
import logging
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import os
import torch
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import collections
import time
import torch
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import os
import pytest
import tempfile
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import torch
import torch.nn as nn
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import os
import pytest
import tempfile
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from ray.experimental.sgd.tf.tf_trainer import (TFTrainer, TFTrainable)
__all__ = ["TFTrainer", "TFTrainable"]
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import logging
import json
import os
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
import os
import logging
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from contextlib import closing
import numpy as np
import socket
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import logging
from collections import defaultdict
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import asyncio
import time
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from collections import deque, OrderedDict
import numpy as np
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import dis
import hashlib
import importlib
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from ray.core.generated.gcs_pb2 import (
ActorCheckpointIdData,
ActorTableData,
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from collections import defaultdict
import threading
import traceback
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from ray.internal.internal_api import free
__all__ = ["free"]
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import ray.worker
from ray import profiling
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import copy
import traceback
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import argparse
import errno
import glob
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import logging
import os
import sys
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import argparse
import logging
import os
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import atexit
import collections
import datetime
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import logging
import numpy as np
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import ray
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from ray.projects.projects import ProjectDefinition
__all__ = [
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import argparse
import copy
import json
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import click
import copy
import jsonschema
-3
View File
@@ -1,6 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
"""Ray constants used in the Python code."""
import logging
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import logging
from functools import wraps
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import argparse
import logging
import json
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import math
from collections import namedtuple
import logging
-4
View File
@@ -1,7 +1,3 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import ray.worker

Some files were not shown because too many files have changed in this diff Show More