[incubator-mxnet] branch master updated: Bypass ThreadedEngine in test_operator_gpu.py:test_convolution_multiple_streams. (#14338)

[wk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wkcn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new d6eafca  Bypass ThreadedEngine in test_operator_gpu.py:test_convolution_multiple_streams. (#14338)
d6eafca is described below

commit d6eafca2555b58746f51052fdce96a264d02a84a
Author: Dick Carter <di...@comcast.net>
AuthorDate: Tue Mar 5 19:29:26 2019 -0800

    Bypass ThreadedEngine in test_operator_gpu.py:test_convolution_multiple_streams. (#14338)
---
 tests/python/gpu/test_operator_gpu.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/python/gpu/test_operator_gpu.py b/tests/python/gpu/test_operator_gpu.py
index 4dbf82e..f329916 100644
--- a/tests/python/gpu/test_operator_gpu.py
+++ b/tests/python/gpu/test_operator_gpu.py
@@ -564,8 +564,18 @@ def _conv_with_num_streams(seed):
 
 @with_seed()
 def test_convolution_multiple_streams():
+    engines = ['NaiveEngine', 'ThreadedEngine', 'ThreadedEnginePerDevice']
+
+    if os.getenv('MXNET_ENGINE_TYPE') is not None:
+        engines = [os.getenv('MXNET_ENGINE_TYPE'),]
+        print("Only running against '%s'" % engines[0], file=sys.stderr, end='')
+    # Remove this else clause when the ThreadedEngine can handle this test
+    else:
+        engines.remove('ThreadedEngine')
+        print("SKIP: 'ThreadedEngine', only running against %s" % engines, file=sys.stderr, end='')
+
     for num_streams in [1, 2]:
-        for engine in ['NaiveEngine', 'ThreadedEngine', 'ThreadedEnginePerDevice']:
+        for engine in engines:
             _test_in_separate_process(_conv_with_num_streams,
                 {'MXNET_GPU_WORKER_NSTREAMS' : num_streams, 'MXNET_ENGINE_TYPE' : engine})