From bd8e0f8356676749ecae16ec38a366b4cc00bf15 Mon Sep 17 00:00:00 2001
From: Pedro Larroy <928489+larroy@users.noreply.github.com>
Date: Wed, 5 Dec 2018 19:49:39 +0100
Subject: [PATCH] =?UTF-8?q?[MXNET-769]=20Use=20MXNET=5FHOME=20in=20a=20tem?=
 =?UTF-8?q?pdir=20in=20windows=20to=20prevent=20access=20denied=20due=20t?=
 =?UTF-8?q?=E2=80=A6=20(#13531)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use MXNET_HOME in cwd in windows to prevent access denied due to concurrent data downloads

Fixes #13484

* Revert "Disabled flaky test test_gluon_data.test_recordimage_dataset_with_data_loader_multiworker (#13527)"

This reverts commit 3d499cb3584919b767142c5596211a7f7fb18d50.
---
 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 +++
 tests/python/unittest/test_gluon_data.py | 1 -
 5 files changed, 12 insertions(+), 1 deletion(-)

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") }
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)