From 902cac308980d2add11f23fb304d7d0e9656b286 Mon Sep 17 00:00:00 2001 From: Robert Nishihara Date: Mon, 27 Jun 2016 11:35:31 -0700 Subject: [PATCH] arrays -> array (#172) --- .travis.yml | 2 +- examples/imagenet/functions.py | 2 +- examples/imagenet/worker.py | 4 ++-- examples/lbfgs/driver.py | 4 ++-- examples/lbfgs/worker.py | 4 ++-- lib/python/ray/{arrays => array}/__init__.py | 0 lib/python/ray/{arrays => array}/distributed/__init__.py | 0 lib/python/ray/{arrays => array}/distributed/core.py | 2 +- lib/python/ray/{arrays => array}/distributed/linalg.py | 2 +- lib/python/ray/{arrays => array}/distributed/random.py | 2 +- lib/python/ray/{arrays => array}/remote/__init__.py | 0 lib/python/ray/{arrays => array}/remote/core.py | 0 lib/python/ray/{arrays => array}/remote/linalg.py | 0 lib/python/ray/{arrays => array}/remote/random.py | 0 scripts/shell.py | 4 ++-- test/{arrays_test.py => array_test.py} | 8 ++++---- test/runtest.py | 4 ++-- test/test_worker.py | 4 ++-- 18 files changed, 21 insertions(+), 21 deletions(-) rename lib/python/ray/{arrays => array}/__init__.py (100%) rename lib/python/ray/{arrays => array}/distributed/__init__.py (100%) rename lib/python/ray/{arrays => array}/distributed/core.py (99%) rename lib/python/ray/{arrays => array}/distributed/linalg.py (99%) rename lib/python/ray/{arrays => array}/distributed/random.py (93%) rename lib/python/ray/{arrays => array}/remote/__init__.py (100%) rename lib/python/ray/{arrays => array}/remote/core.py (100%) rename lib/python/ray/{arrays => array}/remote/linalg.py (100%) rename lib/python/ray/{arrays => array}/remote/random.py (100%) rename test/{arrays_test.py => array_test.py} (98%) diff --git a/.travis.yml b/.travis.yml index b6b959a19..0c77afa93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,5 +22,5 @@ script: - source setup-env.sh - cd test - python runtest.py - - python arrays_test.py + - python array_test.py - python datasets_test.py diff --git a/examples/imagenet/functions.py b/examples/imagenet/functions.py index ce26220f9..7f9ed89f0 100644 --- a/examples/imagenet/functions.py +++ b/examples/imagenet/functions.py @@ -1,7 +1,7 @@ import numpy as np from typing import List import ray -import ray.arrays.remote as ra +import ray.array.remote as ra @ray.remote([List[ray.ObjRef]], [int]) def num_images(batches): diff --git a/examples/imagenet/worker.py b/examples/imagenet/worker.py index b34c36af1..75b603f81 100644 --- a/examples/imagenet/worker.py +++ b/examples/imagenet/worker.py @@ -7,8 +7,8 @@ import ray.datasets.imagenet import ray import ray.services as services import ray.worker as worker -import ray.arrays.remote as ra -import ray.arrays.distributed as da +import ray.array.remote as ra +import ray.array.distributed as da import functions diff --git a/examples/lbfgs/driver.py b/examples/lbfgs/driver.py index f54314e6a..a8bed0c5c 100644 --- a/examples/lbfgs/driver.py +++ b/examples/lbfgs/driver.py @@ -6,8 +6,8 @@ import ray import ray.services as services import ray.worker as worker -import ray.arrays.remote as ra -import ray.arrays.distributed as da +import ray.array.remote as ra +import ray.array.distributed as da import functions diff --git a/examples/lbfgs/worker.py b/examples/lbfgs/worker.py index 1e1d44ff7..13a40be33 100644 --- a/examples/lbfgs/worker.py +++ b/examples/lbfgs/worker.py @@ -3,8 +3,8 @@ import argparse import ray import ray.worker as worker -import ray.arrays.remote as ra -import ray.arrays.distributed as da +import ray.array.remote as ra +import ray.array.distributed as da import functions diff --git a/lib/python/ray/arrays/__init__.py b/lib/python/ray/array/__init__.py similarity index 100% rename from lib/python/ray/arrays/__init__.py rename to lib/python/ray/array/__init__.py diff --git a/lib/python/ray/arrays/distributed/__init__.py b/lib/python/ray/array/distributed/__init__.py similarity index 100% rename from lib/python/ray/arrays/distributed/__init__.py rename to lib/python/ray/array/distributed/__init__.py diff --git a/lib/python/ray/arrays/distributed/core.py b/lib/python/ray/array/distributed/core.py similarity index 99% rename from lib/python/ray/arrays/distributed/core.py rename to lib/python/ray/array/distributed/core.py index 29ce03028..624b592e1 100644 --- a/lib/python/ray/arrays/distributed/core.py +++ b/lib/python/ray/array/distributed/core.py @@ -1,6 +1,6 @@ from typing import List import numpy as np -import ray.arrays.remote as ra +import ray.array.remote as ra import ray __all__ = ["BLOCK_SIZE", "DistArray", "assemble", "zeros", "ones", "copy", diff --git a/lib/python/ray/arrays/distributed/linalg.py b/lib/python/ray/array/distributed/linalg.py similarity index 99% rename from lib/python/ray/arrays/distributed/linalg.py rename to lib/python/ray/array/distributed/linalg.py index 2f082b2c0..e675363a9 100644 --- a/lib/python/ray/arrays/distributed/linalg.py +++ b/lib/python/ray/array/distributed/linalg.py @@ -1,7 +1,7 @@ from typing import List import numpy as np -import ray.arrays.remote as ra +import ray.array.remote as ra import ray from core import * diff --git a/lib/python/ray/arrays/distributed/random.py b/lib/python/ray/array/distributed/random.py similarity index 93% rename from lib/python/ray/arrays/distributed/random.py rename to lib/python/ray/array/distributed/random.py index e10579eda..c3ad4a27e 100644 --- a/lib/python/ray/arrays/distributed/random.py +++ b/lib/python/ray/array/distributed/random.py @@ -1,7 +1,7 @@ from typing import List import numpy as np -import ray.arrays.remote as ra +import ray.array.remote as ra import ray from core import * diff --git a/lib/python/ray/arrays/remote/__init__.py b/lib/python/ray/array/remote/__init__.py similarity index 100% rename from lib/python/ray/arrays/remote/__init__.py rename to lib/python/ray/array/remote/__init__.py diff --git a/lib/python/ray/arrays/remote/core.py b/lib/python/ray/array/remote/core.py similarity index 100% rename from lib/python/ray/arrays/remote/core.py rename to lib/python/ray/array/remote/core.py diff --git a/lib/python/ray/arrays/remote/linalg.py b/lib/python/ray/array/remote/linalg.py similarity index 100% rename from lib/python/ray/arrays/remote/linalg.py rename to lib/python/ray/array/remote/linalg.py diff --git a/lib/python/ray/arrays/remote/random.py b/lib/python/ray/array/remote/random.py similarity index 100% rename from lib/python/ray/arrays/remote/random.py rename to lib/python/ray/array/remote/random.py diff --git a/scripts/shell.py b/scripts/shell.py index 9f708d4d2..14cbc4849 100644 --- a/scripts/shell.py +++ b/scripts/shell.py @@ -5,8 +5,8 @@ import ray import ray.services as services import ray.worker as worker -import ray.arrays.remote as ra -import ray.arrays.distributed as da +import ray.array.remote as ra +import ray.array.distributed as da parser = argparse.ArgumentParser(description='Parse addresses for the worker to connect to.') parser.add_argument("--scheduler-address", default="127.0.0.1:10001", type=str, help="the scheduler's address") diff --git a/test/arrays_test.py b/test/array_test.py similarity index 98% rename from test/arrays_test.py rename to test/array_test.py index a1e39732d..bc7423c8e 100644 --- a/test/arrays_test.py +++ b/test/array_test.py @@ -8,10 +8,10 @@ import time import subprocess32 as subprocess import os -import ray.arrays.remote as ra -import ray.arrays.distributed as da +import ray.array.remote as ra +import ray.array.distributed as da -class ArraysSingleTest(unittest.TestCase): +class RemoteArrayTest(unittest.TestCase): def testMethods(self): worker_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "test_worker.py") @@ -44,7 +44,7 @@ class ArraysSingleTest(unittest.TestCase): services.cleanup() -class ArraysDistTest(unittest.TestCase): +class DistributedArrayTest(unittest.TestCase): def testSerialization(self): [w] = services.start_singlenode_cluster(return_drivers=True) diff --git a/test/runtest.py b/test/runtest.py index e35d17bfc..b1597c075 100644 --- a/test/runtest.py +++ b/test/runtest.py @@ -9,8 +9,8 @@ import subprocess32 as subprocess import os import test_functions -import ray.arrays.remote as ra -import ray.arrays.distributed as da +import ray.array.remote as ra +import ray.array.distributed as da RAY_TEST_OBJECTS = [[1, "hello", 3.0], 42, "hello world", 42.0, (1.0, "hi"), None, (None, None), ("hello", None), diff --git a/test/test_worker.py b/test/test_worker.py index 0310ae76e..2ed75e33d 100644 --- a/test/test_worker.py +++ b/test/test_worker.py @@ -3,8 +3,8 @@ import argparse import numpy as np import test_functions -import ray.arrays.remote as ra -import ray.arrays.distributed as da +import ray.array.remote as ra +import ray.array.distributed as da import ray.datasets.imagenet import ray