run ray stop before ray tests started (fix ray memory test fail issue) (

intel-analytics#3193) * run ray stop before ray tests started * add more ray stop * fix ray memory issue * change scope to class * change mxnet scope to function
yangw1234 · Dec 7, 2020 · e869779 · e869779
1 parent abc38b8
commit e869779
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/pyzoo/dev/run-pytests-horovod-pytorch b/pyzoo/dev/run-pytests-horovod-pytorch
@@ -23,6 +23,8 @@ cd "`dirname $0`"
 export PYSPARK_PYTHON=python
 export PYSPARK_DRIVER_PYTHON=python
 
+ray stop -f
+
 echo "Running RayOnSpark tests"
 python -m pytest -v ../test/zoo/orca/learn/ray/pytorch/test_estimator_horovod_backend.py
 exit_status_1=$?

diff --git a/pyzoo/dev/run-pytests-horovod-tf b/pyzoo/dev/run-pytests-horovod-tf
@@ -23,6 +23,8 @@ cd "`dirname $0`"
 export PYSPARK_PYTHON=python
 export PYSPARK_DRIVER_PYTHON=python
 
+ray stop -f
+
 echo "Running RayOnSpark tests"
 python -m pytest -v ../test/zoo/orca/learn/ray/tf/test_tf_ray_estimator.py
 exit_status_1=$?

diff --git a/pyzoo/dev/run-pytests-ray b/pyzoo/dev/run-pytests-ray
@@ -23,15 +23,7 @@ cd "`dirname $0`"
 export PYSPARK_PYTHON=python
 export PYSPARK_DRIVER_PYTHON=python
 
-echo "Running RayOnSpark tests"
-python -m pytest -v ../test/zoo/ray/ \
-       --ignore=../test/zoo/ray/integration/ \
-       --ignore=../test/zoo/ray/test_reinit_raycontext.py
-exit_status_1=$?
-if [ $exit_status_1 -ne 0 ];
-then
-    exit $exit_status_1
-fi
+ray stop -f
 
 echo "Running orca learn ray tests"
 python -m pytest -v ../test/zoo/orca/learn/ray \
@@ -43,6 +35,8 @@ then
     exit $exit_status_2
 fi
 
+ray stop -f
+
 echo "Running automl tests"
 python -m pytest -v ../test/zoo/automl
 exit_status_3=$?
@@ -51,6 +45,8 @@ then
     exit $exit_status_3
 fi
 
+ray stop -f
+
 echo "Running zouwu tests"
 python -m pytest -v ../test/zoo/zouwu \
        -k "not test_forecast_tcmf_distributed"
@@ -60,6 +56,8 @@ then
     exit $exit_status_4
 fi
 
+ray stop -f
+
 echo "Running orca data tests"
 python -m pytest -v ../test/zoo/orca/data
 exit_status_5=$?
@@ -68,3 +66,16 @@ then
     exit $exit_status_5
 fi
 
+ray stop -f
+
+echo "Running RayOnSpark tests"
+python -m pytest -v ../test/zoo/ray/ \
+	--ignore=../test/zoo/ray/integration/ \
+	--ignore=../test/zoo/ray/test_reinit_raycontext.py
+exit_status_1=$?
+if [ $exit_status_1 -ne 0 ];
+then
+    exit $exit_status_1
+fi
+
+ray stop -f
diff --git a/pyzoo/test/zoo/automl/conftest.py b/pyzoo/test/zoo/automl/conftest.py
@@ -18,7 +18,7 @@
 ray_ctx = None
 
 
-@pytest.fixture(autouse=True, scope='package')
+@pytest.fixture(autouse=True, scope='class')
 def automl_fixture():
     from zoo import init_spark_on_local
     from zoo.ray import RayContext

diff --git a/pyzoo/test/zoo/orca/learn/ray/mxnet/conftest.py b/pyzoo/test/zoo/orca/learn/ray/mxnet/conftest.py
@@ -17,7 +17,7 @@
 import pytest
 
 
-@pytest.fixture(autouse=True, scope='package')
+@pytest.fixture(autouse=True, scope='function')
 def orca_context_fixture():
     from zoo.orca import init_orca_context, stop_orca_context
     init_orca_context(cores=8, init_ray_on_spark=True,