Skip to content

Commit 22f52b9

Browse files
authored
Merge pull request #89424 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 17de5ca + a0dcf19 commit 22f52b9

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

articles/cognitive-services/text-analytics/how-tos/text-analytics-how-to-sentiment-analysis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: text-analytics
1010
ms.topic: sample
11-
ms.date: 07/30/2019
11+
ms.date: 09/23/2019
1212
ms.author: aahi
1313
---
1414

@@ -134,7 +134,7 @@ The [next version of Sentiment Analysis](https://westcentralus.dev.cognitive.mic
134134
> [!NOTE]
135135
> * The Sentiment Analysis v3 request format and [data limits](../overview.md#data-limits) are the same as the previous version.
136136
> * At this time, Sentiment Analysis v3:
137-
> * Currently supports English, Simplified Chinese, and Japanese languages.
137+
> * Currently supports English, French, Italian, Japanese, Simplified-Chinese, and Traditional-Chinese languages.
138138
> * Is available in the following regions: `Australia East`, `Central Canada`, `Central US`, `East Asia`, `East US`, `East US 2`, `North Europe`, `Southeast Asia`, `South Central US`, `UK South`, `West Europe`, and `West US 2`.
139139
140140
|Feature |Description |

articles/machine-learning/service/how-to-deploy-custom-docker-image.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ To use an image from a __private container registry__ that is not in your worksp
218218

219219
```python
220220
# Set the container registry information
221-
myenv.docker.base_image_repository.address = "myregistry.azurecr.io"
222-
myenv.docker.base_image_repository.username = "username"
223-
myenv.docker.base_image_repository.password = "password"
221+
myenv.docker.base_image_registry.address = "myregistry.azurecr.io"
222+
myenv.docker.base_image_registry.username = "username"
223+
myenv.docker.base_image_registry.password = "password"
224224
```
225225

226226
After defining the environment, use it with an [InferenceConfig](https://docs.microsoft.com/python/api/azureml-core/azureml.core.model.inferenceconfig?view=azure-ml-py) object to define the inference environment in which the model and web service will run.

articles/machine-learning/service/how-to-train-ml-models.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,14 @@ You should have already created your [compute target](how-to-set-up-training-tar
9292

9393
```Python
9494
from azureml.train.estimator import Estimator
95+
from azureml.core.runconfig import MpiConfiguration
9596

9697
estimator = Estimator(source_directory='./my-keras-proj',
9798
compute_target=compute_target,
9899
entry_script='train.py',
99100
node_count=2,
100101
process_count_per_node=1,
101-
distributed_backend='mpi',
102+
distributed_training=MpiConfiguration(),
102103
conda_packages=['tensorflow', 'keras'],
103104
custom_docker_image='continuumio/miniconda')
104105
```
@@ -110,7 +111,8 @@ Parameter | Description | Default
110111
`custom_docker_image`| Name of the image you want to use. Only provide images available in public docker repositories (in this case Docker Hub). To use an image from a private docker repository, use the constructor's `environment_definition` parameter instead. [See example](https://github.com/Azure/MachineLearningNotebooks/blob/master/how-to-use-azureml/training-with-deep-learning/how-to-use-estimator/how-to-use-estimator.ipynb). | `None`
111112
`node_count`| Number of nodes to use for your training job. | `1`
112113
`process_count_per_node`| Number of processes (or "workers") to run on each node. In this case, you use the `2` GPUs available on each node.| `1`
113-
`distributed_backend`| Backend for launching distributed training, which the Estimator offers via MPI. To carry out parallel or distributed training (e.g., `node_count`>1 or `process_count_per_node`>1 or both), set `distributed_backend='mpi'`. The MPI implementation used by AML is [Open MPI](https://www.open-mpi.org/).| `None`
114+
`distributed_training`| [MPIConfiguration ]('https://docs.microsoft.com/python/api/azureml-core/azureml.core.runconfig.mpiconfiguration?view=azure-ml-py') object for launching distributed training using MPI backend. | `None`
115+
114116

115117
Finally, submit the training job:
116118
```Python

articles/role-based-access-control/resource-provider-operations.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,9 +1215,9 @@ The resource provider operations are always evolving. To get the latest operatio
12151215
> | DataAction | Microsoft.CognitiveServices/accounts/VisualSearch/search/action | Returns a list of tags relevant to the provided image |
12161216
> | DataAction | Microsoft.CognitiveServices/accounts/WebSearch/search/action | Get web, image, news, & videos results for a given query. |
12171217
> | Action | Microsoft.CognitiveServices/accounts/write | Writes API Accounts. |
1218-
> | Action | Microsoft.CognitiveServices/checkDomainAvailability/action | Reads available SKUs for an subscription. |
1219-
> | Action | Microsoft.CognitiveServices/locations/checkSkuAvailability/action | Reads available SKUs for an subscription. |
1220-
> | Action | Microsoft.CognitiveServices/locations/checkSkuAvailability/action | Reads available SKUs for an subscription. |
1218+
> | Action | Microsoft.CognitiveServices/checkDomainAvailability/action | Reads available SKUs for a subscription. |
1219+
> | Action | Microsoft.CognitiveServices/locations/checkSkuAvailability/action | Reads available SKUs for a subscription. |
1220+
> | Action | Microsoft.CognitiveServices/locations/checkSkuAvailability/action | Reads available SKUs for a subscription. |
12211221
> | Action | Microsoft.CognitiveServices/locations/deleteVirtualNetworkOrSubnets/action | Notification from Microsoft.Network of deleting VirtualNetworks or Subnets. |
12221222
> | Action | Microsoft.CognitiveServices/Operations/read | List all available operations |
12231223
> | Action | Microsoft.CognitiveServices/register/action | Registers Subscription for Cognitive Services |

0 commit comments

Comments
 (0)