Skip to content

Commit f5073f2

Browse files
authored
Merge pull request #1253 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-ai-docs (branch main)
2 parents 716ff8b + c2df9dc commit f5073f2

File tree

7 files changed

+13
-9
lines changed

7 files changed

+13
-9
lines changed

articles/ai-studio/how-to/develop/evaluate-sdk.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,8 @@ result = evaluate(
432432
},
433433
# column mapping
434434
evaluator_config={
435-
"column_mapping": {
436-
"relevance": {
435+
"relevance": {
436+
"column_mapping": {
437437
"query": "${data.queries}"
438438
"ground_truth": "${data.ground_truth}"
439439
"response": "${outputs.response}"
@@ -560,8 +560,8 @@ result = evaluate(
560560
"relevance": relevance_eval
561561
},
562562
evaluator_config={
563-
"column_mapping": {
564-
"default": {
563+
"default": {
564+
"column_mapping": {
565565
"query": "${data.queries}"
566566
"context": "${outputs.context}"
567567
"response": "${outputs.response}"

articles/ai-studio/includes/install-cli.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,9 @@ You can follow instructions [How to install the Azure CLI](/cli/azure/install-az
3838
After you install the Azure CLI, sign in using the ``az login`` command and sign-in using the browser:
3939
```
4040
az login
41+
42+
```
43+
Alternatively, you can log in manually via the browser with a device code.
44+
```
45+
az login --use-device-code
4146
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ When created, these compute resources are automatically part of your workspace,
9292
> [!NOTE]
9393
> To avoid charges when the compute is idle:
9494
> * For a compute *cluster*, make sure the minimum number of nodes is set to 0, or use [serverless compute](./how-to-use-serverless-compute.md).
95-
> * For a compute *instance*, [enable idle shutdown](how-to-create-compute-instance.md#configure-idle-shutdown).
95+
> * For a compute *instance*, [enable idle shutdown](how-to-create-compute-instance.md#configure-idle-shutdown). While stopping the compute instance stops the billing for compute hours, you'll still be billed for disk, public IP, and standard load balancer.
9696
9797
### Supported VM series and sizes
9898

articles/machine-learning/how-to-create-compute-instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Choose the tab for the environment you're using for other prerequisites.
6262

6363
Creating a compute instance is a one time process for your workspace. You can reuse the compute as a development workstation or as a compute target for training. You can have multiple compute instances attached to your workspace.
6464

65-
The dedicated cores per region per VM family quota and total regional quota, which applies to compute instance creation, is unified and shared with Azure Machine Learning training compute cluster quota. Stopping the compute instance doesn't release quota to ensure you are able to restart the compute instance. It isn't possible to change the virtual machine size of compute instance once it's created.
65+
The dedicated cores per region per VM family quota and total regional quota, which applies to compute instance creation, is unified and shared with Azure Machine Learning training compute cluster quota. Stopping the compute instance doesn't release quota to ensure you are able to restart the compute instance. A quota is a credit limit on Azure resources, not a capacity guarantee, Restarting a compute instance is still dependent on the available capacity of the region. If there is a capacity crunch in the region for the SKU, you may not be able to restart the compute instance. It isn't possible to change the virtual machine size of compute instance once it's created.
6666

6767
The fastest way to create a compute instance is to follow the [Create resources you need to get started](quickstart-create-resources.md).
6868

articles/machine-learning/how-to-manage-compute-instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ You can [enable automatic shutdown](how-to-create-compute-instance.md#configure-
6464
You can also [create a schedule](how-to-create-compute-instance.md#schedule-automatic-start-and-stop) for the compute instance to automatically start and stop based on a time and day of week.
6565

6666
> [!TIP]
67-
> The compute instance has 120GB OS disk. If you run out of disk space, [use the terminal](how-to-access-terminal.md) to clear at least 1-2 GB before you stop or restart the compute instance. Please do not stop the compute instance by issuing sudo shutdown from the terminal. The temp disk size on compute instance depends on the VM size chosen and is mounted on /mnt.
67+
> The compute instance has 120GB OS disk. If you run out of disk space, [use the terminal](how-to-access-terminal.md) to clear at least 5 GB before you stop or restart the compute instance. Please do not stop the compute instance by issuing sudo shutdown from the terminal. The temp disk size on compute instance depends on the VM size chosen and is mounted on /mnt.
6868
6969
# [Python SDK](#tab/python)
7070

articles/search/search-region-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ You can create an Azure AI Search resource in any of the following Azure public
9494
| Australia Southeast​​​ | || | |
9595
| East Asia​ |||| |
9696
| Southeast Asia​ ​ ​ |||| |
97-
| Central India |||| S2, S3, S3HD, L1, L2 |
97+
| Central India |||| |
9898
| Jio India West​ ​ ||| |
9999
| South India <sup>1</sup> | | ||
100100
| Japan East ||||

articles/search/search-sku-tier.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ Currently, several regions are at capacity for specific tiers and can't be used
5959

6060
| Region | Disabled tier (SKU) due to over-capacity | Suggested alternative |
6161
|--------|------------------------------------------|-----------------------|
62-
| Central India | S2, S3, S3HD, L1, L2| South India |
6362
| East US 2| Basic, S1| Central US |
6463
| South Central US | All tiers | Central US |
6564
| US Gov Virginia | All tiers | US Gov Arizona |

0 commit comments

Comments
 (0)