Update Ray wheels and increase verbosity for test_colocation (#40)

* show output on test

* add

* increase timeout

* upgrade latest

* fix queue actor

* fix shutdown

* lint

* fix

* change order of tests

* Update xgboost_ray/util.py

Co-authored-by: Kai Fricke <krfricke@users.noreply.github.com>

Author: amogkam

.github/workflows/test.yaml

@@ -36,20 +36,20 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install codecov
-        python -m pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-1.1.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl
+        python -m pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-1.2.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl
         if [ -f requirements-test.txt ]; then python -m pip install -r requirements-test.txt; fi
     - name: Install package
       run: |
         python -m pip install -e .
     - name: Test with pytest
       run: |
         pushd xgboost_ray/tests
+        python -m pytest -vv -s --log-cli-level=DEBUG --durations=0 -x test_colocation.py
         python -m pytest -v --durations=0 -x test_matrix.py
         python -m pytest -v --durations=0 -x test_xgboost_api.py
         python -m pytest -v --durations=0 -x test_fault_tolerance.py
         python -m pytest -v --durations=0 -x test_end_to_end.py
         python -m pytest -v --durations=0 -x test_tune.py
-        python -m pytest -v --durations=0 -x test_colocation.py
         echo "running smoke test on benchmark_cpu_gpu.py" && python release/benchmark_cpu_gpu.py 2 10 20 --smoke-test
         popd
         pushd examples/
@@ -82,12 +82,12 @@ jobs:
     - name: Test with pytest
       run: |
         pushd xgboost_ray/tests
+        python -m pytest -vv -s --log-cli-level=DEBUG --durations=0 -x test_colocation.py
         python -m pytest -v --durations=0 -x test_matrix.py
         python -m pytest -v --durations=0 -x test_xgboost_api.py
         python -m pytest -v --durations=0 -x test_fault_tolerance.py
         python -m pytest -v --durations=0 -x test_end_to_end.py
         python -m pytest -v --durations=0 -x test_tune.py
-        python -m pytest -v --durations=0 -x test_colocation.py
         echo "running smoke test on benchmark_cpu_gpu.py" && python release/benchmark_cpu_gpu.py 2 10 20 --smoke-test
         popd
         pushd examples/
@@ -127,11 +127,11 @@ jobs:
     - name: Test with pytest
       run: |
         pushd xgboost_ray/tests
+        python -m pytest -vv -s --log-cli-level=DEBUG --durations=0 -x test_colocation.py
         python -m pytest -v --durations=0 -x test_matrix.py
         python -m pytest -v --durations=0 -x test_xgboost_api.py
         python -m pytest -v --durations=0 -x test_fault_tolerance.py
         python -m pytest -v --durations=0 -x test_end_to_end.py
-        python -m pytest -v --durations=0 -x test_colocation.py
         echo "running smoke test on benchmark_cpu_gpu.py" && python release/benchmark_cpu_gpu.py 2 10 20 --smoke-test
         popd
         pushd examples/

xgboost_ray/util.py

@@ -49,7 +49,6 @@ def shutdown(self):
 
 # Remove after Ray 1.2 release.
 if getattr(RayQueue, "shutdown", None) is not None:
-    Queue = RayQueue
     from ray.util.queue import _QueueActor
 else:
     # Have to copy the class here so that we can subclass this for mocking.
@@ -100,16 +99,20 @@ def get_nowait_batch(self, num_items):
                             f"{self.qsize()}.")
             return [self.queue.get_nowait() for _ in range(num_items)]
 
-    class Queue(RayQueue):
-        def __init__(self,
-                     maxsize: int = 0,
-                     actor_options: Optional[Dict] = None) -> None:
-            actor_options = {} if not actor_options else actor_options
-            self.maxsize = maxsize
-            self.actor = ray.remote(_QueueActor).options(
-                **actor_options).remote(self.maxsize)
 
-        def shutdown(self):
+# Remove after Ray 1.2 release.
+class Queue(RayQueue):
+    def __init__(self, maxsize: int = 0,
+                 actor_options: Optional[Dict] = None) -> None:
+        actor_options = actor_options or {}
+        self.maxsize = maxsize
+        self.actor = ray.remote(_QueueActor).options(**actor_options).remote(
+            self.maxsize)
+
+    def shutdown(self):
+        if getattr(RayQueue, "shutdown", None) is not None:
+            super(Queue, self).shutdown()
+        else:
             if self.actor:
                 ray.kill(self.actor)
             self.actor = None