Skip to content

Commit 6dfebd7

Browse files
authored
Merge pull request #269554 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 3f72424 + a642f23 commit 6dfebd7

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

articles/backup/backup-azure-vms-agentless-multi-disk-crash-consistent-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Azure Backup supports agentless VM backups by using multi-disk [crash-consistent
1313

1414
## When do I choose crash-consistent backup over application-consistent backup?
1515

16-
Choose to perform creah-consistent backup in the following scenarios:
16+
Choose to perform crash-consistent backup in the following scenarios:
1717

1818
- If your workload is performance sensitive and can tolerate recovery from crash-consistent backups, crash-consistent backups help quiesce VM I/O for a shorter period during backup. Crash-consistent backup doesn't use Volume Shadow Copy Service (VSS) (for Windows) or *fsfreeze* (for Linux) to avoid the associated quiescing delays.
1919

@@ -43,4 +43,4 @@ During preview, Azure VMs backed up with multi-disk crash-consistent type is cha
4343
4444
## Next steps
4545

46-
[Back up Azure VM with agentless multi-disk crash-consistent backup (preview)](backup-azure-vms-agentless-multi-disk-crash-consistent.md)
46+
[Back up Azure VM with agentless multi-disk crash-consistent backup (preview)](backup-azure-vms-agentless-multi-disk-crash-consistent.md)

articles/machine-learning/how-to-inference-server-http.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ By running the inference HTTP server locally, you can focus on debugging your sc
4343

4444
## Prerequisites
4545

46-
- Requires: Python >=3.7
46+
- Requires: Python >=3.8
4747
- Anaconda
4848

4949
> [!TIP]

articles/machine-learning/prompt-flow/how-to-customize-environment-runtime.md

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ Open the `requirements.txt` file and add your extra packages and specific versio
4343

4444
```
4545
###### Requirements with Version Specifiers ######
46-
langchain == 0.0.149 # Version Matching. Must be version 0.6.1
46+
langchain == 0.0.149 # Version Matching. Must be version 0.0.149
4747
keyring >= 4.1.1 # Minimum version 4.1.1
4848
coverage != 3.5 # Version Exclusion. Anything except version 3.5
4949
Mopidy-Dirble ~= 1.1 # Compatible release. Same as >= 1.1, == 1.*
5050
<path_to_local_package> # reference to local pip wheel package
5151
```
5252

53-
You can obtain the path of local packages using `ls > requirements.txt`.
53+
For more information about structuring the `requirements.txt` file, see [Requirements file format](https://pip.pypa.io/en/stable/reference/requirements-file-format/) in the pip documentation.
5454

5555
#### Define the `Dockerfile`
5656

@@ -81,7 +81,8 @@ In your local compute, you can use the CLI (v2) to create a customized environme
8181
>Prompt flow is **not supported** in the project workspace which was created with a workspace hub. The workspace hub is a private preview feature.
8282
8383
```shell
84-
az login(optional)
84+
az login # if not already authenticated
85+
8586
az account set --subscription <subscription ID>
8687
az configure --defaults workspace=<Azure Machine Learning workspace name> group=<resource group>
8788
```
@@ -95,16 +96,15 @@ build:
9596
path: .
9697
```
9798
98-
#### Run CLI command to create an environment
99+
#### Create an environment
99100
100-
```bash
101+
```shell
101102
cd image_build
102-
az login(optional)
103103
az ml environment create -f environment.yaml --subscription <sub-id> -g <resource-group> -w <workspace>
104104
```
105105

106106
> [!NOTE]
107-
> Building the image may take several minutes.
107+
> Building the environment image may take several minutes.
108108
109109
Go to your workspace UI page, then go to the **environment** page, and locate the custom environment you created. You can now use it to create a compute instance runtime in your prompt flow. To learn more, see [Create compute instance runtime in UI](how-to-create-manage-runtime.md#create-a-compute-instance-runtime-on-a-runtime-page).
110110

@@ -138,11 +138,9 @@ A compute instance runtime is a custom application that runs on a compute instan
138138
### Create custom application as prompt flow compute instance runtime via SDK v2
139139

140140
```python
141-
# import required libraries
142141
import os
143142
from azure.ai.ml import MLClient
144-
from azure.ai.ml.entities import WorkspaceConnection
145-
# Import required libraries
143+
from azure.ai.ml.entities import ComputeInstance, CustomApplications, EndpointsSettings, ImageSettings, VolumeSettings, WorkspaceConnection
146144
from azure.identity import DefaultAzureCredential, InteractiveBrowserCredential
147145

148146
try:
@@ -153,19 +151,14 @@ except Exception as ex:
153151
# Fall back to InteractiveBrowserCredential in case DefaultAzureCredential not work
154152
credential = InteractiveBrowserCredential()
155153

156-
from azure.ai.ml.entities import ComputeInstance
157-
from azure.ai.ml.entities import CustomApplications, ImageSettings, EndpointsSettings, VolumeSettings
158-
159154
ml_client = MLClient.from_config(credential=credential)
160155

161156
image = ImageSettings(reference='mcr.microsoft.com/azureml/promptflow/promptflow-runtime-stable:<newest_version>')
162-
163157
endpoints = [EndpointsSettings(published=8081, target=8080)]
164158

165159
app = CustomApplications(name='promptflow-runtime',endpoints=endpoints,bind_mounts=[],image=image,environment_variables={})
166160

167161
ci_basic_name = "<compute_instance_name>"
168-
169162
ci_basic = ComputeInstance(name=ci_basic_name, size="<instance_type>",custom_applications=[app])
170163

171164
ml_client.begin_create_or_update(ci_basic)

0 commit comments

Comments
 (0)