Merge branch 'master' into ragav

Author: djarpin

advanced_functionality/data_distribution_types/data_distribution_types.ipynb

@@ -720,7 +720,7 @@
    "source": [
     "### (Optional) Clean-up\n",
     "\n",
-    "If you're ready to be done with this notebook, please uncomment and run the cell below.  This will remove the hosted endpoints you created and avoid any charges from a stray instance being left on."
+    "If you're ready to be done with this notebook, please run the cell below.  This will remove the hosted endpoints you created and avoid any charges from a stray instance being left on."
    ]
   },
   {
@@ -729,8 +729,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#sm.delete_endpoint(EndpointName=sharded_endpoint)\n",
-    "#sm.delete_endpoint(EndpointName=replicated_endpoint)"
+    "sm.delete_endpoint(EndpointName=sharded_endpoint)\n",
+    "sm.delete_endpoint(EndpointName=replicated_endpoint)"
    ]
   }
  ],

advanced_functionality/handling_kms_encrypted_data/handling_kms_encrypted_data.ipynb

@@ -525,7 +525,7 @@
    "source": [
     "### (Optional) Delete the Endpoint\n",
     "\n",
-    "If you're ready to be done with this notebook, please uncomment the delete_endpoint line in the cell below and then run it.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
+    "If you're ready to be done with this notebook, please run the delete_endpoint line in the cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
    ]
   },
   {
@@ -534,7 +534,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# client.delete_endpoint(EndpointName=endpoint_name)"
+    "client.delete_endpoint(EndpointName=endpoint_name)"
    ]
   }
  ],

advanced_functionality/kmeans_bring_your_own_model/kmeans_bring_your_own_model.ipynb

@@ -350,6 +350,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "# Remove endpoint to avoid stray charges\n",
     "sm.delete_endpoint(EndpointName=kmeans_endpoint)"
    ]
   }

advanced_functionality/r_bring_your_own/r_bring_your_own.ipynb

@@ -88,7 +88,7 @@
    "source": [
     "### Permissions\n",
     "\n",
-    "Running this notebook requires permissions in addition to the normal `SageMakerFullAccess` permissions. This is because we'll be creating a new repository in Amazon ECR. The easiest way to add these permissions is simply to add the managed policy `AmazonEC2ContainerRegistryPowerUser` to the role that you used to start your notebook instance. There's no need to start your notebook instance when you do this, the new permissions will be available immediately.\n",
+    "Running this notebook requires permissions in addition to the normal `SageMakerFullAccess` permissions. This is because we'll be creating a new repository in Amazon ECR. The easiest way to add these permissions is simply to add the managed policy `AmazonEC2ContainerRegistryFullAccess` to the role that you used to start your notebook instance. There's no need to restart your notebook instance when you do this, the new permissions will be available immediately.\n",
     "\n",
     "---\n",
     "## Code\n",
@@ -227,9 +227,9 @@
     "\n",
     "\n",
     "#' Ping to show server is there\n",
-    "#' @post /ping\n",
+    "#' @get /ping\n",
     "function() {\n",
-    "    list(status='200', code='200')}\n",
+    "    return('')}\n",
     "\n",
     "\n",
     "#' Parse input and return the prediction from the model\n",
@@ -268,7 +268,7 @@
     "```Dockerfile\n",
     "FROM ubuntu:16.04\n",
     "\n",
-    "MAINTAINER David Arpin <arpin@amazon.com>\n",
+    "MAINTAINER Amazon SageMaker Examples <amazon-sagemaker-examples@amazon.com>\n",
     "\n",
     "RUN apt-get -y update && apt-get install -y --no-install-recommends \\\n",
     "    wget \\\n",
@@ -643,7 +643,7 @@
    "source": [
     "### (Optional) Clean-up\n",
     "\n",
-    "If you're ready to be done with this notebook, please uncomment and run cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
+    "If you're ready to be done with this notebook, please run the cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
    ]
   },
   {
@@ -652,7 +652,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#sm.delete_endpoint(EndpointName=r_endpoint)"
+    "sm.delete_endpoint(EndpointName=r_endpoint)"
    ]
   }
  ],

