Skip to content

Commit 62acbf3

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-master
2 parents add5ed9 + ff552dc commit 62acbf3

File tree

10 files changed

+288
-175
lines changed

10 files changed

+288
-175
lines changed

articles/key-vault/general/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
href: tutorial-net-windows-virtual-machine.md
1616
- name: Use Azure Key Vault with a Windows virtual machine in Python
1717
href: tutorial-python-windows-virtual-machine.md
18-
- name: Use Azure Key Vault with an Azure web app in .NET
18+
- name: Connect Key Vault to an Web App with a managed identity and .NET
1919
href: tutorial-net-create-vault-azure-web-app.md
2020

2121
- name: Concepts

articles/key-vault/general/tutorial-net-create-vault-azure-web-app.md

Lines changed: 229 additions & 151 deletions
Large diffs are not rendered by default.

articles/key-vault/secrets/quick-create-net-v3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Azure Key Vault helps safeguard cryptographic keys and secrets used by cloud app
3434
## Prerequisites
3535

3636
* An Azure subscription - [create one for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
37-
* The [.NET Core 2.1 SDK or later](https://dotnet.microsoft.com/download/dotnet-core/2.1).
37+
* The [.NET Core 3.1 SDK or later](https://dotnet.microsoft.com/download/dotnet-core/3.1).
3838
* [Azure CLI](/cli/azure/install-azure-cli?view=azure-cli-latest) or [Azure PowerShell](/powershell/azure/overview)
3939

4040
This quickstart assumes you are running `dotnet`, [Azure CLI](/cli/azure/install-azure-cli?view=azure-cli-latest), and Windows commands in a Windows terminal (such as [PowerShell Core](/powershell/scripting/install/installing-powershell-core-on-windows?view=powershell-6), [Windows PowerShell](/powershell/scripting/install/installing-windows-powershell?view=powershell-6), or the [Azure Cloud Shell](https://shell.azure.com/)).

articles/key-vault/secrets/quick-create-net.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Azure Key Vault helps safeguard cryptographic keys and secrets used by cloud app
2727
## Prerequisites
2828

2929
* An Azure subscription - [create one for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
30-
* The [.NET Core 2.1 SDK or later](https://dotnet.microsoft.com/download/dotnet-core/2.1).
30+
* The [.NET Core 3.1 SDK or later](https://dotnet.microsoft.com/download/dotnet-core/2.1).
3131
* [Azure CLI](/cli/azure/install-azure-cli?view=azure-cli-latest) or [Azure PowerShell](/powershell/azure/overview)
3232

3333
This quickstart assumes you are running `dotnet`, [Azure CLI](/cli/azure/install-azure-cli?view=azure-cli-latest), and Windows commands in a Windows terminal (such as [PowerShell Core](/powershell/scripting/install/installing-powershell-core-on-windows?view=powershell-6), [Windows PowerShell](/powershell/scripting/install/installing-windows-powershell?view=powershell-6), or the [Azure Cloud Shell](https://shell.azure.com/)).

articles/key-vault/secrets/toc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
href: quick-create-powershell.md
1616
- name: Portal
1717
href: quick-create-portal.md
18+
- name: .NET (SDK v4)
19+
href: quick-create-net.md
1820
- name: .NET (SDK v3)
1921
href: quick-create-net-v3.md
20-
- name: .NET (v4)
21-
href: quick-create-net.md
22-
- name: Node.js (v4)
22+
- name: Node.js
2323
href: quick-create-node.md
2424
- name: Python
2525
href: quick-create-python.md

articles/machine-learning/concept-plan-manage-cost.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.reviewer: nigup
99
ms.service: machine-learning
1010
ms.subservice: core
1111
ms.topic: conceptual
12-
ms.date: 04/22/2020
12+
ms.date: 05/08/2020
1313
---
1414

1515
# Plan and manage costs for Azure Machine Learning
@@ -58,7 +58,7 @@ View costs in graphs and tables for different time intervals. Some examples are
5858

5959
You won't see a separate service area for Machine Learning. Instead you'll see the various resources you've added to your Machine Learning workspaces.
6060

61-
## Use AmlCompute
61+
## Use Azure Machine Learning compute cluster (AmlCompute)
6262

6363
With constantly changing data, you need fast and streamlined model training and retraining to maintain accurate models. However, continuous training comes at a cost, especially for deep learning models on GPUs.
6464

@@ -134,5 +134,7 @@ Azure Machine Learning Compute supports reserved instances inherently. So if you
134134

135135
## Next steps
136136

137-
* Learn more about managing costs with [cost analysis](../cost-management-billing/costs/quick-acm-cost-analysis.md).
138-
* Learn more about [Azure Machine Learning compute](how-to-set-up-training-targets.md#amlcompute).
137+
Learn more about:
138+
* [Manage and increase resource quotas](how-to-manage-quotas.md)
139+
* [Managing costs with [cost analysis](../cost-management-billing/costs/quick-acm-cost-analysis.md).
140+
* [Azure Machine Learning compute](how-to-set-up-training-targets.md#amlcompute).

articles/machine-learning/how-to-manage-quotas.md

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ ms.topic: conceptual
1010
ms.reviewer: jmartens
1111
author: nishankgu
1212
ms.author: nigup
13-
ms.date: 03/05/2020
13+
ms.date: 05/08/2020
14+
ms.custom: contperfq4
1415
---
1516

16-
# Manage and request quotas for Azure resources
17+
# Manage & increase quotas for resources with Azure Machine Learning
1718
[!INCLUDE [applies-to-skus](../../includes/aml-applies-to-basic-enterprise-sku.md)]
1819

19-
This article provides details on preconfigured limits on Azure resources for your subscription. Also included are instructions on how to request quota enhancements for each type of resource. These limits are put in place to prevent budget over-runs due to fraud, and to honor Azure capacity constraints.
20+
This article provides [Azure Machine Learning](overview-what-is-azure-ml.md) users with details on preconfigured limits on Azure resources for your subscription. Also included are instructions on how to request quota enhancements for each type of resource. These limits are put in place to prevent budget over-runs due to fraud, and to honor Azure capacity constraints.
2021

21-
As with other Azure services, there are limits on certain resources associated with Azure Machine Learning. These limits range from a cap on the number of workspaces to limits on the actual underlying compute that gets used for model training or inference/scoring.
22+
As with other Azure services, there are limits on certain resources associated with Azure Machine Learning. These limits range from a cap on the number of [workspaces](concept-workspace.md) to limits on the actual underlying compute that gets used for model training or inference/scoring.
2223

2324
As you design and scale your Azure Machine Learning resources for production workloads, consider these limits. For example, if your cluster doesn't reach the target number of nodes, then you may have reached an Azure Machine Learning Compute cores limit for your subscription. If you want to raise the limit or quota above the Default Limit, open an online customer support request at no charge. The limits can't be raised above the Maximum Limit value shown in the following tables due to Azure Capacity constraints. If there is no Maximum Limit column, then the resource doesn't have adjustable limits.
2425

@@ -44,10 +45,10 @@ Virtual machine cores have a regional total limit and a regional per size series
4445

4546
[!INCLUDE [azure-subscription-limits-azure-resource-manager](../../includes/azure-subscription-limits-azure-resource-manager.md)]
4647

47-
For a more detailed and up-to-date list of quota limits, check the Azure-wide quota article [here](https://docs.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits).
48+
For a more detailed and up-to-date list of quota limits, check the [Azure-wide quota article](https://docs.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits).
4849

4950
### Azure Machine Learning Compute
50-
For Azure Machine Learning Compute, there is a default quota limit on both the number of cores and number of unique compute resources allowed per region in a subscription. This quota is separate from the VM core quota above and the core limits are not shared between the two resource types since AmlCompute is a managed service that deploys resources in a hosted-on-behalf-of model.
51+
For [Azure Machine Learning Compute](concept-compute-target.md#azure-machine-learning-compute-managed), there is a default quota limit on both the number of cores and number of unique compute resources allowed per region in a subscription. This quota is separate from the VM core quota above and the core limits are not shared between the two resource types since AmlCompute is a managed service that deploys resources in a hosted-on-behalf-of model.
5152

5253
Available resources:
5354
+ Dedicated cores per region have a default limit of 24 - 300 depending on your subscription offer type with higher defaults for EA and CSP offer types. The number of dedicated cores per subscription can be increased and is different for each VM family. Certain specialized VM families like NCv2, NCv3, or ND series start with a default of zero cores. Contact Azure support by raising a quota request to discuss increase options.
@@ -72,7 +73,7 @@ Available resources:
7273
<sup>2</sup> Jobs on a Low-Priority node could be preempted anytime there is a capacity constraint. We recommend you implement checkpointing in your job.
7374

7475
### Azure Machine Learning Pipelines
75-
For Azure Machine Learning Pipelines, there is a quota limit on the number of steps in a pipeline and on the number of schedule-based runs of published pipelines per region in a subscription.
76+
For [Azure Machine Learning Pipelines](concept-ml-pipelines.md), there is a quota limit on the number of steps in a pipeline and on the number of schedule-based runs of published pipelines per region in a subscription.
7677
- Maximum number of steps allowed in a pipeline is 30,000
7778
- Maximum number of the sum of schedule-based runs and blob pulls for blog-triggered schedules of published pipelines per subscription per month is 100,000
7879

@@ -93,15 +94,15 @@ There is a limit on the number of storage accounts per region as well in a given
9394

9495
## Workspace level quota
9596

96-
To better manage resource allocations for Amlcompute between various workspaces, we have introduced a feature that allows you to distribute subscription level quotas (by VM family) and configure them at the workspace level. The default behavior is that all workspaces have the same quota as the subscription level quota for any VM family. However, as the number of workspaces increases, and workloads of varying priority start sharing the same resources, users want a way to better share capacity and avoid resource contention issues. Azure Machine Learning provides a solution with its managed compute offering by allowing users to set a maximum quota for a particular VM family on each workspace. This is analogous to distributing your capacity between workspaces, and the users can choose to also over-allocate to drive maximum utilization.
97+
To better manage resource allocations for Azure Machine Learning Compute target (Amlcompute) between various [workspaces](concept-workspace.md), we have introduced a feature that allows you to distribute subscription level quotas (by VM family) and configure them at the workspace level. The default behavior is that all workspaces have the same quota as the subscription level quota for any VM family. However, as the number of workspaces increases, and workloads of varying priority start sharing the same resources, users want a way to better share capacity and avoid resource contention issues. Azure Machine Learning provides a solution with its managed compute offering by allowing users to set a maximum quota for a particular VM family on each workspace. This is analogous to distributing your capacity between workspaces, and the users can choose to also over-allocate to drive maximum utilization.
9798

9899
To set quotas at the workspace level, go to any workspace in your subscription, and click on **Usages + quotas** in the left pane. Then select the **Configure quotas** tab to view the quotas, expand any VM family, and set a quota limit on any workspace listed under that VM family. Remember that you cannot set a negative value or a value higher than the subscription level quota. Also, as you would observe, by default all workspaces are assigned the entire subscription quota to allow for full utilization of the allocated quota.
99100

100101
[![Azure Machine Learning workspace level quota](./media/how-to-manage-quotas/azure-machine-learning-workspace-quota.png)](./media/how-to-manage-quotas/azure-machine-learning-workspace-quota.png)
101102

102103

103104
> [!NOTE]
104-
> This is an Enterprise edition feature only. If you have both a Basic and an Enterprise edition workspace in your subscription, you can use this to only set quotas on your Enterprise workspaces. Your Basic workspaces will continue to have the subscription level quota which is the default behavior.
105+
> This is an Enterprise edition feature only. If you have both a [Basic and an Enterprise edition](overview-what-is-azure-ml.md#sku) workspace in your subscription, you can use this to only set quotas on your Enterprise workspaces. Your Basic workspaces will continue to have the subscription level quota which is the default behavior.
105106
>
106107
> You need subscription level permissions to set quota at the workspace level. This is enforced so that individual workspace owners do not edit or increase their quotas and start encroaching onto resources set aside for another workspace. Thus a subscription admin is best suited to allocate and distribute these quotas across workspaces.
107108
@@ -132,9 +133,17 @@ Viewing your quota for various resources, such as Virtual Machines, Storage, Net
132133

133134
If you want to raise the limit or quota above the default limit, [open an online customer support request](https://ms.portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest/) at no charge.
134135

135-
The limits can't be raised above the maximum limit value shown in the tables. If there is no maximum limit, then the resource doesn't have adjustable limits. [This](https://docs.microsoft.com/azure/azure-resource-manager/resource-manager-quota-errors) article covers the quota increase process in more detail.
136+
The limits can't be raised above the maximum limit value shown in the tables. If there is no maximum limit, then the resource doesn't have adjustable limits. [See step by step instructions on how to increase your quota](https://docs.microsoft.com/azure/azure-resource-manager/resource-manager-quota-errors).
136137

137138
When requesting a quota increase, you need to select the service you are requesting to raise the quota against, which could be services such as Machine Learning service quota, Container instances or Storage quota. In addition for Azure Machine Learning Compute, you can click on the **Request Quota** button while viewing the quota following the steps above.
138139

139140
> [!NOTE]
140141
> [Free Trial subscriptions](https://azure.microsoft.com/offers/ms-azr-0044p) are not eligible for limit or quota increases. If you have a [Free Trial subscription](https://azure.microsoft.com/offers/ms-azr-0044p), you can upgrade to a [Pay-As-You-Go](https://azure.microsoft.com/offers/ms-azr-0003p/) subscription. For more information, see [Upgrade Azure Free Trial to Pay-As-You-Go](../billing/billing-upgrade-azure-subscription.md) and [Free Trial subscription FAQ](https://azure.microsoft.com/free/free-account-faq).
142+
143+
## Next steps
144+
145+
Learn more with these articles:
146+
147+
+ [Plan & manage costs for Azure Machine Learning](concept-plan-manage-cost.md)
148+
149+
+ [How to increase your quota](https://docs.microsoft.com/azure/azure-resource-manager/resource-manager-quota-errors).

articles/machine-learning/how-to-select-algorithms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.topic: conceptual
1010
author: FrancescaLazzeri
1111
ms.author: lazzeri
1212
ms.reviewer: cgronlun
13-
ms.date: 03/05/2020
13+
ms.date: 05/07/2020
1414
---
1515
# How to select algorithms for Azure Machine Learning
1616

articles/machine-learning/resource-known-issues.md

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Sometimes it can be helpful if you can provide diagnostic information when askin
3434
Learn about the [resource quotas](how-to-manage-quotas.md) you might encounter when working with Azure Machine Learning.
3535

3636
## Installation and import
37-
37+
3838
* **Pip Installation: Dependencies are not guaranteed to be consistent with single line installation**:
3939

4040
This is a known limitation of pip, as it does not have a functioning dependency resolver when you install as a single line. The first unique dependency is the only one it looks at.
@@ -51,7 +51,29 @@ Learn about the [resource quotas](how-to-manage-quotas.md) you might encounter w
5151
pip install azure-ml-datadrift
5252
pip install azureml-train-automl
5353
```
54-
54+
55+
* **Explanation package not guarateed to be installed when installing the azureml-train-automl-client:**
56+
57+
When running a remote automl run with model explanation enabled you will see an error message saying ""Please install azureml-explain-model package for model explanations." This is a known issue and as a workaround please follow one of the steps below:
58+
59+
1. Install azureml-explain-model locally.
60+
```
61+
pip install azureml-explain-model
62+
```
63+
2. Disable the explainability feature entirely by passing model_explainability=False in the automl configuration.
64+
```
65+
automl_config = AutoMLConfig(task = 'classification',
66+
path = '.',
67+
debug_log = 'automated_ml_errors.log',
68+
compute_target = compute_target,
69+
run_configuration = aml_run_config,
70+
featurization = 'auto',
71+
model_explainability=False,
72+
training_data = prepped_data,
73+
label_column_name = 'Survived',
74+
**automl_settings)
75+
```
76+
5577
* **Panda errors: Typically seen during AutoML Experiment:**
5678
5779
When manually setting up your environmnet using pip, you will notice attribute errors (especially from pandas) due to unsupported package versions being installed. In order to prevent such errors, [please install the AutoML SDK using the automl_setup.cmd](https://github.com/Azure/MachineLearningNotebooks/blob/master/how-to-use-azureml/automated-machine-learning/README.md):

articles/service-fabric/service-fabric-versions.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Supported cluster versions in Azure Service Fabric
33
description: Learn about cluster versions in Azure Service Fabric, including a link to the newest releases from the Service Fabric team blog.
44

55
ms.topic: troubleshooting
6-
ms.date: 04/20/2020
6+
ms.date: 05/06/2020
77
---
88
# Supported Service Fabric versions
99

@@ -35,6 +35,7 @@ The following table lists the versions of Service Fabric and their support end d
3535
| 7.0.466.* | 6.4.664.* |Less than or equal to version 4.0|August 1, 2020 |
3636
| 7.0.466.* | 6.5.* |Less than or equal to version 4.0|August 1, 2020 |
3737
| 7.0.470.* | 7.0.466.* |Less than or equal to version 4.0 |August 1, 2020 |
38+
| 7.0.472.* | 7.0.466.* |Less than or equal to version 4.0 |August 1, 2020 |
3839
| 7.1.409.* | 7.0.466.* |Less than or equal to version 4.0 |Current version, so no end date |
3940

4041
## Supported operating systems
@@ -102,4 +103,5 @@ The following table lists the version names of Service Fabric and their correspo
102103
| 7.0 CU2 | 7.0.464.9590 | 7.0.464.1 |
103104
| 7.0 CU3 | 7.0.466.9590 | 7.0.465.1 |
104105
| 7.0 CU4 | 7.0.470.9590 | 7.0.469.1 |
106+
| 7.0 CU6 | 7.0.472.9590 | 7.0.471.1 |
105107
| 7.1 RTO | 7.1.409.9590 | 7.1.410.1 |

0 commit comments

Comments
 (0)