Merge pull request Azure#622 from Azure/release_update/Release-25

update samples - test

Author: vizhur

how-to-use-azureml/azure-databricks/Databricks_AMLSDK_1-4_6.dbc

@@ -1,73 +1,33 @@
-Azure Databricks is a managed Spark offering on Azure and customers already use it for advanced analytics. It provides a collaborative Notebook based environment with CPU or GPU based compute cluster.
+Azure Databricks is a managed Spark offering on Azure and customers already use it for advanced analytics. It provides a collaborative Notebook based environment with CPU or GPU based compute cluster. 
 
-In this section, you will find sample notebooks on how to use Azure Machine Learning SDK with Azure Databricks. You can train a model using Spark MLlib and then deploy the model to ACI/AKS from within Azure Databricks. You can also use Automated ML capability (**public preview**) of Azure ML SDK with Azure Databricks.
+In this section, you will find sample notebooks on how to use Azure Machine Learning SDK with Azure Databricks. You can train a model using Spark MLlib and then deploy the model to ACI/AKS from within Azure Databricks. You can also use Automated ML capability (**public preview**) of Azure ML SDK with Azure Databricks. 
 
-- Customers who use Azure Databricks for advanced analytics can now use the same cluster to run experiments with or without automated machine learning.
-- You can keep the data within the same cluster.
-- You can leverage the local worker nodes with autoscale and auto termination capabilities.
-- You can use multiple cores of your Azure Databricks cluster to perform simultenous training.
-- You can further tune the model generated by automated machine learning if you chose to.
-- Every run (including the best run) is available as a pipeline, which you can tune further if needed.
+- Customers who use Azure Databricks for advanced analytics can now use the same cluster to run experiments with or without automated machine learning. 
+- You can keep the data within the same cluster. 
+- You can leverage the local worker nodes with autoscale and auto termination capabilities. 
+- You can use multiple cores of your Azure Databricks cluster to perform simultenous training. 
+- You can further tune the model generated by automated machine learning if you chose to. 
+- Every run (including the best run) is available as a pipeline, which you can tune further if needed. 
 - The model trained using Azure Databricks can be registered in Azure ML SDK workspace and then deployed to Azure managed compute (ACI or AKS) using the Azure Machine learning SDK.
 
 Please follow our [Azure doc](https://docs.microsoft.com/en-us/azure/machine-learning/service/how-to-configure-environment#azure-databricks) to install the sdk in your Azure Databricks cluster before trying any of the sample notebooks.
 
-**Single file** -
+**Single file** - 
 The following archive contains all the sample notebooks. You can the run notebooks after importing [DBC](Databricks_AMLSDK_1-4_6.dbc) in your Databricks workspace instead of downloading individually.
 
-Notebooks 1-4 have to be run sequentially & are related to Income prediction experiment based on this [dataset](https://archive.ics.uci.edu/ml/datasets/adult) and demonstrate how to data prep, train and operationalize a Spark ML model with Azure ML Python SDK from within Azure Databricks.
+Notebooks 1-4 have to be run sequentially & are related to Income prediction experiment based on this [dataset](https://archive.ics.uci.edu/ml/datasets/adult) and demonstrate how to data prep, train and operationalize a Spark ML model with Azure ML Python SDK from within Azure Databricks. 
 
 Notebook 6 is an Automated ML sample notebook for Classification.
 
 Learn more about [how to use Azure Databricks as a development environment](https://docs.microsoft.com/azure/machine-learning/service/how-to-configure-environment#azure-databricks) for Azure Machine Learning service.
 
-**Databricks as a Compute Target from Azure ML Pipelines**
-You can use Azure Databricks as a compute target from [Azure Machine Learning Pipelines](https://docs.microsoft.com/en-us/azure/machine-learning/service/concept-ml-pipelines). Take a look at this notebook for details: [aml-pipelines-use-databricks-as-compute-target.ipynb](https://github.com/Azure/MachineLearningNotebooks/tree/master/how-to-use-azureml/azure-databricks/databricks-as-remote-compute-target/aml-pipelines-use-databricks-as-compute-target.ipynb).
-
-# Linked Azure Databricks and Azure Machine Learning Workspaces (Preview)
-Customers can now link Azure Databricks and AzureML Workspaces to better enable cross-Azure ML scenarios by [managing their tracking data in a single place when using the MLflow client](https://mlflow.org/docs/latest/tracking.html#mlflow-tracking) - the Azure ML workspace.
-
-## Linking the Workspaces (Admin operation)
-
-1. The Azure Databricks Azure portal blade now includes a new button to link an Azure ML workspace.
-![New ADB Portal Link button](./img/adb-link-button.png)
-2. Both a new or existing Azure ML Workspace can be linked in the resulting prompt. Follow any instructions to set up the Azure ML Workspace.
-![Link Prompt](./img/link-prompt.png)
-3. After a successful link operation, you should see the Azure Databricks overview reflect the linked status
-![Linked Successfully](./img/adb-successful-link.png)
-
-## Configure MLflow to send data to Azure ML (All roles)
-
-1. Add azureml-mlflow as a library to any notebook or cluster that should send data to Azure ML. You can do this via:
-    1. [DBUtils](https://docs.azuredatabricks.net/user-guide/dev-tools/dbutils.html#dbutils-library)
-        ```
-        dbutils.library.installPyPI("azureml-mlflow")
-        dbutils.library.restartPython()  # Removes Python state
-        ```
-    2. [Cluster Libraries](https://docs.azuredatabricks.net/user-guide/libraries.html#install-a-library-on-a-cluster)
-    ![Cluster Library](./img/cluster-library.png)
-2. [Set the MLflow tracking URI](https://mlflow.org/docs/latest/tracking.html#where-runs-are-recorded) to the following scheme:
-    ```
-    adbazureml://${azuremlRegion}.experiments.azureml.net/history/v1.0/subscriptions/${azuremlSubscriptionId}/resourceGroups/${azuremlResourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/${azuremlWorkspaceName}
-    ```
-    1. You can automatically configure this on your clusters for all subsequent notebook sessions using this helper script instead of manually setting the tracking URI in the notebook:
-        * [AzureML Tracking Cluster Init Script](./linking/README.md)
-3. If configured correctly, you'll now be able to see your MLflow tracking data in both Azure ML (via the REST API and all clients) and Azure Databricks (in the MLflow UI and using the MLflow client)
-
-
-## Known Preview Limitations
-While we roll this experience out to customers for feedback, there are some known limitations we'd love comments on in addition to any other issues seen in your workflow.
-### 1-to-1 Workspace linking
-Currently, an Azure ML Workspace can only be linked to one Azure Databricks Workspace at a time.
-### Data synchronization
-At the moment, data is only generated in the Azure Machine Learning workspace for tracking. Editing tags via the Azure Databricks MLflow UI won't be reflected in the Azure ML UI.
-### Java and R support
-The experience currently is only available from the Python MLflow client.
+**Databricks as a Compute Target from AML Pipelines**
+You can use Azure Databricks as a compute target from [Azure Machine Learning Pipelines](https://docs.microsoft.com/en-us/azure/machine-learning/service/concept-ml-pipelines). Take a look at this notebook for details: [aml-pipelines-use-databricks-as-compute-target.ipynb](https://github.com/Azure/MachineLearningNotebooks/tree/master/how-to-use-azureml/azure-databricks/databricks-as-remote-compute-target/aml-pipelines-use-databricks-as-compute-target.ipynb). 
 
 For more on SDK concepts, please refer to [notebooks](https://github.com/Azure/MachineLearningNotebooks).
 
 **Please let us know your feedback.**
 
+ 
 
-
-![Impressions](https://PixelServer20190423114238.azurewebsites.net/api/impressions/MachineLearningNotebooks/how-to-use-azureml/azure-databricks/README.png)
+![Impressions](https://PixelServer20190423114238.azurewebsites.net/api/impressions/MachineLearningNotebooks/how-to-use-azureml/azure-databricks/README.png) 

how-to-use-azureml/azure-databricks/README.md

@@ -361,7 +361,7 @@
       "outputs": [],
       "source": [
         "myenv = CondaDependencies.create(conda_packages=['numpy','scikit-learn', 'joblib', 'lightgbm', 'pandas'],\n",
-        "                                 pip_packages=['azureml-monitoring', 'azureml-sdk[automl]'])\n",
+        "                                 pip_packages=['azureml-monitoring', 'azureml-defaults'])\n",
         "\n",
         "with open(\"myenv.yml\",\"w\") as f:\n",
         "    f.write(myenv.serialize_to_string())"
@@ -626,7 +626,8 @@
       "metadata": {},
       "outputs": [],
       "source": [
-        "target_date = datetime.today()\n",
+        "now = datetime.utcnow()\n",
+        "target_date = datetime(now.year, now.month, now.day)\n",
         "run = datadrift.run(target_date, services, feature_list=feature_list, create_compute_target=True)"
       ]
     },
@@ -655,7 +656,7 @@
       "source": [
         "child_run.wait_for_completion(wait_post_processing=True)\n",
         "\n",
-        "drift_metrics = datadrift.get_output(start_time=start, end_time=end)\n",
+        "drift_metrics = datadrift.get_output(run_id=run.id)\n",
         "drift_metrics"
       ]
     },
@@ -668,7 +669,7 @@
         "# Show all drift figures, one per serivice.\n",
         "# If setting with_details is False (by default), only drift will be shown; if it's True, all details will be shown.\n",
         "\n",
-        "drift_figures = datadrift.show(with_details=True)"
+        "drift_figures = datadrift.show()"
       ]
     },
     {
@@ -691,7 +692,7 @@
   "metadata": {
     "authors": [
       {
-        "name": "rafarmah"
+        "name": "dmdatadrift"
       }
     ],
     "kernelspec": {

how-to-use-azureml/azure-databricks/img/adb-link-button.png

@@ -1,14 +1,10 @@
-import pickle
 import json
-import numpy
-import azureml.train.automl
-from sklearn.externals import joblib
-from sklearn.linear_model import Ridge
-from azureml.core.model import Model
-from azureml.core.run import Run
-from azureml.monitoring import ModelDataCollector
 import time
+
 import pandas as pd
+from azureml.core.model import Model
+from azureml.monitoring import ModelDataCollector
+from sklearn.externals import joblib
 
 
 def init():
@@ -25,11 +21,11 @@ def init():
     categorical_features = ["usaf", "wban", "p_k", "station_name"]
 
     inputs_dc = ModelDataCollector(model_name="driftmodel",
-                                   identifier="inputs",
+                                   designation="inputs",
                                    feature_names=feature_names)
 
-    prediction_dc = ModelDataCollector("driftmodel",
-                                       identifier="predictions",
+    prediction_dc = ModelDataCollector(model_name="driftmodel",
+                                       designation="predictions",
                                        feature_names=["temperature"])