advanced_functionality/scikit_bring_your_own/scikit_bring_your_own.ipynb

@@ -497,7 +497,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# sess.delete_endpoint(predictor.endpoint)"
+    "sess.delete_endpoint(predictor.endpoint)"
    ]
   }
  ],

advanced_functionality/xgboost_bring_your_own_model/xgboost_bring_your_own_model.ipynb

@@ -464,7 +464,7 @@
    "source": [
     "### (Optional) Delete the Endpoint\n",
     "\n",
-    "If you're ready to be done with this notebook, please uncomment the delete_endpoint line in the cell below and then run it.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
+    "If you're ready to be done with this notebook, please run the delete_endpoint line in the cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
    ]
   },
   {
@@ -475,7 +475,7 @@
    },
    "outputs": [],
    "source": [
-    "# sm_client.delete_endpoint(EndpointName=endpoint_name)"
+    "sm_client.delete_endpoint(EndpointName=endpoint_name)"
    ]
   }
  ],

introduction_to_amazon_algorithms/factorization_machines_mnist/factorization_machines_mnist.ipynb

@@ -380,7 +380,7 @@
    "source": [
     "### (Optional) Delete the Endpoint\n",
     "\n",
-    "If you're ready to be done with this notebook, please uncomment the delete_endpoint line in the cell below and then run it.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
+    "If you're ready to be done with this notebook, please run the delete_endpoint line in the cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
    ]
   },
   {
@@ -391,7 +391,7 @@
    "source": [
     "import sagemaker\n",
     "\n",
-    "#sagemaker.Session().delete_endpoint(fm_predictor.endpoint)"
+    "sagemaker.Session().delete_endpoint(fm_predictor.endpoint)"
    ]
   }
  ],

introduction_to_amazon_algorithms/imageclassification_caltech/Image-classification-fulltraining.ipynb

@@ -555,7 +555,7 @@
    "source": [
     "### Clean up\n",
     "\n",
-    "When we're done with the endpoint, we can just delete it and the backing instances will be released. Uncomment and run the following cell to delete the endpoint and model"
+    "When we're done with the endpoint, we can just delete it and the backing instances will be released.  Run the following cell to delete the endpoint."
    ]
   },
   {
@@ -566,8 +566,7 @@
    },
    "outputs": [],
    "source": [
-    "#sage.delete_endpoint(EndpointName=endpoint_name)\n",
-    "#sage.delete_model(ModelName=model_name)"
+    "sage.delete_endpoint(EndpointName=endpoint_name)"
    ]
   },
   {

introduction_to_amazon_algorithms/imageclassification_caltech/Image-classification-transfer-learning.ipynb

@@ -570,7 +570,7 @@
    "source": [
     "### Clean up\n",
     "\n",
-    "When we're done with the endpoint, we can just delete it and the backing instances will be released. Uncomment and run the following cell to delete the endpoint and model"
+    "When we're done with the endpoint, we can just delete it and the backing instances will be released.  Run the following cell to delete the endpoint."
    ]
   },
   {
@@ -581,8 +581,7 @@
    },
    "outputs": [],
    "source": [
-    "#sage.delete_endpoint(EndpointName=endpoint_name)\n",
-    "#sage.delete_model(ModelName=model_name)"
+    "sage.delete_endpoint(EndpointName=endpoint_name)"
    ]
   },
   {

introduction_to_amazon_algorithms/lda_topic_modeling/LDA-Introduction.ipynb

@@ -514,7 +514,7 @@
     "\n",
     "Finally, we should delete the endpoint before we close the notebook.\n",
     "\n",
-    "To do so uncomment and execute the cell below. Alternately, you can navigate to the \"Endpoints\" tab in the SageMaker console, select the endpoint with the name stored in the variable `endpoint_name`, and select \"Delete\" from the \"Actions\" dropdown menu. "
+    "To do so execute the cell below. Alternately, you can navigate to the \"Endpoints\" tab in the SageMaker console, select the endpoint with the name stored in the variable `endpoint_name`, and select \"Delete\" from the \"Actions\" dropdown menu. "
    ]
   },
   {
@@ -523,7 +523,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#sagemaker.Session().delete_endpoint(lda_inference.endpoint)"
+    "sagemaker.Session().delete_endpoint(lda_inference.endpoint)"
    ]
   },
   {

introduction_to_amazon_algorithms/linear_learner_mnist/linear_learner_mnist.ipynb

@@ -371,7 +371,7 @@
    "source": [
     "### (Optional) Delete the Endpoint\n",
     "\n",
-    "If you're ready to be done with this notebook, please uncomment the delete_endpoint line in the cell below and then run it.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
+    "If you're ready to be done with this notebook, please run the delete_endpoint line in the cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
    ]
   },
   {
@@ -384,7 +384,7 @@
    "source": [
     "import sagemaker\n",
     "\n",
-    "#sagemaker.Session().delete_endpoint(linear_predictor.endpoint)"
+    "sagemaker.Session().delete_endpoint(linear_predictor.endpoint)"
    ]
   }
  ],

