Move parallel tests to separate directory, make sure to initialize ray

aai-institute · Mar 21, 2024 · 58332c0 · 58332c0
1 parent a863d40
commit 58332c0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/tests/parallel/__init__.py b/tests/parallel/__init__.py
diff --git a/tests/utils/conftest.py → tests/parallel/conftest.py b/tests/utils/conftest.py → tests/parallel/conftest.py
@@ -11,7 +11,8 @@ def parallel_config(request):
         yield ParallelConfig(backend="joblib", n_cpus_local=num_workers())
     elif request.param == "ray-local":
         ray = pytest.importorskip("ray", reason="Ray not installed.")
-        yield ParallelConfig(backend="ray", n_cpus_local=num_workers())
+        ray.init(num_cpus=num_workers())
+        yield ParallelConfig(backend="ray")
         ray.shutdown()
     elif request.param == "ray-external":
         ray = pytest.importorskip("ray", reason="Ray not installed.")
@@ -22,6 +23,7 @@ def parallel_config(request):
         cluster = Cluster(
             initialize_head=True, head_node_args={"num_cpus": num_workers()}
         )
+        ray.init(cluster.address)
         yield ParallelConfig(backend="ray", address=cluster.address)
         ray.shutdown()
         cluster.shutdown()
diff --git a/tests/utils/test_parallel.py → tests/parallel/test_parallel.py b/tests/utils/test_parallel.py → tests/parallel/test_parallel.py