Skip to content

Commit

Permalink
[ML] Removed Experimental Tag from Compute Properties (Azure#29372)
Browse files Browse the repository at this point in the history
* Revert "[ML] Removed Experimental Tags from OS Image Metadata (Azure#29158)"

This reverts commit b393611.

* Removed experimental tags from idle_time_before_shutdown

* Removed experimental tags from custom applications

* Removed experimental tag from setup scripts

* Updated changelog

* Removed extra condition from custom apps

* Revert "Removed extra condition from custom apps"

This reverts commit f9a6cad.

* Revert "Revert "[ML] Removed Experimental Tags from OS Image Metadata (Azure#29158)" (Azure#29400)"

This reverts commit 90062d8.

* Updated changelog
  • Loading branch information
nthandeMS authored Mar 28, 2023
1 parent f6a57c1 commit 241f355
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 23 deletions.
1 change: 1 addition & 0 deletions sdk/ml/azure-ai-ml/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Features Added
- Added experimental scatter gather node to DSL package. This node has a unique mldesigner dependency.
- Added support to make JobService and ServiceInstance objects serializable when printed
- Removed Experimental Tag from Idle Shutdown, Custom Applications, Setup Scripts, and Image Metadata on Compute Instances.

### Bugs Fixed

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ class ComputeInstanceSchema(ComputeSchema):
services = fields.List(fields.Dict(keys=fields.Str(), values=fields.Str()), dump_only=True)
schedules = NestedField(ComputeSchedulesSchema)
identity = ExperimentalField(NestedField(IdentitySchema))
idle_time_before_shutdown = ExperimentalField(fields.Str())
idle_time_before_shutdown_minutes = ExperimentalField(fields.Int())
custom_applications = ExperimentalField(fields.List(NestedField(CustomApplicationsSchema)))
setup_scripts = ExperimentalField(NestedField(SetupScriptsSchema))
os_image_metadata = ExperimentalField(NestedField(OsImageMetadataSchema, dump_only=True))
idle_time_before_shutdown = fields.Str()
idle_time_before_shutdown_minutes = fields.Int()
custom_applications = fields.List(NestedField(CustomApplicationsSchema))
setup_scripts = NestedField(SetupScriptsSchema)
os_image_metadata = NestedField(OsImageMetadataSchema, dump_only=True)
enable_node_public_ip = fields.Bool(
metadata={"description": "Enable or disable node public IP address provisioning."}
)
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from marshmallow import fields
from marshmallow.decorators import post_load

from azure.ai.ml._schema.core.fields import NestedField, StringTransformedEnum, ExperimentalField
from azure.ai.ml._schema.core.fields import NestedField, StringTransformedEnum
from azure.ai.ml._schema.core.schema_meta import PatchedSchemaMeta
from azure.ai.ml.constants._compute import CustomApplicationDefaults

Expand Down Expand Up @@ -46,10 +46,10 @@ def make(self, data, **kwargs):
class CustomApplicationsSchema(metaclass=PatchedSchemaMeta):
name = fields.Str(required=True)
type = StringTransformedEnum(allowed_values=[CustomApplicationDefaults.DOCKER])
image = ExperimentalField(NestedField(ImageSettingsSchema))
endpoints = ExperimentalField(fields.List(NestedField(EndpointsSettingsSchema)))
image = NestedField(ImageSettingsSchema)
endpoints = fields.List(NestedField(EndpointsSettingsSchema))
environment_variables = fields.Dict()
bind_mounts = ExperimentalField(fields.List(NestedField(VolumeSettingsSchema)))
bind_mounts = fields.List(NestedField(VolumeSettingsSchema))

@post_load
def make(self, data, **kwargs):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@
DUPLICATE_APPLICATION_ERROR,
INVALID_VALUE_ERROR,
)
from azure.ai.ml._utils._experimental import experimental


@experimental
class ImageSettings:
"""Specifies an image configuration for a Custom Application.
Expand All @@ -44,7 +42,6 @@ def _from_rest_object(cls, obj: RestImage) -> "ImageSettings":
return ImageSettings(reference=obj.reference)


@experimental
class EndpointsSettings:
"""Specifies an endpoint configuration for a Custom Application.
Expand Down Expand Up @@ -91,7 +88,6 @@ def _validate_endpoint_settings(cls, target: int, published: int):
)


@experimental
class VolumeSettings:
"""Specifies the Bind Mount settings for a Custom Application.
Expand All @@ -118,7 +114,6 @@ def _from_rest_object(cls, obj: RestVolumeDefinition) -> "VolumeSettings":
return VolumeSettings(source=obj.source, target=obj.target)


@experimental
class CustomApplications:
"""Specifies the custom service application configuration.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# ---------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# ---------------------------------------------------------
from azure.ai.ml._utils._experimental import experimental


@experimental
class ImageMetadata:
"""Metadata about the operating system image for this compute instance."""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@
from azure.ai.ml._restclient.v2022_10_01_preview.models import ScriptReference as RestScriptReference
from azure.ai.ml._restclient.v2022_10_01_preview.models import ScriptsToExecute as RestScriptsToExecute
from azure.ai.ml._restclient.v2022_10_01_preview.models import SetupScripts as RestSetupScripts
from azure.ai.ml._utils._experimental import experimental
from azure.ai.ml.entities._mixins import RestTranslatableMixin


@experimental
class ScriptReference(RestTranslatableMixin):
"""Script reference.
Expand Down Expand Up @@ -54,7 +52,6 @@ def _from_rest_object(cls, obj: RestScriptReference) -> "ScriptReference":
return script_reference


@experimental
class SetupScripts(RestTranslatableMixin):
"""Customized setup scripts.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
)
from azure.ai.ml._schema._utils.utils import get_subnet_str
from azure.ai.ml._schema.compute.compute_instance import ComputeInstanceSchema
from azure.ai.ml._utils._experimental import experimental
from azure.ai.ml.constants._common import BASE_PATH_CONTEXT_KEY, TYPE
from azure.ai.ml.constants._compute import ComputeDefaults, ComputeType
from azure.ai.ml.entities._compute.compute import Compute, NetworkSettings
Expand Down Expand Up @@ -143,9 +142,9 @@ class ComputeInstance(Compute):
False - Indicates that the compute nodes will have a private endpoint and no public IPs.
Default Value: True.
:type enable_node_public_ip: Optional[bool], optional
:param setup_scripts: Experimental. Details of customized scripts to execute for setting up the cluster.
:param setup_scripts: Details of customized scripts to execute for setting up the cluster.
:type setup_scripts: Optional[SetupScripts], optional
:param custom_applications: Experimental. List of custom applications and their endpoints
:param custom_applications: List of custom applications and their endpoints
for the compute instance.
:type custom_applications: Optional[List[CustomApplications]], optional
"""
Expand Down Expand Up @@ -224,7 +223,6 @@ def state(self) -> str:
"""
return self._state

@experimental
@property
def os_image_metadata(self) -> ImageMetadata:
"""Metadata about the operating system image for this compute instance.
Expand Down

0 comments on commit 241f355

Please sign in to comment.