[Distributed] Estimator input args sanity check.

Signed-off-by: 泊霆 <hujunqi.hjq@alibaba-inc.com>

Author: Mesilenceki

tensorflow/python/distribute/group_embedding_collective_strategy.py

@@ -101,7 +101,7 @@ def estimator(self, model_fn, **kwargs):
             from tensorflow.python.distribute.hvd_strategy import wraps_estimator
             _estimator = wraps_estimator(_estimator_lib.Estimator)
         elif self._hb:
-            _estimator = hb.estimator.Estimator
+            _estimator = self._hb.estimator.Estimator
 
         return _estimator(model_fn, **kwargs)
 

tensorflow/python/distribute/hvd_strategy.py

@@ -1060,10 +1060,14 @@ def __init__(self, model_fn, **kwargs):
             self._eval_drop_remainder = kwargs.pop('eval_drop_remainder', True)
             self._predict_drop_remainder = kwargs.pop(
                 'predict_drop_remainder', True)
+            config = kwargs.get('config', None)
+            if config is None:
+              config = run_config_lib.RunConfig()
+            else:
+              kwargs.pop('config')
 
             super().__init__(
-                wraps_model_fn(model_fn, model_dir, kwargs['config']),
-                **kwargs)
+                wraps_model_fn(model_fn, model_dir, config), **kwargs)
 
         def _assert_members_are_not_overridden(self):
             r'''disable the overridden check here.