You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/06/15 07:40:12 UTC
[GitHub] marcoabreu closed pull request #11199: [MXNET-538] Add XUnit to
python tests
marcoabreu closed pull request #11199: [MXNET-538] Add XUnit to python tests
URL: https://github.com/apache/incubator-mxnet/pull/11199
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/Jenkinsfile b/Jenkinsfile
index 28edda00959..7836f7a5ad8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -92,6 +92,20 @@ echo ${libs} | sed -e 's/,/ /g' | xargs md5sum
"""
}
+def collect_test_results_unix(original_file_name, new_file_name) {
+ echo 'Saving python test results for ' + new_file_name
+ // Rename file to make it distinguishable. Unfortunately, it's not possible to get STAGE_NAME in a parallel stage
+ sh 'cp ' + original_file_name + ' ' + new_file_name
+ archiveArtifacts artifacts: new_file_name
+}
+
+def collect_test_results_windows(original_file_name, new_file_name) {
+ echo 'Saving python test results for ' + new_file_name
+ // Rename file to make it distinguishable. Unfortunately, it's not possible to get STAGE_NAME in a parallel stage
+ bat 'xcopy ' + original_file_name + ' ' + new_file_name
+ archiveArtifacts artifacts: new_file_name
+}
+
def docker_run(platform, function_name, use_nvidia, shared_mem = '500m') {
def command = "ci/build.py --docker-registry ${env.DOCKER_CACHE_REGISTRY} %USE_NVIDIA% --platform %PLATFORM% --shm-size %SHARED_MEM% /work/runtime_functions.sh %FUNCTION_NAME%"
command = command.replaceAll('%USE_NVIDIA%', use_nvidia ? '--nvidiadocker' : '')
@@ -465,36 +479,55 @@ try {
parallel 'Python2: CPU': {
node('mxnetlinux-cpu') {
ws('workspace/ut-python2-cpu') {
- init_git()
- unpack_lib('cpu')
- python2_ut('ubuntu_cpu')
+ try {
+ init_git()
+ unpack_lib('cpu')
+ python2_ut('ubuntu_cpu')
+ } finally {
+ collect_test_results_unix('nosetests_unittest.xml', 'nosetests_python2_cpu_unittest.xml')
+ collect_test_results_unix('nosetests_train.xml', 'nosetests_python2_cpu_train.xml')
+ collect_test_results_unix('nosetests_quantization.xml', 'nosetests_python2_cpu_quantization.xml')
+ }
}
}
},
'Python3: CPU': {
node('mxnetlinux-cpu') {
ws('workspace/ut-python3-cpu') {
- init_git()
- unpack_lib('cpu')
- python3_ut('ubuntu_cpu')
+ try {
+ init_git()
+ unpack_lib('cpu')
+ python3_ut('ubuntu_cpu')
+ } finally {
+ collect_test_results_unix('nosetests_unittest.xml', 'nosetests_python3_cpu_unittest.xml')
+ collect_test_results_unix('nosetests_quantization.xml', 'nosetests_python3_cpu_quantization.xml')
+ }
}
}
},
'Python2: GPU': {
node('mxnetlinux-gpu') {
ws('workspace/ut-python2-gpu') {
- init_git()
- unpack_lib('gpu', mx_lib)
- python2_gpu_ut('ubuntu_gpu')
+ try {
+ init_git()
+ unpack_lib('gpu', mx_lib)
+ python2_gpu_ut('ubuntu_gpu')
+ } finally {
+ collect_test_results_unix('nosetests_gpu.xml', 'nosetests_python2_gpu.xml')
+ }
}
}
},
'Python3: GPU': {
node('mxnetlinux-gpu') {
ws('workspace/ut-python3-gpu') {
- init_git()
- unpack_lib('gpu', mx_lib)
- python3_gpu_ut('ubuntu_gpu')
+ try {
+ init_git()
+ unpack_lib('gpu', mx_lib)
+ python3_gpu_ut('ubuntu_gpu')
+ } finally {
+ collect_test_results_unix('nosetests_gpu.xml', 'nosetests_python3_gpu.xml')
+ }
}
}
},
@@ -502,9 +535,13 @@ try {
node('mxnetlinux-gpu-p3') {
ws('workspace/ut-python2-quantize-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- unpack_lib('gpu', mx_lib)
- docker_run('ubuntu_gpu', 'unittest_ubuntu_python2_quantization_gpu', true)
+ try {
+ init_git()
+ unpack_lib('gpu', mx_lib)
+ docker_run('ubuntu_gpu', 'unittest_ubuntu_python2_quantization_gpu', true)
+ } finally {
+ collect_test_results_unix('nosetests_quantization_gpu.xml', 'nosetests_python2_quantize_gpu.xml')
+ }
}
}
}
@@ -513,9 +550,13 @@ try {
node('mxnetlinux-gpu-p3') {
ws('workspace/ut-python3-quantize-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- unpack_lib('gpu', mx_lib)
- docker_run('ubuntu_gpu', 'unittest_ubuntu_python3_quantization_gpu', true)
+ try {
+ init_git()
+ unpack_lib('gpu', mx_lib)
+ docker_run('ubuntu_gpu', 'unittest_ubuntu_python3_quantization_gpu', true)
+ } finally {
+ collect_test_results_unix('nosetests_quantization_gpu.xml', 'nosetests_python3_quantize_gpu.xml')
+ }
}
}
}
@@ -523,36 +564,55 @@ try {
'Python2: MKLDNN-CPU': {
node('mxnetlinux-cpu') {
ws('workspace/ut-python2-mkldnn-cpu') {
- init_git()
- unpack_lib('mkldnn_cpu', mx_mkldnn_lib)
- python2_ut('ubuntu_cpu')
+ try {
+ init_git()
+ unpack_lib('mkldnn_cpu', mx_mkldnn_lib)
+ python2_ut('ubuntu_cpu')
+ } finally {
+ collect_test_results_unix('nosetests_unittest.xml', 'nosetests_python2_mkldnn_cpu_unittest.xml')
+ collect_test_results_unix('nosetests_train.xml', 'nosetests_python2_mkldnn_cpu_train.xml')
+ collect_test_results_unix('nosetests_quantization.xml', 'nosetests_python2_mkldnn_cpu_quantization.xml')
+ }
}
}
},
'Python2: MKLDNN-GPU': {
node('mxnetlinux-gpu') {
ws('workspace/ut-python2-mkldnn-gpu') {
- init_git()
- unpack_lib('mkldnn_gpu', mx_mkldnn_lib)
- python2_gpu_ut('ubuntu_gpu')
+ try {
+ init_git()
+ unpack_lib('mkldnn_gpu', mx_mkldnn_lib)
+ python2_gpu_ut('ubuntu_gpu')
+ } finally {
+ collect_test_results_unix('nosetests_gpu.xml', 'nosetests_python2_mkldnn_gpu.xml')
+ }
}
}
},
'Python3: MKLDNN-CPU': {
node('mxnetlinux-cpu') {
ws('workspace/ut-python3-mkldnn-cpu') {
- init_git()
- unpack_lib('mkldnn_cpu', mx_mkldnn_lib)
- python3_ut_mkldnn('ubuntu_cpu')
+ try {
+ init_git()
+ unpack_lib('mkldnn_cpu', mx_mkldnn_lib)
+ python3_ut_mkldnn('ubuntu_cpu')
+ } finally {
+ collect_test_results_unix('nosetests_unittest.xml', 'nosetests_python3_mkldnn_cpu_unittest.xml')
+ collect_test_results_unix('nosetests_mkl.xml', 'nosetests_python3_mkldnn_cpu_mkl.xml')
+ }
}
}
},
'Python3: MKLDNN-GPU': {
node('mxnetlinux-gpu') {
ws('workspace/ut-python3-mkldnn-gpu') {
- init_git()
- unpack_lib('mkldnn_gpu', mx_mkldnn_lib)
- python3_gpu_ut('ubuntu_gpu')
+ try {
+ init_git()
+ unpack_lib('mkldnn_gpu', mx_mkldnn_lib)
+ python3_gpu_ut('ubuntu_gpu')
+ } finally {
+ collect_test_results_unix('nosetests_gpu.xml', 'nosetests_python3_mkldnn_gpu.xml')
+ }
}
}
},
@@ -560,9 +620,14 @@ try {
node('mxnetlinux-cpu') {
ws('workspace/build-centos7-cpu') {
timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- unpack_lib('centos7_cpu')
- docker_run('centos7_cpu', 'unittest_centos7_cpu', false)
+ try {
+ init_git()
+ unpack_lib('centos7_cpu')
+ docker_run('centos7_cpu', 'unittest_centos7_cpu', false)
+ } finally {
+ collect_test_results_unix('nosetests_unittest.xml', 'nosetests_python3_centos7_cpu_unittest.xml')
+ collect_test_results_unix('nosetests_train.xml', 'nosetests_python3_centos7_cpu_train.xml')
+ }
}
}
}
@@ -571,9 +636,13 @@ try {
node('mxnetlinux-gpu') {
ws('workspace/build-centos7-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- unpack_lib('centos7_gpu')
- docker_run('centos7_gpu', 'unittest_centos7_gpu', true)
+ try {
+ init_git()
+ unpack_lib('centos7_gpu')
+ docker_run('centos7_gpu', 'unittest_centos7_gpu', true)
+ } finally {
+ collect_test_results_unix('nosetests_gpu.xml', 'nosetests_python3_centos7_gpu.xml')
+ }
}
}
}
@@ -671,16 +740,21 @@ try {
node('mxnetwindows-cpu') {
timeout(time: max_time, unit: 'MINUTES') {
ws('workspace/ut-python-cpu') {
- init_git_win()
- unstash 'vc14_cpu'
- bat '''rmdir /s/q pkg_vc14_cpu
- 7z x -y vc14_cpu.7z'''
- bat """xcopy C:\\mxnet\\data data /E /I /Y
- xcopy C:\\mxnet\\model model /E /I /Y
- call activate py2
- set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_cpu\\python
- del /S /Q ${env.WORKSPACE}\\pkg_vc14_cpu\\python\\*.pyc
- C:\\mxnet\\test_cpu.bat"""
+ try {
+ init_git_win()
+ unstash 'vc14_cpu'
+ bat '''rmdir /s/q pkg_vc14_cpu
+ 7z x -y vc14_cpu.7z'''
+ bat """xcopy C:\\mxnet\\data data /E /I /Y
+ xcopy C:\\mxnet\\model model /E /I /Y
+ call activate py2
+ set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_cpu\\python
+ del /S /Q ${env.WORKSPACE}\\pkg_vc14_cpu\\python\\*.pyc
+ C:\\mxnet\\test_cpu.bat"""
+ } finally {
+ // We are unable to modify test_cpu.bat, so we can't track test failures on Windows
+ // collect_test_results_windows('nosetests.xml', 'nosetests_windows_python2_cpu.xml')
+ }
}
}
}
@@ -689,16 +763,21 @@ try {
node('mxnetwindows-cpu') {
timeout(time: max_time, unit: 'MINUTES') {
ws('workspace/ut-python-cpu') {
- init_git_win()
- unstash 'vc14_cpu'
- bat '''rmdir /s/q pkg_vc14_cpu
- 7z x -y vc14_cpu.7z'''
- bat """xcopy C:\\mxnet\\data data /E /I /Y
- xcopy C:\\mxnet\\model model /E /I /Y
- call activate py3
- set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_cpu\\python
- del /S /Q ${env.WORKSPACE}\\pkg_vc14_cpu\\python\\*.pyc
- C:\\mxnet\\test_cpu.bat"""
+ try {
+ init_git_win()
+ unstash 'vc14_cpu'
+ bat '''rmdir /s/q pkg_vc14_cpu
+ 7z x -y vc14_cpu.7z'''
+ bat """xcopy C:\\mxnet\\data data /E /I /Y
+ xcopy C:\\mxnet\\model model /E /I /Y
+ call activate py3
+ set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_cpu\\python
+ del /S /Q ${env.WORKSPACE}\\pkg_vc14_cpu\\python\\*.pyc
+ C:\\mxnet\\test_cpu.bat"""
+ } finally {
+ // We are unable to modify test_cpu.bat, so we can't track test failures on Windows
+ // collect_test_results_windows('nosetests.xml', 'nosetests_windows_python3_cpu.xml')
+ }
}
}
}
@@ -707,16 +786,21 @@ try {
node('mxnetwindows-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
ws('workspace/ut-python-gpu') {
- init_git_win()
- unstash 'vc14_gpu'
- bat '''rmdir /s/q pkg_vc14_gpu
- 7z x -y vc14_gpu.7z'''
- bat """xcopy C:\\mxnet\\data data /E /I /Y
- xcopy C:\\mxnet\\model model /E /I /Y
- call activate py2
- set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu\\python
- del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu\\python\\*.pyc
- C:\\mxnet\\test_gpu.bat"""
+ try {
+ init_git_win()
+ unstash 'vc14_gpu'
+ bat '''rmdir /s/q pkg_vc14_gpu
+ 7z x -y vc14_gpu.7z'''
+ bat """xcopy C:\\mxnet\\data data /E /I /Y
+ xcopy C:\\mxnet\\model model /E /I /Y
+ call activate py2
+ set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu\\python
+ del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu\\python\\*.pyc
+ C:\\mxnet\\test_gpu.bat"""
+ } finally {
+ // We are unable to modify test_cpu.bat, so we can't track test failures on Windows
+ // collect_test_results_windows('nosetests.xml', 'nosetests_windows_python2_gpu.xml')
+ }
}
}
}
@@ -725,16 +809,21 @@ try {
node('mxnetwindows-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
ws('workspace/ut-python-gpu') {
- init_git_win()
- unstash 'vc14_gpu'
- bat '''rmdir /s/q pkg_vc14_gpu
- 7z x -y vc14_gpu.7z'''
- bat """xcopy C:\\mxnet\\data data /E /I /Y
- xcopy C:\\mxnet\\model model /E /I /Y
- call activate py3
- set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu\\python
- del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu\\python\\*.pyc
- C:\\mxnet\\test_gpu.bat"""
+ try {
+ init_git_win()
+ unstash 'vc14_gpu'
+ bat '''rmdir /s/q pkg_vc14_gpu
+ 7z x -y vc14_gpu.7z'''
+ bat """xcopy C:\\mxnet\\data data /E /I /Y
+ xcopy C:\\mxnet\\model model /E /I /Y
+ call activate py3
+ set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu\\python
+ del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu\\python\\*.pyc
+ C:\\mxnet\\test_gpu.bat"""
+ } finally {
+ // We are unable to modify test_cpu.bat, so we can't track test failures on Windows
+ // collect_test_results_windows('nosetests.xml', 'nosetests_windows_python3_gpu.xml')
+ }
}
}
}
@@ -743,16 +832,21 @@ try {
node('mxnetwindows-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
ws('workspace/ut-python-gpu') {
- init_git_win()
- unstash 'vc14_gpu_mkldnn'
- bat '''rmdir /s/q pkg_vc14_gpu_mkldnn
- 7z x -y vc14_gpu_mkldnn.7z'''
- bat """xcopy C:\\mxnet\\data data /E /I /Y
- xcopy C:\\mxnet\\model model /E /I /Y
- call activate py3
- set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu_mkldnn\\python
- del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu_mkldnn\\python\\*.pyc
- C:\\mxnet\\test_gpu.bat"""
+ try {
+ init_git_win()
+ unstash 'vc14_gpu_mkldnn'
+ bat '''rmdir /s/q pkg_vc14_gpu_mkldnn
+ 7z x -y vc14_gpu_mkldnn.7z'''
+ bat """xcopy C:\\mxnet\\data data /E /I /Y
+ xcopy C:\\mxnet\\model model /E /I /Y
+ call activate py3
+ set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu_mkldnn\\python
+ del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu_mkldnn\\python\\*.pyc
+ C:\\mxnet\\test_gpu.bat"""
+ } finally {
+ // We are unable to modify test_cpu.bat, so we can't track test failures on Windows
+ // collect_test_results_windows('nosetests.xml', 'nosetests_windows_python3_mkldnn_Gpu.xml')
+ }
}
}
}
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 293ac64fff8..9717d77545f 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -448,9 +448,9 @@ unittest_ubuntu_python2_cpu() {
# https://github.com/apache/incubator-mxnet/issues/10026
#export MXNET_MKLDNN_DEBUG=1 # Ignored if not present
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
- nosetests-2.7 --verbose tests/python/unittest
- nosetests-2.7 --verbose tests/python/train
- nosetests-2.7 --verbose tests/python/quantization
+ nosetests-2.7 --with-xunit --xunit-file nosetests_unittest.xml --verbose tests/python/unittest
+ nosetests-2.7 --with-xunit --xunit-file nosetests_train.xml --verbose tests/python/train
+ nosetests-2.7 --with-xunit --xunit-file nosetests_quantization.xml --verbose tests/python/quantization
}
unittest_ubuntu_python3_cpu() {
@@ -460,8 +460,8 @@ unittest_ubuntu_python3_cpu() {
# https://github.com/apache/incubator-mxnet/issues/10026
#export MXNET_MKLDNN_DEBUG=1 # Ignored if not present
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
- nosetests-3.4 --verbose tests/python/unittest
- nosetests-3.4 --verbose tests/python/quantization
+ nosetests-3.4 --with-xunit --xunit-file nosetests_unittest.xml --verbose tests/python/unittest
+ nosetests-3.4 --with-xunit --xunit-file nosetests_quantization.xml --verbose tests/python/quantization
}
unittest_ubuntu_python3_cpu_mkldnn() {
@@ -471,8 +471,8 @@ unittest_ubuntu_python3_cpu_mkldnn() {
# https://github.com/apache/incubator-mxnet/issues/10026
#export MXNET_MKLDNN_DEBUG=1 # Ignored if not present
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
- nosetests-3.4 --verbose tests/python/unittest
- nosetests-3.4 --verbose tests/python/mkl
+ nosetests-3.4 --with-xunit --xunit-file nosetests_unittest.xml --verbose tests/python/unittest
+ nosetests-3.4 --with-xunit --xunit-file nosetests_mkl.xml --verbose tests/python/mkl
}
unittest_ubuntu_python2_gpu() {
@@ -482,7 +482,7 @@ unittest_ubuntu_python2_gpu() {
# https://github.com/apache/incubator-mxnet/issues/10026
#export MXNET_MKLDNN_DEBUG=1 # Ignored if not present
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
- nosetests-2.7 --verbose tests/python/gpu
+ nosetests-2.7 --with-xunit --xunit-file nosetests_gpu.xml --verbose tests/python/gpu
}
tutorialtest_ubuntu_python3_gpu() {
@@ -493,7 +493,8 @@ tutorialtest_ubuntu_python3_gpu() {
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
export PYTHONPATH=/work/mxnet/python/
export MXNET_TUTORIAL_TEST_KERNEL=python3
- cd /work/mxnet/tests/tutorials && nosetests-3.4 test_tutorials.py --nologcapture
+ cd /work/mxnet/tests/tutorials
+ nosetests-3.4 --with-xunit --xunit-file nosetests_tutorials.xml test_tutorials.py --nologcapture
}
tutorialtest_ubuntu_python2_gpu() {
@@ -504,7 +505,8 @@ tutorialtest_ubuntu_python2_gpu() {
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
export PYTHONPATH=/work/mxnet/python/
export MXNET_TUTORIAL_TEST_KERNEL=python2
- cd /work/mxnet/tests/tutorials && nosetests-3.4 test_tutorials.py --nologcapture
+ cd /work/mxnet/tests/tutorials
+ nosetests-3.4 --with-xunit --xunit-file nosetests_tutorials.xml test_tutorials.py --nologcapture
}
unittest_ubuntu_python3_gpu() {
@@ -514,7 +516,7 @@ unittest_ubuntu_python3_gpu() {
# https://github.com/apache/incubator-mxnet/issues/10026
#export MXNET_MKLDNN_DEBUG=1 # Ignored if not present
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
- nosetests-3.4 --verbose tests/python/gpu
+ nosetests-3.4 --with-xunit --xunit-file nosetests_gpu.xml --verbose tests/python/gpu
}
# quantization gpu currently only runs on P3 instances
@@ -526,7 +528,7 @@ unittest_ubuntu_python2_quantization_gpu() {
# https://github.com/apache/incubator-mxnet/issues/10026
#export MXNET_MKLDNN_DEBUG=1 # Ignored if not present
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
- nosetests-2.7 --verbose tests/python/quantization_gpu
+ nosetests-2.7 --with-xunit --xunit-file nosetests_quantization_gpu.xml --verbose tests/python/quantization_gpu
}
# quantization gpu currently only runs on P3 instances
@@ -538,7 +540,7 @@ unittest_ubuntu_python3_quantization_gpu() {
# https://github.com/apache/incubator-mxnet/issues/10026
#export MXNET_MKLDNN_DEBUG=1 # Ignored if not present
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
- nosetests-3.4 --verbose tests/python/quantization_gpu
+ nosetests-3.4 --with-xunit --xunit-file nosetests_quantization_gpu.xml --verbose tests/python/quantization_gpu
}
unittest_ubuntu_cpu_scala() {
@@ -584,14 +586,14 @@ unittest_ubuntu_gpu_R() {
unittest_centos7_cpu() {
set -ex
cd /work/mxnet
- python3.6 -m "nose" --with-timer --verbose tests/python/unittest
- python3.6 -m "nose" --with-timer --verbose tests/python/train
+ python3.6 -m "nose" --with-xunit --xunit-file nosetests_unittest.xml --verbose tests/python/unittest
+ python3.6 -m "nose" --with-xunit --xunit-file nosetests_train.xml --verbose tests/python/train
}
unittest_centos7_gpu() {
set -ex
cd /work/mxnet
- python3.6 -m "nose" --with-timer --verbose tests/python/gpu
+ python3.6 -m "nose" --with-xunit --xunit-file nosetests_gpu.xml --verbose tests/python/gpu
}
integrationtest_ubuntu_cpu_onnx() {
diff --git a/python/mxnet/test_utils.py b/python/mxnet/test_utils.py
index 686802d3c48..19fe0749598 100644
--- a/python/mxnet/test_utils.py
+++ b/python/mxnet/test_utils.py
@@ -1644,16 +1644,20 @@ def discard_stderr():
with discard_stderr():
...
"""
+ with open(os.devnull, 'w') as bit_bucket:
+ try:
+ stderr_fileno = sys.stderr.fileno()
+ old_stderr = os.dup(stderr_fileno)
+ try:
+ os.dup2(bit_bucket.fileno(), stderr_fileno)
+ yield
+ finally:
+ os.dup2(old_stderr, stderr_fileno)
+ except AttributeError:
+ # On some systems is stderr not a file descriptor but actually a virtual pipeline
+ # that can not be copied
+ yield
- try:
- stderr_fileno = sys.stderr.fileno()
- old_stderr = os.dup(stderr_fileno)
- bit_bucket = open(os.devnull, 'w')
- os.dup2(bit_bucket.fileno(), stderr_fileno)
- yield
- finally:
- os.dup2(old_stderr, stderr_fileno)
- bit_bucket.close()
class DummyIter(mx.io.DataIter):
"""A dummy iterator that always returns the same batch of data
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services