Skip to content

Commit 7f249e2

Browse files
authored
Merge pull request #232986 from MicrosoftDocs/release-azureml-monikers
Release azureml monikers--scheduled release ASAP
2 parents d0c7b65 + c8d0e66 commit 7f249e2

File tree

182 files changed

+1226
-6955
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+1226
-6955
lines changed

articles/machine-learning/.openpublishing.redirection.machine-learning.json

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,48 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/machine-learning/v1/how-to-network-security-overview.md",
5+
"redirect_url": "/azure/machine-learning/how-to-network-security-overview",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/machine-learning/v1/how-to-workspace-diagnostic-api.md",
10+
"redirect_url": "/azure/machine-learning/how-to-workspace-diagnostic-api",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/machine-learning/how-to-configure-cross-validation-data-splits.md",
15+
"redirect_url": "/azure/machine-learning/v1/how-to-configure-cross-validation-data-splits",
16+
"redirect_document_id": true
17+
},
18+
{
19+
"source_path_from_root": "/articles/machine-learning/how-to-troubleshoot-auto-ml.md",
20+
"redirect_url": "/azure/machine-learning/v1/how-to-troubleshoot-auto-ml",
21+
"redirect_document_id": true
22+
},
23+
{
24+
"source_path_from_root": "/articles/machine-learning/v1/how-to-export-delete-data.md",
25+
"redirect_url": "/azure/machine-learning/how-to-export-delete-data.md",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/machine-learning/how-to-configure-auto-features.md",
30+
"redirect_url": "/azure/machine-learning/v1/how-to-configure-auto-features",
31+
"redirect_document_id": true
32+
},
33+
{
34+
"source_path_from_root": "/articles/machine-learning/how-to-generate-automl-training-code.md",
35+
"redirect_url": "/azure/machine-learning/v1/how-to-generate-automl-training-code",
36+
"redirect_document_id": true
37+
},
38+
{
39+
"source_path_from_root": "/articles/machine-learning/how-to-configure-databricks-automl-environment.md",
40+
"redirect_url": "/azure/machine-learning/v1/how-to-configure-databricks-automl-environment",
41+
"redirect_document_id": true
42+
},
343
{
444
"source_path_from_root": "/articles/machine-learning/reference-checkpoint-performance-with-Nebula.md",
5-
"redirect_url": "/articles/machine-learning/reference-checkpoint-performance-for-large-models",
45+
"redirect_url": "/azure/machine-learning/reference-checkpoint-performance-for-large-models",
646
"redirect_document_id": true
747
},
848
{

articles/machine-learning/azure-machine-learning-glossary.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ author: frogglew
99
ms.author: saoh
1010
ms.reviewer: sgilley
1111
ms.date: 09/21/2022
12+
monikerRange: 'azureml-api-2'
1213
---
1314

1415
# Azure Machine Learning glossary

articles/machine-learning/component-reference-v2/classification.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ AutoML creates a number of pipelines in parallel that try different algorithms a
3434

3535
1. For **classification**, you can also enable deep learning.
3636

37-
If deep learning is enabled, validation is limited to _train_validation split_. [Learn more about validation options](../how-to-configure-cross-validation-data-splits.md).
37+
If deep learning is enabled, validation is limited to _train_validation split_. [Learn more about validation options](../v1/how-to-configure-cross-validation-data-splits.md).
3838

3939

4040
1. (Optional) View addition configuration settings: additional settings you can use to better control the training job. Otherwise, defaults are applied based on experiment selection and data.
@@ -45,12 +45,12 @@ If deep learning is enabled, validation is limited to _train_validation split_.
4545
Explain best model | Select to enable or disable, in order to show explanations for the recommended best model. <br> This functionality is not currently available for [certain forecasting algorithms](../v1/how-to-machine-learning-interpretability-automl.md#interpretability-during-training-for-the-best-model).
4646
Blocked algorithm| Select algorithms you want to exclude from the training job. <br><br> Allowing algorithms is only available for [SDK experiments](../how-to-configure-auto-train.md#supported-algorithms). <br> See the [supported algorithms for each task type](/python/api/azureml-automl-core/azureml.automl.core.shared.constants.supportedmodels).
4747
Exit criterion| When any of these criteria are met, the training job is stopped. <br> *Training job time (hours)*: How long to allow the training job to run. <br> *Metric score threshold*: Minimum metric score for all pipelines. This ensures that if you have a defined target metric you want to reach, you do not spend more time on the training job than necessary.
48-
Concurrency| *Max concurrent iterations*: Maximum number of pipelines (iterations) to test in the training job. The job will not run more than the specified number of iterations. Learn more about how automated ML performs [multiple child jobs on clusters](/how-to-configure-auto-train.md#multiple-child-runs-on-clusters).
48+
Concurrency| *Max concurrent iterations*: Maximum number of pipelines (iterations) to test in the training job. The job will not run more than the specified number of iterations. Learn more about how automated ML performs [multiple child jobs on clusters](../how-to-configure-auto-train.md#multiple-child-runs-on-clusters).
4949

5050

5151
1. The **[Optional] Validate and test** form allows you to do the following.
5252

53-
1. Specify the type of validation to be used for your training job. [Learn more about cross validation](../how-to-configure-cross-validation-data-splits.md#prerequisites).
53+
1. Specify the type of validation to be used for your training job. [Learn more about cross validation](../v1/how-to-configure-cross-validation-data-splits.md#prerequisites).
5454

5555
1. Provide a test dataset (preview) to evaluate the recommended model that automated ML generates for you at the end of your experiment. When you provide test data, a test job is automatically triggered at the end of your experiment. This test job is only job on the best model that was recommended by automated ML.
5656

articles/machine-learning/component-reference-v2/regression.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ AutoML creates a number of pipelines in parallel that try different algorithms a
4646

4747
1. The **[Optional] Validate and test** form allows you to do the following.
4848

49-
1. Specify the type of validation to be used for your training job. [Learn more about cross validation](../how-to-configure-cross-validation-data-splits.md#prerequisites).
49+
1. Specify the type of validation to be used for your training job. [Learn more about cross validation](../v1/how-to-configure-cross-validation-data-splits.md#prerequisites).
5050

5151

5252
1. Provide a test dataset (preview) to evaluate the recommended model that automated ML generates for you at the end of your experiment. When you provide test data, a test job is automatically triggered at the end of your experiment. This test job is only job on the best model that was recommended by automated ML.

articles/machine-learning/concept-automated-ml.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom: automl, event-tier1-build-2022, ignite-2022
1717

1818
[!INCLUDE [sdk v2](../../includes/machine-learning-sdk-v2.md)]
1919
> [!div class="op_single_selector" title1="Select the version of the Azure Machine Learning Python SDK you are using:"]
20-
> * [v1](./v1/concept-automated-ml-v1.md)
20+
> * [v1](./v1/concept-automated-ml-v1.md?view=azureml-api-1&preserve-view=true)
2121
> * [v2 (current version)](concept-automated-ml.md)
2222
2323
Automated machine learning, also referred to as automated ML or AutoML, is the process of automating the time-consuming, iterative tasks of machine learning model development. It allows data scientists, analysts, and developers to build ML models with high scale, efficiency, and productivity all while sustaining model quality. Automated ML in Azure Machine Learning is based on a breakthrough from our [Microsoft Research division](https://www.microsoft.com/research/project/automl/).
@@ -48,7 +48,7 @@ The following diagram illustrates this process.
4848

4949
You can also inspect the logged job information, which [contains metrics](how-to-understand-automated-ml.md) gathered during the job. The training job produces a Python serialized object (`.pkl` file) that contains the model and data preprocessing.
5050

51-
While model building is automated, you can also [learn how important or relevant features are](./v1/how-to-configure-auto-train-v1.md#explain) to the generated models.
51+
While model building is automated, you can also [learn how important or relevant features are](./v1/how-to-configure-auto-train-v1.md?view=azureml-api-1&preserve-view=true#explain) to the generated models.
5252

5353
## When to use AutoML: classification, regression, forecasting, computer vision & NLP
5454

@@ -154,7 +154,7 @@ Learn how to [configure AutoML experiments to use test data (preview) with the S
154154

155155
Feature engineering is the process of using domain knowledge of the data to create features that help ML algorithms learn better. In Azure Machine Learning, scaling and normalization techniques are applied to facilitate feature engineering. Collectively, these techniques and feature engineering are referred to as featurization.
156156

157-
For automated machine learning experiments, featurization is applied automatically, but can also be customized based on your data. [Learn more about what featurization is included](how-to-configure-auto-features.md#featurization) and how AutoML helps [prevent over-fitting and imbalanced data](concept-manage-ml-pitfalls.md) in your models.
157+
For automated machine learning experiments, featurization is applied automatically, but can also be customized based on your data. [Learn more about what featurization is included (SDK v1)](./v1/how-to-configure-auto-features.md?view=azureml-api-1&preserve-view=true#featurization) and how AutoML helps [prevent over-fitting and imbalanced data](concept-manage-ml-pitfalls.md) in your models.
158158

159159
> [!NOTE]
160160
> Automated machine learning featurization steps (feature normalization, handling missing data,
@@ -212,7 +212,7 @@ How-to articles provide additional detail into what functionality automated ML o
212212

213213
+ Learn how to [train computer vision models with Python](how-to-auto-train-image-models.md).
214214

215-
+ Learn how to [view the generated code from your automated ML models](how-to-generate-automl-training-code.md).
215+
+ Learn how to [view the generated code from your automated ML models (SDK v1)](./v1/how-to-generate-automl-training-code.md?view=azureml-api-1&preserve-view=true).
216216

217217
### Jupyter notebook samples
218218

articles/machine-learning/concept-automl-forecasting-sweeping.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ AutoML follows the usual cross-validation procedure, training a separate model o
5353

5454
Cross-validation for forecasting jobs is configured by setting the number of cross-validation folds and, optionally, the number of time periods between two consecutive cross-validation folds. See the [custom cross-validation settings](./how-to-auto-train-forecast.md#custom-cross-validation-settings) guide for more information and an example of configuring cross-validation for forecasting.
5555

56-
You can also bring your own validation data. Learn more in the [configure data splits and cross-validation in AutoML](how-to-configure-cross-validation-data-splits.md#provide-validation-data) article.
56+
You can also bring your own validation data. Learn more in the [configure data splits and cross-validation in AutoML (SDK v1)](./v1/how-to-configure-cross-validation-data-splits.md#provide-validation-data) article.
5757

5858
## Next steps
5959
* Learn more about [how to set up AutoML to train a time-series forecasting model](./how-to-auto-train-forecast.md).

articles/machine-learning/concept-azure-machine-learning-v2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.date: 11/04/2022
1818

1919
[!INCLUDE [dev v2](../../includes/machine-learning-dev-v2.md)]
2020

21-
This article applies to the second version of the [Azure Machine Learning CLI & Python SDK (v2)](concept-v2.md). For version one (v1), see [How Azure Machine Learning works: Architecture and concepts (v1)](v1/concept-azure-machine-learning-architecture.md)
21+
This article applies to the second version of the [Azure Machine Learning CLI & Python SDK (v2)](concept-v2.md). For version one (v1), see [How Azure Machine Learning works: Architecture and concepts (v1)](v1/concept-azure-machine-learning-architecture.md?view=azureml-api-1&preserve-view=true)
2222

2323
Azure Machine Learning includes several resources and assets to enable you to perform your machine learning tasks. These resources and assets are needed to run any job.
2424

articles/machine-learning/concept-compute-instance.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ms.author: jcioffi
1111
author: jesscioffi
1212
ms.reviewer: sgilley
1313
ms.date: 10/19/2022
14+
monikerRange: 'azureml-api-2 || azureml-api-1'
1415
#Customer intent: As a data scientist, I want to know what a compute instance is and how to use it for Azure Machine Learning.
1516
---
1617

@@ -90,7 +91,7 @@ Python packages are all installed in the **Python 3.8 - AzureML** environment. C
9091

9192
## Accessing files
9293

93-
Notebooks and Python scripts are stored in the default storage account of your workspace in Azure file share. These files are located under your User files directory. This storage makes it easy to share notebooks between compute instances. The storage account also keeps your notebooks safely preserved when you stop or delete a compute instance.
94+
Notebooks and Python scripts are stored in the default storage account of your workspace in Azure file share. These files are located under your "User files" directory. This storage makes it easy to share notebooks between compute instances. The storage account also keeps your notebooks safely preserved when you stop or delete a compute instance.
9495

9596
The Azure file share account of your workspace is mounted as a drive on the compute instance. This drive is the default working directory for Jupyter, Jupyter Labs, RStudio, and Posit Workbench. This means that the notebooks and other files you create in Jupyter, JupyterLab, RStudio, or Posit are automatically stored on the file share and available to use in other compute instances as well.
9697

@@ -100,8 +101,11 @@ You can also clone the latest Azure Machine Learning samples to your folder unde
100101

101102
Writing small files can be slower on network drives than writing to the compute instance local disk itself. If you're writing many small files, try using a directory directly on the compute instance, such as a `/tmp` directory. Note these files won't be accessible from other compute instances.
102103

103-
Don't store training data on the notebooks file share. You can use the `/tmp` directory on the compute instance for your temporary data. However, don't write large files of data on the OS disk of the compute instance. OS disk on compute instance has 128-GB capacity. You can also store temporary training data on temporary disk mounted on /mnt. Temporary disk size is based on the VM size chosen and can store larger amounts of data if a higher size VM is chosen. You can also mount [datastores and datasets](v1/concept-azure-machine-learning-architecture.md#datasets-and-datastores). Any software packages you install are saved on the OS disk of compute instance. Note customer managed key encryption is currently not supported for OS disk. The OS disk for compute instance is encrypted with Microsoft-managed keys.
104+
Don't store training data on the notebooks file share. You can use the `/tmp` directory on the compute instance for your temporary data. However, don't write large files of data on the OS disk of the compute instance. OS disk on compute instance has 128-GB capacity. You can also store temporary training data on temporary disk mounted on /mnt. Temporary disk size is based on the VM size chosen and can store larger amounts of data if a higher size VM is chosen. Any software packages you install are saved on the OS disk of compute instance. Note customer managed key encryption is currently not supported for OS disk. The OS disk for compute instance is encrypted with Microsoft-managed keys.
104105

106+
:::moniker range="azureml-api-1"
107+
You can also mount [datastores and datasets](v1/concept-azure-machine-learning-architecture.md?view=azureml-api-1&preserve-view=true#datasets-and-datastores).
108+
:::moniker-end
105109
## Create
106110

107111
Follow the steps in the [Quickstart: Create workspace resources you need to get started with Azure Machine Learning](quickstart-create-resources.md) to create a basic compute instance.

articles/machine-learning/concept-compute-target.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ author: vijetajo
1111
ms.reviewer: sgilley
1212
ms.date: 10/19/2022
1313
ms.custom: ignite-fall-2021, event-tier1-build-2022, cliv2
14+
monikerRange: 'azureml-api-2 || azureml-api-1'
1415
#Customer intent: As a data scientist, I want to understand what a compute target is and why I need it.
1516
---
1617

@@ -39,7 +40,12 @@ When performing inference, Azure Machine Learning creates a Docker container tha
3940

4041
[!INCLUDE [aml-deploy-target](../../includes/aml-compute-target-deploy.md)]
4142

43+
:::moniker range="azureml-api-2"
4244
Learn [where and how to deploy your model to a compute target](how-to-deploy-online-endpoints.md).
45+
:::moniker-end
46+
:::moniker range="azureml-api-1"
47+
Learn [where and how to deploy your model to a compute target](./v1/how-to-deploy-and-where.md).
48+
:::moniker-end
4349

4450
## Azure Machine Learning compute (managed)
4551

@@ -118,7 +124,9 @@ While Azure Machine Learning supports these VM series, they might not be availab
118124
> [!NOTE]
119125
> Azure Machine Learning doesn't support all VM sizes that Azure Compute supports. To list the available VM sizes, use one of the following methods:
120126
> * [REST API](https://github.com/Azure/azure-rest-api-specs/blob/master/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/examples/ListVMSizesResult.json)
127+
:::moniker range="azureml-api-2"
121128
> * The [Azure CLI extension 2.0 for machine learning](how-to-configure-cli.md) command, [az ml compute list-sizes](/cli/azure/ml/compute#az-ml-compute-list-sizes).
129+
:::moniker-end
122130

123131
If using the GPU-enabled compute targets, it is important to ensure that the correct CUDA drivers are installed in the training environment. Use the following table to determine the correct CUDA version to use:
124132

@@ -161,15 +169,27 @@ Azure Machine Learning supports the following unmanaged compute types:
161169
* Azure HDInsight
162170
* Azure Databricks
163171
* Azure Data Lake Analytics
172+
:::moniker range="azureml-api-1"
164173
* [Azure Synapse Spark pool](v1/how-to-link-synapse-ml-workspaces.md) (preview)
165174

166175
> [!TIP]
167176
> Currently this requires the Azure Machine Learning SDK v1.
177+
:::moniker-end
178+
:::moniker range="azureml-api-2"
168179
* [Kubernetes](how-to-attach-kubernetes-anywhere.md)
180+
:::moniker-end
181+
:::moniker range="azureml-api-1"
182+
* [Azure Kubernetes Service](./v1/how-to-create-attach-kubernetes.md)
183+
:::moniker-end
169184

170185
For more information, see [Manage compute resources](how-to-create-attach-compute-studio.md).
171186

172187
## Next steps
173188

174189
Learn how to:
190+
:::moniker range="azureml-api-2"
175191
* [Deploy your model to a compute target](how-to-deploy-online-endpoints.md)
192+
:::moniker-end
193+
:::moniker range="azureml-api-1"
194+
* [Deploy your model](./v1/how-to-deploy-and-where.md)
195+
:::moniker-end

0 commit comments

Comments
 (0)