Skip to content

Commit 1aba594

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into normesta-reg-updates-10
2 parents 29bc0ef + 80d9364 commit 1aba594

File tree

7 files changed

+175
-157
lines changed

7 files changed

+175
-157
lines changed

articles/active-directory/hybrid/reference-connect-health-version-history.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ms.collection: M365-identity-device-management
2222
The Azure Active Directory team regularly updates Azure AD Connect Health with new features and functionality. This article lists the versions and features that have been released.
2323

2424
> [!NOTE]
25-
> Connect Health agents are updated automatically when new version is released. Please ensure the auto-upgrade settings is enabled from Azure portal.
25+
> Azure AD Connect Health agents are updated automatically when new version is released.
2626
>
2727
2828
Azure AD Connect Health for Sync is integrated with Azure AD Connect installation. Read more about [Azure AD Connect release history](./reference-connect-version-history.md)

articles/machine-learning/concept-train-machine-learning-model.md

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,47 +8,49 @@ author: Blackmist
88
ms.author: larryfr
99
ms.subservice: core
1010
ms.topic: conceptual
11-
ms.date: 09/23/2021
11+
ms.date: 08/30/2022
1212
ms.custom: devx-track-python, devx-track-azurecli, event-tier1-build-2022
1313
ms.devlang: azurecli
1414
---
1515

1616
# Train models with Azure Machine Learning
1717

18+
[!INCLUDE [sdk v2](../../includes/machine-learning-sdk-v2.md)]
19+
> [!div class="op_single_selector" title1="Select the Azure Machine Learning version you are using:"]
20+
> * [v1](v1/concept-train-machine-learning-model-v1.md)
21+
> * [v2 (preview)](concept-train-machine-learning-model.md)
22+
1823
Azure Machine Learning provides several ways to train your models, from code-first solutions using the SDK to low-code solutions such as automated machine learning and the visual designer. Use the following list to determine which training method is right for you:
1924

