From fb42c2a0b5ed245f32c41cb05ed5b37597429e53 Mon Sep 17 00:00:00 2001 From: Pedro Larroy Date: Tue, 4 Dec 2018 14:54:31 +0000 Subject: [PATCH 1/2] Use MXNET_HOME in cwd in windows to prevent access denied due to concurrent data downloads Fixes #13484 --- ci/windows/test_py2_cpu.ps1 | 3 +++ ci/windows/test_py2_gpu.ps1 | 3 +++ ci/windows/test_py3_cpu.ps1 | 3 +++ ci/windows/test_py3_gpu.ps1 | 3 +++ 4 files changed, 12 insertions(+) diff --git a/ci/windows/test_py2_cpu.ps1 b/ci/windows/test_py2_cpu.ps1 index 702a2db90ed7..46e49baeadbb 100644 --- a/ci/windows/test_py2_cpu.ps1 +++ b/ci/windows/test_py2_cpu.ps1 @@ -16,9 +16,12 @@ # under the License. 7z x -y windows_package.7z + $env:MXNET_LIBRARY_PATH=join-path $pwd.Path windows_package\lib\libmxnet.dll $env:PYTHONPATH=join-path $pwd.Path windows_package\python $env:MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0 +$env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home') + c:\Anaconda3\envs\py2\Scripts\pip install -r tests\requirements.txt c:\Anaconda3\envs\py2\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_unittest.xml tests\python\unittest if (! $?) { Throw ("Error running unittest") } diff --git a/ci/windows/test_py2_gpu.ps1 b/ci/windows/test_py2_gpu.ps1 index 0cf2717fa208..d362c61da02b 100644 --- a/ci/windows/test_py2_gpu.ps1 +++ b/ci/windows/test_py2_gpu.ps1 @@ -16,9 +16,12 @@ # under the License. 7z x -y windows_package.7z + $env:MXNET_LIBRARY_PATH=join-path $pwd.Path windows_package\lib\libmxnet.dll $env:PYTHONPATH=join-path $pwd.Path windows_package\python $env:MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0 +$env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home') + c:\Anaconda3\envs\py2\Scripts\pip install -r tests\requirements.txt c:\Anaconda3\envs\py2\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_unittest.xml tests\python\unittest if (! $?) { Throw ("Error running unittest") } diff --git a/ci/windows/test_py3_cpu.ps1 b/ci/windows/test_py3_cpu.ps1 index a7774a63dd86..32da4885fe0a 100644 --- a/ci/windows/test_py3_cpu.ps1 +++ b/ci/windows/test_py3_cpu.ps1 @@ -16,9 +16,12 @@ # under the License. 7z x -y windows_package.7z + $env:MXNET_LIBRARY_PATH=join-path $pwd.Path windows_package\lib\libmxnet.dll $env:PYTHONPATH=join-path $pwd.Path windows_package\python $env:MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0 +$env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home') + c:\Anaconda3\envs\py3\Scripts\pip install -r tests\requirements.txt c:\Anaconda3\envs\py3\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_unittest.xml tests\python\unittest if (! $?) { Throw ("Error running unittest") } diff --git a/ci/windows/test_py3_gpu.ps1 b/ci/windows/test_py3_gpu.ps1 index f9955ef6473f..b30b22ae90e4 100644 --- a/ci/windows/test_py3_gpu.ps1 +++ b/ci/windows/test_py3_gpu.ps1 @@ -16,9 +16,12 @@ # under the License. 7z x -y windows_package.7z + $env:MXNET_LIBRARY_PATH=join-path $pwd.Path windows_package\lib\libmxnet.dll $env:PYTHONPATH=join-path $pwd.Path windows_package\python $env:MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0 +$env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home') + c:\Anaconda3\envs\py3\Scripts\pip install -r tests\requirements.txt c:\Anaconda3\envs\py3\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_unittest.xml tests\python\unittest if (! $?) { Throw ("Error running unittest") } From 44ab5ab14f9e028ab23c64964bdd6f9d86c9b5ee Mon Sep 17 00:00:00 2001 From: Pedro Larroy Date: Tue, 4 Dec 2018 16:37:16 +0000 Subject: [PATCH 2/2] Revert "Disabled flaky test test_gluon_data.test_recordimage_dataset_with_data_loader_multiworker (#13527)" This reverts commit 3d499cb3584919b767142c5596211a7f7fb18d50. --- tests/python/unittest/test_gluon_data.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/python/unittest/test_gluon_data.py b/tests/python/unittest/test_gluon_data.py index d043a7c6b802..e4206095f9ba 100644 --- a/tests/python/unittest/test_gluon_data.py +++ b/tests/python/unittest/test_gluon_data.py @@ -78,7 +78,6 @@ def _dataset_transform_fn(x, y): return x, y @with_seed() -@unittest.skip("Flaky test: https://github.com/apache/incubator-mxnet/issues/13484") def test_recordimage_dataset_with_data_loader_multiworker(): recfile = prepare_record() dataset = gluon.data.vision.ImageRecordDataset(recfile)