Skip to content

Commit 8e0eed8

Browse files
authored
Merge pull request #241965 from Blackmist/v1-v2-checkup
misc. updates for v1/v2
2 parents 201b886 + 4195954 commit 8e0eed8

File tree

5 files changed

+22
-16
lines changed

5 files changed

+22
-16
lines changed

articles/machine-learning/how-to-mlflow-batch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ Azure Machine Learning supports no-code deployment for batch inference in [manag
262262

263263
### How work is distributed on workers
264264

265-
Work is distributed at the file level, for both structured and unstructured data. As a consequence, only [file datasets](v1/how-to-create-register-datasets.md#filedataset) or [URI folders](reference-yaml-data.md) are supported for this feature. Each worker processes batches of `Mini batch size` files at a time. Further parallelism can be achieved if `Max concurrency per instance` is increased.
265+
Work is distributed at the file level, for both structured and unstructured data. As a consequence, only [file datasets (v1 API)](v1/how-to-create-register-datasets.md#filedataset) or [URI folders](reference-yaml-data.md) are supported for this feature. Each worker processes batches of `Mini batch size` files at a time. Further parallelism can be achieved if `Max concurrency per instance` is increased.
266266

267267
> [!WARNING]
268268
> Nested folder structures are not explored during inference. If you are partitioning your data using folders, make sure to flatten the structure beforehand.

articles/machine-learning/how-to-private-endpoint-integration-synapse.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ ms.date: 11/16/2022
1717

1818
In this article, learn how to securely integrate with Azure Machine Learning from Azure Synapse. This integration enables you to use Azure Machine Learning from notebooks in your Azure Synapse workspace. Communication between the two workspaces is secured using an Azure Virtual Network.
1919

20-
> [!TIP]
21-
> You can also perform integration in the opposite direction, using Azure Synapse spark pool from Azure Machine Learning. For more information, see [Link Azure Synapse and Azure Machine Learning](v1/how-to-link-synapse-ml-workspaces.md).
22-
2320
## Prerequisites
2421

2522
* An Azure subscription.

articles/machine-learning/how-to-troubleshoot-protobuf-descriptor-error.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ ms.author: larryfr
1010
ms.reviewer: larryfr
1111
ms.topic: troubleshooting
1212
ms.date: 11/04/2022
13+
monikerRange: 'azureml-api-1 || azureml-api-2'
1314
---
1415

1516
# Troubleshoot `descriptors cannot not be created directly` error
1617

1718
When using Azure Machine Learning, you may receive the following error:
1819

1920
```
20-
TypeError: Descriptors cannot not be created directly. If this call came from a _pb2.py file, your generated code is out of date and must be regenerated with protoc >= 3.19.0. It is followed by the proposition to install the appropriate version of protobuf library.
21+
TypeError: Descriptors cannot not be created directly. If this call came from a _pb2.py file, your generated code is out of date and must be regenerated with protoc >= 3.19.0." It is followed by the proposition to install the appropriate version of protobuf library.
2122
2223
If you cannot immediately regenerate your protos, some other possible workarounds are:
2324
1. Downgrade the protobuf package to 3.20.x or lower.
@@ -40,9 +41,14 @@ pip install azureml-sdk[automl,explain,notebooks]>=1.42.0
4041

4142
For more information on updating an Azure Machine Learning environment (for training or deployment), see the following articles:
4243

44+
:::moniker range="azureml-api-1"
4345
* [Manage environments in studio](how-to-manage-environments-in-studio.md#rebuild-an-environment)
44-
* [Create & use software environments (SDK v1)](how-to-use-environments.md#update-an-existing-environment)
45-
* [Create & manage environments (CLI v2)](how-to-manage-environments-v2.md#update)
46+
* [Create & use software environments](./v1/how-to-use-environments.md)
47+
:::moniker-end
48+
:::moniker range="azureml-api-2"
49+
* [Manage environments in studio](how-to-manage-environments-in-studio.md#rebuild-an-environment)
50+
* [Create & manage environments](how-to-manage-environments-v2.md#update)
51+
:::moniker-end
4652

4753
To verify the version of your installed SDK, use the following command:
4854

@@ -80,6 +86,11 @@ For more information on the breaking changes in protobuf 4.0.0, see [https://dev
8086
8187
For more information on updating an Azure Machine Learning environment (for training or deployment), see the following articles:
8288
89+
:::moniker range="azureml-api-1"
90+
* [Manage environments in studio](how-to-manage-environments-in-studio.md#rebuild-an-environment)
91+
* [Create & use software environments](./v1/how-to-use-environments.md)
92+
:::moniker-end
93+
:::moniker range="azureml-api-2"
8394
* [Manage environments in studio](how-to-manage-environments-in-studio.md#rebuild-an-environment)
84-
* [Create & use software environments (SDK v1)](how-to-use-environments.md#update-an-existing-environment)
85-
* [Create & manage environments (CLI v2)](how-to-manage-environments-v2.md#update)
95+
* [Create & manage environments](how-to-manage-environments-v2.md#update)
96+
:::moniker-end

articles/machine-learning/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1294,7 +1294,7 @@
12941294
- name: Troubleshoot secure workspace connectivity
12951295
href: how-to-troubleshoot-secure-connection-workspace.md
12961296
- name: Troubleshoot SerializationError
1297-
href: how-to-troubleshoot-serialization-error.md
1297+
href: ./v1/how-to-troubleshoot-serialization-error.md
12981298
- name: Troubleshoot descriptor error
12991299
displayName: descriptors cannot not be created directly
13001300
href: how-to-troubleshoot-protobuf-descriptor-error.md

articles/machine-learning/how-to-troubleshoot-serialization-error.md renamed to articles/machine-learning/v1/how-to-troubleshoot-serialization-error.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ pip install azureml-sdk[automl,explain,notebooks]>=1.42.0
3636

3737
For more information on updating an Azure Machine Learning environment (for training or deployment), see the following articles:
3838

39-
* [Manage environments in studio](how-to-manage-environments-in-studio.md#rebuild-an-environment)
40-
* [Create & use software environments (SDK v1)](how-to-use-environments.md#update-an-existing-environment)
41-
* [Create & manage environments (CLI v2)](how-to-manage-environments-v2.md#update)
39+
* [Manage environments in studio](../how-to-manage-environments-in-studio.md#rebuild-an-environment)
40+
* [Create & use software environments](how-to-use-environments.md)
4241

4342
To verify the version of your installed SDK, use the following command:
4443

@@ -50,6 +49,5 @@ pip show azureml-core
5049

5150
For more information on updating an Azure Machine Learning environment (for training or deployment), see the following articles:
5251

53-
* [Manage environments in studio](how-to-manage-environments-in-studio.md#rebuild-an-environment)
54-
* [Create & use software environments (SDK v1)](how-to-use-environments.md#update-an-existing-environment)
55-
* [Create & manage environments (CLI v2)](how-to-manage-environments-v2.md#update)
52+
* [Manage environments in studio](../how-to-manage-environments-in-studio.md#rebuild-an-environment)
53+
* [Create & use software environments](how-to-use-environments.md)

0 commit comments

Comments
 (0)