From bccbf0ad7eedf2ab008785f706375e1aade17cda Mon Sep 17 00:00:00 2001 From: Chaitanya Prakash Bapat Date: Tue, 28 Apr 2020 20:23:57 -0700 Subject: [PATCH 1/2] Fix nightly large_vector test caused by incorrect with_seed path (#18178) --- tests/nightly/test_large_array.py | 2 +- tests/nightly/test_large_vector.py | 2 +- tests/python/unittest/common.py | 23 +---------------------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/tests/nightly/test_large_array.py b/tests/nightly/test_large_array.py index ee57f172c1c9..1528bc02dce6 100644 --- a/tests/nightly/test_large_array.py +++ b/tests/nightly/test_large_array.py @@ -27,7 +27,7 @@ from mxnet.test_utils import rand_ndarray, assert_almost_equal, rand_coord_2d, default_context, check_symbolic_forward, create_2d_tensor from mxnet import gluon, nd -from common import with_seed, with_post_test_cleanup +from common import with_seed from nose.tools import with_setup import unittest diff --git a/tests/nightly/test_large_vector.py b/tests/nightly/test_large_vector.py index bbad75627769..70066a2a6c64 100644 --- a/tests/nightly/test_large_vector.py +++ b/tests/nightly/test_large_vector.py @@ -27,7 +27,7 @@ from mxnet.test_utils import rand_ndarray, assert_almost_equal, rand_coord_2d, create_vector from mxnet import gluon, nd -from tests.python.unittest.common import with_seed +from common import with_seed from nose.tools import with_setup import unittest diff --git a/tests/python/unittest/common.py b/tests/python/unittest/common.py index ab2d191f1360..52531021c553 100644 --- a/tests/python/unittest/common.py +++ b/tests/python/unittest/common.py @@ -310,27 +310,6 @@ def teardown(): mx.nd.waitall() -def with_post_test_cleanup(): - """ - Helper function that cleans up memory by releasing it from memory pool - Required especially by large tensor tests that have memory footprints in GBs. - """ - def test_helper(orig_test): - @make_decorator(orig_test) - def test_new(*args, **kwargs): - logger = default_logger() - try: - orig_test(*args, **kwargs) - except: - logger.info(test_msg) - raise - finally: - mx.nd.waitall() - mx.cpu().empty_cache() - return test_new - return test_helper - - def run_in_spawned_process(func, env, *args): """ Helper function to run a test in its own process. @@ -373,4 +352,4 @@ def run_in_spawned_process(func, env, *args): finally: os.environ.clear() os.environ.update(orig_environ) - return True \ No newline at end of file + return True From 18e2014004eb52e34db926d47202f1add5ff817f Mon Sep 17 00:00:00 2001 From: Chaitanya Prakash Bapat Date: Sat, 2 May 2020 01:30:48 -0700 Subject: [PATCH 2/2] pylint astroid sanity issue --- ci/docker/install/requirements | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/docker/install/requirements b/ci/docker/install/requirements index 2d5125e8e2da..38eb504220d8 100644 --- a/ci/docker/install/requirements +++ b/ci/docker/install/requirements @@ -27,7 +27,8 @@ mock==2.0.0 nose==1.3.7 nose-timer==0.7.3 numpy>1.16.0,<2.0.0 -pylint==2.3.1; python_version >= '3.0' +pylint==2.3.1 # pylint and astroid need to be aligned +astroid==2.3.3 # pylint and astroid need to be aligned requests<2.19.0,>=2.18.4 scipy==1.2.1 six==1.11.0