introduction_to_amazon_algorithms/ntm_synthetic/ntm_synthetic.ipynb

@@ -473,7 +473,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#sagemaker.Session().delete_endpoint(ntm_predictor.endpoint)"
+    "sagemaker.Session().delete_endpoint(ntm_predictor.endpoint)"
    ]
   },
   {

introduction_to_amazon_algorithms/pca_mnist/pca_mnist.ipynb

@@ -369,7 +369,7 @@
    "source": [
     "### (Optional) Delete the Endpoint\n",
     "\n",
-    "If you're ready to be done with this notebook, please uncomment the delete_endpoint line in the cell below and then run it.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
+    "If you're ready to be done with this notebook, please run the delete_endpoint line in the cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
    ]
   },
   {
@@ -380,7 +380,7 @@
    "source": [
     "import sagemaker\n",
     "\n",
-    "#sagemaker.Session().delete_endpoint(pca_predictor.endpoint)"
+    "sagemaker.Session().delete_endpoint(pca_predictor.endpoint)"
    ]
   }
  ],

introduction_to_amazon_algorithms/seq2seq_translation_en-de/SageMaker-Seq2Seq-Translation-English-German.ipynb

@@ -814,7 +814,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# sage.delete_endpoint(EndpointName=endpoint_name)"
+    "sage.delete_endpoint(EndpointName=endpoint_name)"
    ]
   }
  ],

introduction_to_amazon_algorithms/xgboost_abalone/xgboost_abalone.ipynb

@@ -555,7 +555,7 @@
    },
    "outputs": [],
    "source": [
-    "# client.delete_endpoint(EndpointName=endpoint_name)"
+    "client.delete_endpoint(EndpointName=endpoint_name)"
    ]
   }
  ],

introduction_to_amazon_algorithms/xgboost_mnist/xgboost_mnist.ipynb

@@ -775,7 +775,7 @@
    },
    "outputs": [],
    "source": [
-    "# sm.delete_endpoint(EndpointName=endpoint_name)"
+    "sm.delete_endpoint(EndpointName=endpoint_name)"
    ]
   }
  ],

introduction_to_applying_machine_learning/breast_cancer_prediction/Breast Cancer Prediction.ipynb

