address local mode and MXNet + MMS

Author: laurenyu

src/sagemaker/estimator.py

@@ -1772,7 +1772,10 @@ def _model_entry_point(self):
             str: The path to the entry point script. This can be either an absolute path or
                 a path relative to ``self._model_source_dir()``.
         """
-        return self.uploaded_code.script_name if self._model_source_dir() else self.entry_point
+        if self.sagemaker_session.local_mode or (self._model_source_dir() is None):
+            return self.entry_point
+
+        return self.uploaded_code.script_name
 
     def hyperparameters(self):
         """Return the hyperparameters as a dictionary to use for training.

src/sagemaker/mxnet/estimator.py

@@ -217,10 +217,10 @@ def create_model(
         if "name" not in kwargs:
             kwargs["name"] = self._current_job_name
 
-        return MXNetModel(
+        model = MXNetModel(
             self.model_data,
             role or self.role,
-            entry_point or self._model_entry_point(),
+            entry_point,
             source_dir=(source_dir or self._model_source_dir()),
             enable_cloudwatch_metrics=self.enable_cloudwatch_metrics,
             container_log_level=self.container_log_level,
@@ -234,6 +234,11 @@ def create_model(
             **kwargs
         )
 
+        if entry_point is None:
+            model.entry_point = (
+                self.entry_point if model._is_mms_version() else self._model_entry_point()
+            )
+
     @classmethod
     def _prepare_init_params_from_job_description(cls, job_details, model_channel_name=None):
         """Convert the job description to init params that can be handled by the