Skip to content

Commit a852200

Browse files
committed
address merge conflict
2 parents f8180c8 + 5bad00a commit a852200

File tree

133 files changed

+4432
-5933
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+4432
-5933
lines changed

articles/ai-services/.openpublishing.redirection.ai-services.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,26 @@
330330
"redirect_url": "/azure/ai-services/computer-vision/how-to/model-customization",
331331
"redirect_document_id": false
332332
},
333+
{
334+
"source_path_from_root": "/articles/ai-services/computer-vision/deploy-computer-vision-on-premises.md",
335+
"redirect_url": "/azure/ai-services/computer-vision/",
336+
"redirect_document_id": false
337+
},
338+
{
339+
"source_path_from_root": "/articles/ai-services/computer-vision/spatial-analysis-web-app.md",
340+
"redirect_url": "/azure/ai-services/computer-vision/",
341+
"redirect_document_id": false
342+
},
343+
{
344+
"source_path_from_root": "/articles/ai-services/computer-vision/tutorials/storage-lab-tutorial.md",
345+
"redirect_url": "/azure/ai-services/computer-vision/",
346+
"redirect_document_id": false
347+
},
348+
{
349+
"source_path_from_root": "/articles/ai-services/custom-vision-service/iot-visual-alerts-tutorial.md",
350+
"redirect_url": "/azure/ai-services/computer-vision/",
351+
"redirect_document_id": false
352+
},
333353
{
334354
"source_path_from_root": "/articles/ai-services/document-intelligence/concept-document-intelligence-studio.md",
335355
"redirect_url": "/azure/ai-services/document-intelligence/studio-overview",
@@ -439,6 +459,26 @@
439459
"source_path_from_root": "/articles/ai-services/anomaly-detector//tutorials/multivariate-anomaly-detection-synapse.md",
440460
"redirect_url": "/azure/ai-services/anomaly-detector/overview",
441461
"redirect_document_id": false
462+
},
463+
{
464+
"source_path_from_root": "/articles/ai-services/language-service/summarization/custom/how-to/data-formats.md",
465+
"redirect_url": "/azure/ai-services//language-service/summarization/overview",
466+
"redirect_document_id": false
467+
},
468+
{
469+
"source_path_from_root": "/articles/ai-services/language-service/summarization/custom/how-to/deploy-model.md",
470+
"redirect_url": "/azure/ai-services//language-service/summarization/overview",
471+
"redirect_document_id": false
472+
},
473+
{
474+
"source_path_from_root": "/articles/ai-services/language-service/summarization/custom/how-to/test-evaluate.md",
475+
"redirect_url": "/azure/ai-services//language-service/summarization/overview",
476+
"redirect_document_id": false
477+
},
478+
{
479+
"source_path_from_root": "/articles/ai-services/language-service/summarization/custom/quickstart.md",
480+
"redirect_url": "/azure/ai-services//language-service/summarization/overview",
481+
"redirect_document_id": false
442482
}
443483
]
444484
}

articles/ai-services/cognitive-services-container-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ keywords: on-premises, Docker, container, Kubernetes
1515

1616
# What are Azure AI containers?
1717

18-
Azure AI services provides several [Docker containers](https://www.docker.com/what-container) that let you use the same APIs that are available in Azure, on-premises. Using these containers gives you the flexibility to bring Azure AI services closer to your data for compliance, security or other operational reasons. Container support is currently available for a subset of Azure AI services.
18+
Azure AI services provide several [Docker containers](https://www.docker.com/what-container) that let you use the same APIs that are available in Azure, on-premises. Using these containers gives you the flexibility to bring Azure AI services closer to your data for compliance, security or other operational reasons. Container support is currently available for a subset of Azure AI services.
1919

2020
> [!VIDEO https://www.youtube.com/embed/hdfbn4Q8jbo]
2121
@@ -48,7 +48,7 @@ Azure AI containers provide the following set of Docker containers, each of whic
4848
| Service | Container | Description | Availability |
4949
|--|--|--|--|
5050
| [LUIS][lu-containers] | **LUIS** ([image](https://mcr.microsoft.com/product/azure-cognitive-services/language/luis/about)) | Loads a trained or published Language Understanding model, also known as a LUIS app, into a docker container and provides access to the query predictions from the container's API endpoints. You can collect query logs from the container and upload these back to the [LUIS portal](https://www.luis.ai) to improve the app's prediction accuracy. | Generally available. <br> This container can also [run in disconnected environments](containers/disconnected-containers.md). |
51-
| [Language service][ta-containers-keyphrase] | **Key Phrase Extraction** ([image](https://mcr.microsoft.com/product/azure-cognitive-services/textanalytics/keyphrase/about)) | Extracts key phrases to identify the main points. For example, for the input text "The food was delicious and there were wonderful staff", the API returns the main talking points: "food" and "wonderful staff". | Generally available. <br> This container can also [run in disconnected environments](containers/disconnected-containers.md). |
51+
| [Language service][ta-containers-keyphrase] | **Key Phrase Extraction** ([image](https://mcr.microsoft.com/product/azure-cognitive-services/textanalytics/keyphrase/about)) | Extracts key phrases to identify the main points. For example, for the input text "The food was delicious and there were wonderful staff," the API returns the main talking points: "food" and "wonderful staff". | Generally available. <br> This container can also [run in disconnected environments](containers/disconnected-containers.md). |
5252
| [Language service][ta-containers-language] | **Text Language Detection** ([image](https://mcr.microsoft.com/product/azure-cognitive-services/textanalytics/language/about)) | For up to 120 languages, detects which language the input text is written in and report a single language code for every document submitted on the request. The language code is paired with a score indicating the strength of the score. | Generally available. <br> This container can also [run in disconnected environments](containers/disconnected-containers.md). |
5353
| [Language service][ta-containers-sentiment] | **Sentiment Analysis** ([image](https://mcr.microsoft.com/product/azure-cognitive-services/textanalytics/sentiment/about)) | Analyzes raw text for clues about positive or negative sentiment. This version of sentiment analysis returns sentiment labels (for example *positive* or *negative*) for each document and sentence within it. | Generally available. <br> This container can also [run in disconnected environments](containers/disconnected-containers.md). |
5454
| [Language service][ta-containers-health] | **Text Analytics for health** ([image](https://mcr.microsoft.com/product/azure-cognitive-services/textanalytics/healthcare/about))| Extract and label medical information from unstructured clinical text. | Generally available |

articles/ai-services/computer-vision/computer-vision-how-to-install-containers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ More [examples](./computer-vision-resource-container-config.md#example-docker-ru
134134
> [!IMPORTANT]
135135
> The `Eula`, `Billing`, and `ApiKey` options must be specified to run the container; otherwise, the container won't start. For more information, see [Billing](#billing).
136136
137-
If you need higher throughput (for example, when processing multi-page files), consider deploying multiple containers [on a Kubernetes cluster](deploy-computer-vision-on-premises.md), using [Azure Storage](/azure/storage/common/storage-account-create) and [Azure Queue](/azure/storage/queues/storage-queues-introduction).
137+
<!--If you need higher throughput (for example, when processing multi-page files), consider deploying multiple containers [on a Kubernetes cluster](deploy-computer-vision-on-premises.md), using [Azure Storage](/azure/storage/common/storage-account-create) and [Azure Queue](/azure/storage/queues/storage-queues-introduction).-->
138138

139139
If you're using Azure Storage to store images for processing, you can create a [connection string](/azure/storage/common/storage-configure-connection-string) to use when calling the container.
140140

0 commit comments

Comments
 (0)