@@ -638,7 +638,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "###### Uncomment the cell below to delete endpoint once you are done."
+    "###### Run the cell below to delete endpoint once you are done."
    ]
   },
   {
@@ -649,7 +649,7 @@
    },
    "outputs": [],
    "source": [
-    "#sm.delete_endpoint(EndpointName =linear_endpoint)"
+    "sm.delete_endpoint(EndpointName=linear_endpoint)"
    ]
   },
   {

introduction_to_applying_machine_learning/ensemble_modeling/EnsembleLearnerCensusIncome.ipynb

@@ -1171,7 +1171,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "##### Uncomment below to delete endpoints once you are done."
+    "##### Run below to delete endpoints once you are done."
    ]
   },
   {
@@ -1180,8 +1180,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#sm.delete_endpoint(EndpointName =endpoint_name)\n",
-    "#sm.delete_endpoint(EndpointName =linear_endpoint)"
+    "sm.delete_endpoint(EndpointName=endpoint_name)\n",
+    "sm.delete_endpoint(EndpointName=linear_endpoint)"
    ]
   },
   {

introduction_to_applying_machine_learning/linear_time_series_forecast/linear_time_series_forecast.ipynb

@@ -561,7 +561,7 @@
    "source": [
     "### (Optional) Clean-up\n",
     "\n",
-    "If you're ready to be done with this notebook, please uncomment and run cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
+    "If you're ready to be done with this notebook, please run the cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
    ]
   },
   {
@@ -570,7 +570,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#sagemaker.Session().delete_endpoint(linear_predictor.endpoint)"
+    "sagemaker.Session().delete_endpoint(linear_predictor.endpoint)"
    ]
   }
  ],

introduction_to_applying_machine_learning/xgboost_customer_churn/xgboost_customer_churn.ipynb

@@ -620,7 +620,7 @@
    "source": [
     "### (Optional) Clean-up\n",
     "\n",
-    "If you're ready to be done with this notebook, please uncomment and run cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
+    "If you're ready to be done with this notebook, please run the cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
    ]
   },
   {
@@ -629,7 +629,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#sagemaker.Session().delete_endpoint(xgb_predictor.endpoint)"
+    "sagemaker.Session().delete_endpoint(xgb_predictor.endpoint)"
    ]
   }
  ],

introduction_to_applying_machine_learning/xgboost_direct_marketing/xgboost_direct_marketing_sagemaker.ipynb

@@ -579,7 +579,7 @@
    "source": [
     "### (Optional) Clean-up\n",
     "\n",
-    "If you are done with this notebook, please uncomment and run the cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
+    "If you are done with this notebook, please run the cell below.  This will remove the hosted endpoint you created and avoid any charges from a stray instance being left on."
    ]
   },
   {
@@ -588,7 +588,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#sagemaker.Session().delete_endpoint(xgb_predictor.endpoint)"
+    "sagemaker.Session().delete_endpoint(xgb_predictor.endpoint)"
    ]
   }
  ],

sagemaker-python-sdk/mxnet_gluon_cifar10/cifar10.ipynb

@@ -234,7 +234,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "m.delete_endpoint()"
+    "sagemaker.Session().delete_endpoint(predictor.endpoint)"
    ]
   }
  ],

sagemaker-python-sdk/mxnet_gluon_mnist/mnist_with_gluon.ipynb

@@ -199,7 +199,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "m.delete_endpoint()"
+    "sagemaker.Session().delete_endpoint(predictor.endpoint)"
    ]
   }
  ],

sagemaker-python-sdk/mxnet_gluon_sentiment/sentiment_analysis_with_mxnet_gluon.ipynb

@@ -209,7 +209,7 @@
    },
    "outputs": [],
    "source": [
-    "# m.delete_endpoint()"
+    "sagemaker.Session().delete_endpoint(predictor.endpoint)"
    ]
   }
  ],

sagemaker-python-sdk/tensorflow_abalone_age_predictor_using_keras/tensorflow_abalone_age_predictor_using_keras.ipynb

@@ -561,7 +561,7 @@
    },
    "outputs": [],
    "source": [
-    "abalone_estimator.delete_endpoint()"
+    "sagemaker.Session().delete_endpoint(abalone_predictor.endpoint)"
    ]
   }
  ],