Merge pull request Azure#48 from rastala/master

Update notebooks with new version

Author: rastala

01.getting-started/01.train-within-notebook/01.train-within-notebook.ipynb

@@ -527,7 +527,6 @@
         "\n",
         "myenv = CondaDependencies()\n",
         "myenv.add_conda_package(\"scikit-learn\")\n",
-        "myenv.add_pip_package(\"pynacl==1.2.1\")\n",
         "print(myenv.serialize_to_string())\n",
         "\n",
         "with open(\"myenv.yml\",\"w\") as f:\n",
@@ -789,6 +788,11 @@
     }
   ],
   "metadata": {
+    "authors": [
+      {
+        "name": "roastala"
+      }
+    ],
     "kernelspec": {
       "display_name": "Python 3.6",
       "language": "python",

01.getting-started/02.train-on-local/02.train-on-local.ipynb

@@ -218,7 +218,7 @@
         "run_config_system_managed = RunConfiguration()\n",
         "\n",
         "run_config_system_managed.environment.python.user_managed_dependencies = False\n",
-        "run_config_system_managed.prepare_environment = True\n",
+        "run_config_system_managed.auto_prepare_environment = True\n",
         "\n",
         "# Specify conda dependencies with scikit-learn\n",
         "cd = CondaDependencies.create(conda_packages=['scikit-learn'])\n",
@@ -297,7 +297,7 @@
         "run_config_docker = RunConfiguration()\n",
         "\n",
         "run_config_docker.environment.python.user_managed_dependencies = False\n",
-        "run_config_docker.prepare_environment = True\n",
+        "run_config_docker.auto_prepare_environment = True\n",
         "run_config_docker.environment.docker.enabled = True\n",
         "run_config_docker.environment.docker.base_image = azureml.core.runconfig.DEFAULT_CPU_IMAGE\n",
         "\n",
@@ -442,6 +442,11 @@
     }
   ],
   "metadata": {
+    "authors": [
+      {
+        "name": "roastala"
+      }
+    ],
     "kernelspec": {
       "display_name": "Python 3.6",
       "language": "python",

01.getting-started/02.train-on-local/train.py

@@ -15,7 +15,7 @@
 
 X, y = load_diabetes(return_X_y=True)
 
-run = Run.get_submitted_run()
+run = Run.get_context()
 
 X_train, X_test, y_train, y_test = train_test_split(X, y,
                                                     test_size=0.2,

01.getting-started/03.train-on-aci/03.train-on-aci.ipynb

@@ -261,6 +261,11 @@
     }
   ],
   "metadata": {
+    "authors": [
+      {
+        "name": "roastala"
+      }
+    ],
     "kernelspec": {
       "display_name": "Python 3.6",
       "language": "python",

01.getting-started/03.train-on-aci/train.py

@@ -14,7 +14,7 @@
 
 X, y = load_diabetes(return_X_y=True)
 
-run = Run.get_submitted_run()
+run = Run.get_context()
 
 X_train, X_test, y_train, y_test = train_test_split(X, y,
                                                     test_size=0.2,

01.getting-started/04.train-on-remote-vm/04.train-on-remote-vm.ipynb

@@ -158,7 +158,7 @@
       "metadata": {},
       "outputs": [],
       "source": [
-        "ds.upload_files(['./feeatures.npy', './labels.npy'], target_path='diabetes', overwrite=True)"
+        "ds.upload_files(['./features.npy', './labels.npy'], target_path='diabetes', overwrite=True)"
       ]
     },
     {
@@ -394,7 +394,7 @@
       ]
     },
     {
-      "cell_type": "raw",
+      "cell_type": "markdown",
       "metadata": {},
       "source": [
         "You can choose to SSH into the VM and install Azure ML SDK, and any other missing dependencies, in that Python environment. For demonstration purposes, we simply are going to create another script `train2.py` that doesn't have azureml dependencies, and submit it instead."
@@ -407,6 +407,7 @@
       "outputs": [],
       "source": [
         "%%writefile $script_folder/train2.py\n",
+        "\n",
         "print('####################################')\n",
         "print('Hello World (without Azure ML SDK)!')\n",
         "print('####################################')"
@@ -592,6 +593,11 @@
     }
   ],
   "metadata": {
+    "authors": [
+      {
+        "name": "haining"
+      }
+    ],
     "kernelspec": {
       "display_name": "Python 3.6",
       "language": "python",
@@ -612,4 +618,4 @@
   },
   "nbformat": 4,
   "nbformat_minor": 2
-}
+}

01.getting-started/04.train-on-remote-vm/train.py

@@ -24,7 +24,7 @@
 X = np.load(os.path.join(args.data_folder, 'features.npy'))
 y = np.load(os.path.join(args.data_folder, 'labels.npy'))
 
-run = Run.get_submitted_run()
+run = Run.get_context()
 
 X_train, X_test, y_train, y_test = train_test_split(
     X, y, test_size=0.2, random_state=0)

01.getting-started/05.train-in-spark/05.train-in-spark.ipynb

@@ -303,6 +303,11 @@
     }
   ],
   "metadata": {
+    "authors": [
+      {
+        "name": "aashishb"
+      }
+    ],
     "kernelspec": {
       "display_name": "Python 3.6",
       "language": "python",

01.getting-started/05.train-in-spark/train-spark.py

@@ -18,7 +18,7 @@
 from azureml.core.run import Run
 
 # initialize logger
-run = Run.get_submitted_run()
+run = Run.get_context()
 
 # start Spark session
 spark = pyspark.sql.SparkSession.builder.appName('Iris').getOrCreate()

01.getting-started/10.register-model-create-image-deploy-service/10.register-model-create-image-deploy-service.ipynb

@@ -206,7 +206,6 @@
         "from azureml.core.conda_dependencies import CondaDependencies \n",
         "\n",
         "myenv = CondaDependencies.create(conda_packages=['numpy','scikit-learn'])\n",
-        "myenv.add_pip_package(\"pynacl==1.2.1\")\n",
         "\n",
         "with open(\"myenv.yml\",\"w\") as f:\n",
         "    f.write(myenv.serialize_to_string())"
@@ -398,6 +397,11 @@
     }
   ],
   "metadata": {
+    "authors": [
+      {
+        "name": "raymondl"
+      }
+    ],
     "kernelspec": {
       "display_name": "Python 3.6",
       "language": "python",