diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/mfe.json index 89c78128492e..3dee2ab5151e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/mfe.json @@ -1782,182 +1782,6 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/labelingJobs/{id}/exportLabels/{exportId}": { - "get": { - "tags": [ - "ExportSummary" - ], - "summary": "Get export summary from a labeling job.", - "operationId": "ExportSummaries_Get", - "produces": [ - "application/json" - ], - "parameters": [ - { - "in": "path", - "name": "id", - "description": "The name and identifier for the LabelingJob.", - "required": true, - "type": "string" - }, - { - "in": "path", - "name": "exportId", - "description": "The unique identifier of Export Labels operation.", - "required": true, - "type": "string", - "format": "uuid" - }, - { - "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" - } - ], - "responses": { - "default": { - "description": "Error", - "schema": { - "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "200": { - "description": "Success", - "schema": { - "$ref": "#/definitions/ExportSummaryResource" - } - } - }, - "x-ms-examples": { - "Get ExportSummary.": { - "$ref": "./examples/ExportSummary/get.json" - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/labelingJobs/{id}/exportLabels": { - "get": { - "tags": [ - "ExportSummary" - ], - "summary": "List export summaries for a labeling job.", - "operationId": "ExportSummaries_List", - "produces": [ - "application/json" - ], - "parameters": [ - { - "in": "path", - "name": "id", - "description": "The name and identifier for the LabelingJob.", - "required": true, - "type": "string" - }, - { - "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/PaginationParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" - } - ], - "responses": { - "default": { - "description": "Error", - "schema": { - "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "200": { - "description": "Success", - "schema": { - "$ref": "#/definitions/ExportSummaryResourceArmPaginatedResult" - } - } - }, - "x-ms-examples": { - "List ExportSummaries.": { - "$ref": "./examples/ExportSummary/list.json" - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - }, - "post": { - "tags": [ - "LabelingJob" - ], - "summary": "Export labels from a labeling job.", - "operationId": "LabelingJobs_ExportLabels", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "in": "path", - "name": "id", - "description": "The name and identifier for the LabelingJob.", - "required": true, - "type": "string" - }, - { - "$ref": "machineLearningServices.json#/parameters/APIVersionParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" - }, - { - "in": "body", - "name": "body", - "description": "The export summary.", - "schema": { - "$ref": "#/definitions/ExportSummary" - } - } - ], - "responses": { - "default": { - "description": "Error", - "schema": { - "$ref": "machineLearningServices.json#/definitions/MachineLearningServiceError" - } - }, - "202": { - "description": "Success" - } - }, - "x-ms-examples": { - "ExportLabels Labeling Job.": { - "$ref": "./examples/LabelingJob/exportLabels.json" - } - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/jobs/{id}": { "put": { "tags": [ @@ -4612,212 +4436,6 @@ }, "additionalProperties": false }, - "ExportSummary": { - "required": [ - "format" - ], - "type": "object", - "properties": { - "format": { - "description": "The format of exported labels, also as the discriminator.", - "enum": [ - "Dataset", - "Coco", - "CSV" - ], - "type": "string", - "x-ms-enum": { - "name": "ExportFormatType", - "modelAsString": true - }, - "x-ms-mutability": [ - "create", - "read" - ] - }, - "exportId": { - "format": "uuid", - "description": "The unique identifier of completed Export Labels operation.", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "labelingJobId": { - "description": "Name and identifier of the job containing exported labels.", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "exportedRowCount": { - "format": "int64", - "description": "The total number of labeled datapoints exported.", - "type": "integer", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "startTimeUtc": { - "format": "date-time", - "description": "The time when the export was requested.", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "endTimeUtc": { - "format": "date-time", - "description": "The time when the export was completed.", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "state": { - "description": "The state of the Export Labels operation.", - "enum": [ - "Requested", - "Running", - "Failed", - "Completed" - ], - "type": "string", - "readOnly": true, - "x-ms-enum": { - "name": "LabelExportState", - "modelAsString": true - }, - "x-ms-mutability": [ - "read" - ] - } - }, - "discriminator": "format", - "additionalProperties": false - }, - "CocoExportSummary": { - "allOf": [ - { - "$ref": "#/definitions/ExportSummary" - }, - { - "type": "object", - "properties": { - "snapshotPath": { - "description": "The output path where the labels will be exported.", - "type": "string" - }, - "containerName": { - "description": "The container name to which the labels will be exported.", - "type": "string" - } - } - } - ], - "x-ms-discriminator-value": "Coco", - "additionalProperties": false - }, - "CsvExportSummary": { - "allOf": [ - { - "$ref": "#/definitions/ExportSummary" - }, - { - "type": "object", - "properties": { - "snapshotPath": { - "description": "The output path where the labels will be exported.", - "type": "string" - }, - "containerName": { - "description": "The container name to which the labels will be exported.", - "type": "string" - } - } - } - ], - "x-ms-discriminator-value": "CSV", - "additionalProperties": false - }, - "DatasetExportSummary": { - "allOf": [ - { - "$ref": "#/definitions/ExportSummary" - }, - { - "type": "object", - "properties": { - "labeledAssetName": { - "description": "The unique name of the labeled data asset.", - "type": "string" - } - } - } - ], - "x-ms-discriminator-value": "Dataset", - "additionalProperties": false - }, - "ExportSummaryResource": { - "description": "Azure Resource Manager resource envelope.", - "required": [ - "properties" - ], - "type": "object", - "properties": { - "id": { - "description": "The resource URL of the entity (not URL encoded).", - "type": "string", - "readOnly": true - }, - "name": { - "description": "The name of the resource entity.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "The resource provider and type.", - "type": "string", - "readOnly": true - }, - "properties": { - "$ref": "#/definitions/ExportSummary" - }, - "systemData": { - "description": "System data associated with resource provider", - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" - } - ], - "readOnly": true - } - }, - "x-ms-azure-resource": true, - "additionalProperties": false - }, - "ExportSummaryResourceArmPaginatedResult": { - "description": "A paginated list of ExportSummary entities.", - "type": "object", - "properties": { - "value": { - "description": "An array of objects of type ExportSummary.", - "type": "array", - "items": { - "$ref": "#/definitions/ExportSummaryResource" - } - }, - "nextLink": { - "type": "string" - } - }, - "additionalProperties": false - }, "CodeConfiguration": { "required": [ "command" @@ -4912,6 +4530,66 @@ "discriminator": "distributionType", "additionalProperties": false }, + "TensorFlow": { + "allOf": [ + { + "$ref": "#/definitions/DistributionConfiguration" + }, + { + "type": "object", + "properties": { + "workerCount": { + "format": "int32", + "description": "Number of workers. Overwrites the node count in compute binding.", + "type": "integer" + }, + "parameterServerCount": { + "format": "int32", + "type": "integer" + } + } + } + ], + "x-ms-discriminator-value": "TensorFlow", + "additionalProperties": false + }, + "Mpi": { + "allOf": [ + { + "$ref": "#/definitions/DistributionConfiguration" + }, + { + "type": "object", + "properties": { + "processCountPerInstance": { + "format": "int32", + "type": "integer" + } + } + } + ], + "x-ms-discriminator-value": "Mpi", + "additionalProperties": false + }, + "PyTorch": { + "allOf": [ + { + "$ref": "#/definitions/DistributionConfiguration" + }, + { + "type": "object", + "properties": { + "processCount": { + "format": "int32", + "description": "Total process count for the distributed job.", + "type": "integer" + } + } + } + ], + "x-ms-discriminator-value": "PyTorch", + "additionalProperties": false + }, "ComputeBinding": { "description": "Compute binding definition.", "type": "object", @@ -5180,78 +4858,6 @@ "x-ms-discriminator-value": "Command", "additionalProperties": false }, - "PipelineJob": { - "description": "Pipeline Job definition", - "required": [ - "computeBinding" - ], - "allOf": [ - { - "$ref": "#/definitions/ComputeJobBase" - }, - { - "type": "object", - "properties": { - "jobType": { - "enum": [ - "Command", - "Sweep", - "Labeling", - "Pipeline", - "Data", - "AutoML" - ], - "type": "string", - "readOnly": true, - "x-ms-enum": { - "name": "JobType", - "modelAsString": true - } - }, - "status": { - "description": "Status of the job.", - "enum": [ - "NotStarted", - "Starting", - "Provisioning", - "Preparing", - "Queued", - "Running", - "Finalizing", - "CancelRequested", - "Completed", - "Failed", - "Canceled", - "NotResponding", - "Paused" - ], - "type": "string", - "x-ms-enum": { - "name": "JobStatus", - "modelAsString": true - } - }, - "definition": { - "description": "PipelineJob json", - "type": "string" - }, - "type": { - "description": "Type of PipelineJob", - "enum": [ - "AzureML" - ], - "type": "string", - "x-ms-enum": { - "name": "PipelineType", - "modelAsString": true - } - } - } - } - ], - "x-ms-discriminator-value": "Pipeline", - "additionalProperties": false - }, "ParameterSamplingConfiguration": { "description": "class for all hyperparameter sampling algorithms", "required": [ @@ -5312,6 +4918,64 @@ "discriminator": "policyType", "additionalProperties": false }, + "BanditPolicyConfiguration": { + "description": "Defines an early termination policy based on slack criteria, and a frequency and delay interval for evaluation", + "allOf": [ + { + "$ref": "#/definitions/EarlyTerminationPolicyConfiguration" + }, + { + "type": "object", + "properties": { + "slackFactor": { + "format": "float", + "type": "number" + }, + "slackAmount": { + "format": "float", + "type": "number" + } + } + } + ], + "x-ms-discriminator-value": "Bandit", + "additionalProperties": false + }, + "MedianStoppingPolicyConfiguration": { + "description": "Defines an early termination policy based on running averages of the primary metric of all runs", + "allOf": [ + { + "$ref": "#/definitions/EarlyTerminationPolicyConfiguration" + }, + { + "type": "object" + } + ], + "x-ms-discriminator-value": "MedianStopping", + "additionalProperties": false + }, + "TruncationSelectionPolicyConfiguration": { + "description": "Defines an early termination policy that cancels a given percentage of runs at each evaluation interval.", + "allOf": [ + { + "$ref": "#/definitions/EarlyTerminationPolicyConfiguration" + }, + { + "type": "object", + "properties": { + "truncationPercentage": { + "format": "int32", + "type": "integer" + }, + "excludeFinishedJobs": { + "type": "boolean" + } + } + } + ], + "x-ms-discriminator-value": "TruncationSelection", + "additionalProperties": false + }, "TerminationConfiguration": { "type": "object", "properties": {