2025
+ [Azure Machine Learning SDK for Python](#python-sdk): The Python SDK provides several ways to train models, each with different capabilities.
2126

2227
| Training method | Description |
2328
| ----- | ----- |
24-
| [Run configuration](#run-configuration) | A **typical way to train models** is to use a training script and job configuration. The job configuration provides the information needed to configure the training environment used to train your model. You can specify your training script, compute target, and Azure ML environment in your job configuration and run a training job. |
29+
| [command()](#submit-a-command) | A **typical way to train models** is to submit a command() that includes a training script, environment, and compute information. |
2530
| [Automated machine learning](#automated-machine-learning) | Automated machine learning allows you to **train models without extensive data science or programming knowledge**. For people with a data science and programming background, it provides a way to save time and resources by automating algorithm selection and hyperparameter tuning. You don't have to worry about defining a job configuration when using automated machine learning. |
26-
| [Machine learning pipeline](#machine-learning-pipeline) | Pipelines are not a different training method, but a **way of defining a workflow using modular, reusable steps**, that can include training as part of the workflow. Machine learning pipelines support using automated machine learning and run configuration to train models. Since pipelines are not focused specifically on training, the reasons for using a pipeline are more varied than the other training methods. Generally, you might use a pipeline when:<br>* You want to **schedule unattended processes** such as long running training jobs or data preparation.<br>* Use **multiple steps** that are coordinated across heterogeneous compute resources and storage locations.<br>* Use the pipeline as a **reusable template** for specific scenarios, such as retraining or batch scoring.<br>* **Track and version data sources, inputs, and outputs** for your workflow.<br>* Your workflow is **implemented by different teams that work on specific steps independently**. Steps can then be joined together in a pipeline to implement the workflow. |
31+
| [Machine learning pipeline](#machine-learning-pipeline) | Pipelines are not a different training method, but a **way of defining a workflow using modular, reusable steps** that can include training as part of the workflow. Machine learning pipelines support using automated machine learning and run configuration to train models. Since pipelines are not focused specifically on training, the reasons for using a pipeline are more varied than the other training methods. Generally, you might use a pipeline when:<br>* You want to **schedule unattended processes** such as long running training jobs or data preparation.<br>* Use **multiple steps** that are coordinated across heterogeneous compute resources and storage locations.<br>* Use the pipeline as a **reusable template** for specific scenarios, such as retraining or batch scoring.<br>* **Track and version data sources, inputs, and outputs** for your workflow.<br>* Your workflow is **implemented by different teams that work on specific steps independently**. Steps can then be joined together in a pipeline to implement the workflow. |
2732

2833
+ **Designer**: Azure Machine Learning designer provides an easy entry-point into machine learning for building proof of concepts, or for users with little coding experience. It allows you to train models using a drag and drop web-based UI. You can use Python code as part of the design, or train models without writing any code.
2934

3035
+ **Azure CLI**: The machine learning CLI provides commands for common tasks with Azure Machine Learning, and is often used for **scripting and automating tasks**. For example, once you've created a training script or pipeline, you might use the Azure CLI to start a training job on a schedule or when the data files used for training are updated. For training models, it provides commands that submit training jobs. It can submit jobs using run configurations or pipelines.
3136

32-
Each of these training methods can use different types of compute resources for training. Collectively, these resources are referred to as [__compute targets__](v1/concept-azure-machine-learning-architecture.md#compute-targets). A compute target can be a local machine or a cloud resource, such as an Azure Machine Learning Compute, Azure HDInsight, or a remote virtual machine.
37+
Each of these training methods can use different types of compute resources for training. Collectively, these resources are referred to as [__compute targets__](concept-compute-target.md). A compute target can be a local machine or a cloud resource, such as an Azure Machine Learning Compute, Azure HDInsight, or a remote virtual machine.
3338

3439
## Python SDK
3540

3641
The Azure Machine Learning SDK for Python allows you to build and run machine learning workflows with Azure Machine Learning. You can interact with the service from an interactive Python session, Jupyter Notebooks, Visual Studio Code, or other IDE.
3742

38-
* [What is the Azure Machine Learning SDK for Python](/python/api/overview/azure/ml/intro)
39-
* [Install/update the SDK](/python/api/overview/azure/ml/install)
43+
* [Install/update the SDK](/python/api/overview/azure/ml/installv2)
4044
* [Configure a development environment for Azure Machine Learning](how-to-configure-environment.md)
4145

42-
### Run configuration
46+
### Submit a command
4347

44-
A generic training job with Azure Machine Learning can be defined using the [ScriptRunConfig](/python/api/azureml-core/azureml.core.scriptrunconfig). The script run configuration is then used, along with your training script(s) to train a model on a compute target.
48+
A generic training job with Azure Machine Learning can be defined using the [command()](/python/api/azure-ai-ml/azure.ai.ml#azure-ai-ml-command). The command is then used, along with your training script(s) to train a model on the specified compute target.
4549

46-
You may start with a run configuration for your local computer, and then switch to one for a cloud-based compute target as needed. When changing the compute target, you only change the run configuration you use. A run also logs information about the training job, such as the inputs, outputs, and logs.
50+
You may start with a command for your local computer, and then switch to one for a cloud-based compute target as needed. When changing the compute target, you only change the compute parameter in the command that you use. A run also logs information about the training job, such as the inputs, outputs, and logs.
4751

48-
* [What is a run configuration?](v1/concept-azure-machine-learning-architecture.md#run-configurations)
4952
* [Tutorial: Train your first ML model](tutorial-1st-experiment-sdk-train.md)
5053
* [Examples: Jupyter Notebook and Python examples of training models](https://github.com/Azure/azureml-examples)
51-
* [How to: Configure a training run](v1/how-to-set-up-training-targets.md)
5254

5355
### Automated Machine Learning
5456

@@ -59,20 +61,16 @@ Define the iterations, hyperparameter settings, featurization, and other setting
5961
6062
* [What is automated machine learning?](concept-automated-ml.md)
6163
* [Tutorial: Create your first classification model with automated machine learning](tutorial-first-experiment-automated-ml.md)
62-
* [Examples: Jupyter Notebook examples for automated machine learning](https://github.com/Azure/MachineLearningNotebooks/tree/master/how-to-use-azureml/automated-machine-learning)
6364
* [How to: Configure automated ML experiments in Python](how-to-configure-auto-train.md)
64-
* [How to: Autotrain a time-series forecast model](how-to-auto-train-forecast.md)
6565
* [How to: Create, explore, and deploy automated machine learning experiments with Azure Machine Learning studio](how-to-use-automated-ml-for-ml-models.md)
6666

6767
### Machine learning pipeline
6868

69-
Machine learning pipelines can use the previously mentioned training methods. Pipelines are more about creating a workflow, so they encompass more than just the training of models. In a pipeline, you can train a model using automated machine learning or run configurations.
69+
Machine learning pipelines can use the previously mentioned training methods. Pipelines are more about creating a workflow, so they encompass more than just the training of models.
7070

7171
* [What are ML pipelines in Azure Machine Learning?](concept-ml-pipelines.md)
72-
* [Create and run machine learning pipelines with Azure Machine Learning SDK](v1/how-to-create-machine-learning-pipelines.md)
73-
* [Tutorial: Use Azure Machine Learning Pipelines for batch scoring](tutorial-pipeline-batch-scoring-classification.md)
74-
* [Examples: Jupyter Notebook examples for machine learning pipelines](https://github.com/Azure/MachineLearningNotebooks/tree/master/how-to-use-azureml/machine-learning-pipelines)
75-
* [Examples: Pipeline with automated machine learning](https://aka.ms/pl-automl)
72+
* [Tutorial: Create production ML pipelines with Python SDK v2 (preview) in a Jupyter notebook](tutorial-pipeline-python-sdk.md)
73+
7674

7775
### Understand what happens when you submit a training job
7876

@@ -84,7 +82,7 @@ The Azure training lifecycle consists of:
8482
1. The system calculates a hash of:
8583
- The base image
8684
- Custom docker steps (see [Deploy a model using a custom Docker base image](./how-to-deploy-custom-container.md))
87-
- The conda definition YAML (see [Create & use software environments in Azure Machine Learning](./how-to-use-environments.md))
85+
- The conda definition YAML (see [Manage Azure Machine Learning environments with the CLI (v2)](how-to-manage-environments-v2.md)))
8886
1. The system uses this hash as the key in a lookup of the workspace Azure Container Registry (ACR)
8987
1. If it is not found, it looks for a match in the global ACR
9088
1. If it is not found, the system builds a new image (which will be cached and registered with the workspace ACR)
@@ -94,7 +92,6 @@ The Azure training lifecycle consists of:
9492
1. Saving logs, model files, and other files written to `./outputs` to the storage account associated with the workspace
9593
1. Scaling down compute, including removing temporary storage
9694

97-
If you choose to train on your local machine ("configure as local run"), you do not need to use Docker. You may use Docker locally if you choose (see the section [Configure ML pipeline](v1/how-to-debug-pipelines.md) for an example).
9895

9996
## Azure Machine Learning designer
10097

@@ -109,11 +106,12 @@ The machine learning CLI is an extension for the Azure CLI. It provides cross-pl
109106

110107
* [Use the CLI extension for Azure Machine Learning](how-to-configure-cli.md)
111108
* [MLOps on Azure](https://github.com/microsoft/MLOps)
109+
* [Train models with the CLI (v2)](how-to-train-cli.md)
112110

113111
## VS Code
114112

115113
You can use the VS Code extension to run and manage your training jobs. See the [VS Code resource management how-to guide](how-to-manage-resources-vscode.md#experiments) to learn more.
116114

117115
## Next steps
118116

119-
Learn how to [Configure a training run](v1/how-to-set-up-training-targets.md).
117+
Learn how to [Tutorial: Create production ML pipelines with Python SDK v2 (preview) in a Jupyter notebook](tutorial-pipeline-python-sdk.md).

0 commit comments

Comments
 (0)