Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Enable bulking test on windows #14392

Merged
merged 6 commits into from
Mar 12, 2019
Merged

Enable bulking test on windows #14392

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e3ea6ad
Reenable test_operator_gpu.py:test_bulking.
DickJC123 Mar 11, 2019
a8d95a2
Add temporary debug output.
DickJC123 Mar 11, 2019
d55b851
Add test_gluon_gpu.py:test_bulking to test spawn approach.
DickJC123 Mar 11, 2019
e53fa86
Reorder testing to see test_gluon_gpu.py:test_bulking result.
DickJC123 Mar 11, 2019
61e67e6
Change test_operator_gpu.py:test_bulking to use spawn approach.
DickJC123 Mar 12, 2019
40a6615
Remove diagnostic output and revert windows ci changes.
DickJC123 Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test_gluon_gpu.py:test_bulking to test spawn approach.
  • Loading branch information
@DickJC123
DickJC123 committed Mar 11, 2019
commit d55b85155977a0723f618cdc8b3dd0cbf91f7b8f
14 changes: 8 additions & 6 deletions ci/windows/test_py2_gpu.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ $env:MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
$env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home')

C:\Python27\Scripts\pip install -r tests\requirements.txt
C:\Python27\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") }
C:\Python27\python.exe -m nose -v -s --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_operator.xml tests\python\gpu\test_operator_gpu.py
#C:\Python27\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") }
C:\Python27\python.exe -m nose -v -s --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_operator.xml tests\python\gpu\test_operator_gpu.py:test_bulking
if (! $?) { Throw ("Error running tests") }
C:\Python27\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_forward.xml tests\python\gpu\test_forward.py
if (! $?) { Throw ("Error running tests") }
C:\Python27\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error tests\python\train
C:\Python27\python.exe -m nose -v -s --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_gluon.xml tests\python\gpu\test_gluon_gpu.py:test_bulking
if (! $?) { Throw ("Error running tests") }
#C:\Python27\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_forward.xml tests\python\gpu\test_forward.py
#if (! $?) { Throw ("Error running tests") }
#C:\Python27\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error tests\python\train
#if (! $?) { Throw ("Error running tests") }
14 changes: 8 additions & 6 deletions ci/windows/test_py3_gpu.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ $env:MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
$env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home')

C:\Python37\Scripts\pip install -r tests\requirements.txt
C:\Python37\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") }
C:\Python37\python.exe -m nose -v -s --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_operator.xml tests\python\gpu\test_operator_gpu.py
#C:\Python37\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") }
C:\Python37\python.exe -m nose -v -s --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_operator.xml tests\python\gpu\test_operator_gpu.py:test_bulking
if (! $?) { Throw ("Error running tests") }
C:\Python37\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_forward.xml tests\python\gpu\test_forward.py
if (! $?) { Throw ("Error running tests") }
C:\Python37\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_train.xml tests\python\train
C:\Python37\python.exe -m nose -v -s --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_gluon.xml tests\python\gpu\test_gluon_gpu.py:test_bulking
if (! $?) { Throw ("Error running tests") }
#C:\Python37\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_forward.xml tests\python\gpu\test_forward.py
#if (! $?) { Throw ("Error running tests") }
#C:\Python37\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_train.xml tests\python\train
#if (! $?) { Throw ("Error running tests") }
4 changes: 3 additions & 1 deletion src/executor/graph_executor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,9 @@ void GraphExecutor::InitOpSegs() {

bool is_training = num_forward_nodes_ != total_num_nodes;

LOG(INFO) << "Fwd=" << Imperative::BulkExecMaxNodeTrainFwd() << "\tBwd=" << Imperative::BulkExecMaxNodeTrainBwd() << "\tBulk=" << Imperative::PreferBulkExecTrain();
LOG(INFO) << "Fwd=" << Imperative::BulkExecMaxNodeTrainFwd() <<
" Bwd=" << Imperative::BulkExecMaxNodeTrainBwd() <<
" Bulk=" << Imperative::PreferBulkExecTrain();

if (prefer_bulk_exec_train && is_training) {
// Bulk the forward portion of the graph per the bulk segment max size for forward training
Expand Down