[Fit API] improve event handlers (apache#14685)

* improve event handlers * update tests * passing weakref of estimator * fix unit test * fix test * fix pylint * fix test * fix pylint * move default metric logic * combine nightly tests
roywei · May 15, 2019 · fdd9aa7 · fdd9aa7
1 parent 1260288
commit fdd9aa7
Show file tree

Hide file tree

Showing 9 changed files with 388 additions and 338 deletions.
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
@@ -1350,31 +1350,19 @@ nightly_scala_demo_test_cpu() {
     bash bin/run_im.sh
 }
 
-nightly_estimator_cnn_gpu() {
+nightly_estimator_gpu() {
     set -ex
     cd /work/mxnet/tests/nightly/estimator
     export PYTHONPATH=/work/mxnet/python/
     python test_estimator_cnn.py --type gpu
-}
-
-nightly_estimator_cnn_cpu() {
-    set -ex
-    cd /work/mxnet/tests/nightly/estimator
-    export PYTHONPATH=/work/mxnet/python/
-    python test_estimator_cnn.py --type cpu
-}
-
-nightly_estimator_rnn_gpu() {
-    set -ex
-    cd /work/mxnet/tests/nightly/estimator
-    export PYTHONPATH=/work/mxnet/python/
     python test_sentiment_rnn.py --type gpu
 }
 
-nightly_estimator_rnn_cpu() {
+nightly_estimator_cpu() {
     set -ex
     cd /work/mxnet/tests/nightly/estimator
     export PYTHONPATH=/work/mxnet/python/
+    python test_estimator_cnn.py --type cpu
     python test_sentiment_rnn.py --type cpu
 }
 

diff --git a/python/mxnet/gluon/contrib/estimator/estimator.py b/python/mxnet/gluon/contrib/estimator/estimator.py