66 changes: 52 additions & 14 deletions src/sagemaker/jumpstart/artifacts/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
"""This module contains functions for obtaining JumpStart resoure requirements."""
from __future__ import absolute_import

from typing import Optional
from typing import Dict, Optional, Tuple

from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
Expand All@@ -28,6 +28,20 @@
from sagemaker.session import Session
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP: Dict[
str, Dict[str, Tuple[str, str]]
] = {
"requests": {
"num_accelerators": ("num_accelerators", "num_accelerators"),
"num_cpus": ("num_cpus", "num_cpus"),
"copies": ("copies", "copy_count"),
"min_memory_mb": ("memory", "min_memory"),
},
"limits": {
"max_memory_mb": ("memory", "max_memory"),
},
}


def _retrieve_default_resources(
model_id: str,
Expand All@@ -37,6 +51,7 @@ def _retrieve_default_resources(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model.

Expand All@@ -60,6 +75,8 @@ def _retrieve_default_resources(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model or None.

Expand DownExpand Up@@ -87,23 +104,44 @@ def _retrieve_default_resources(
is_dynamic_container_deployment_supported = (
model_specs.dynamic_container_deployment_supported
)
default_resource_requirements = model_specs.hosting_resource_requirements
default_resource_requirements: Dict[str, int] = (
model_specs.hosting_resource_requirements or {}
)
else:
raise NotImplementedError(
f"Unsupported script scope for retrieving default resource requirements: '{scope}'"
)

instance_specific_resource_requirements: Dict[str, int] = (
model_specs.hosting_instance_type_variants.get_instance_specific_resource_requirements(
instance_type
)
if instance_type
and getattr(model_specs, "hosting_instance_type_variants", None) is not None

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could we simplify to hasattr()?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this because model_specs.hosting_instance_type_variants could be defined but equal None

else {}
)

default_resource_requirements = {
**default_resource_requirements,
**instance_specific_resource_requirements,
}

if is_dynamic_container_deployment_supported:
requests = {}
if "num_accelerators" in default_resource_requirements:
requests["num_accelerators"] = default_resource_requirements["num_accelerators"]
if "min_memory_mb" in default_resource_requirements:
requests["memory"] = default_resource_requirements["min_memory_mb"]
if "num_cpus" in default_resource_requirements:
requests["num_cpus"] = default_resource_requirements["num_cpus"]

limits = {}
if "max_memory_mb" in default_resource_requirements:
limits["memory"] = default_resource_requirements["max_memory_mb"]
return ResourceRequirements(requests=requests, limits=limits)

all_resource_requirement_kwargs = {}

for (
requirement_type,
spec_field_to_resource_requirement_map,
) in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.items():
requirement_kwargs = {}
for spec_field, resource_requirement in spec_field_to_resource_requirement_map.items():
if spec_field in default_resource_requirements:
requirement_kwargs[resource_requirement[0]] = default_resource_requirements[
spec_field
]

all_resource_requirement_kwargs[requirement_type] = requirement_kwargs

return ResourceRequirements(**all_resource_requirement_kwargs)
return None
1 change: 1 addition & 0 deletions src/sagemaker/jumpstart/factory/model.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -481,6 +481,7 @@ def _add_resources_to_kwargs(kwargs: JumpStartModelInitKwargs) -> JumpStartModel
tolerate_deprecated_model=kwargs.tolerate_deprecated_model,
tolerate_vulnerable_model=kwargs.tolerate_vulnerable_model,
sagemaker_session=kwargs.sagemaker_session,
instance_type=kwargs.instance_type,
)

return kwargs
Expand Down
23 changes: 23 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,29 @@ def get_instance_specific_artifact_key(self, instance_type: str) -> Optional[str
instance_type=instance_type, property_name="artifact_key"
)

def get_instance_specific_resource_requirements(self, instance_type: str) -> Optional[str]:
"""Returns instance specific resource requirements.

If a value exists for both the instance family and instance type, the instance type value
is chosen.
"""

instance_specific_resource_requirements: dict = (
self.variants.get(instance_type, {})
.get("properties", {})
.get("resource_requirements", {})
)

instance_type_family = get_instance_type_family(instance_type)

instance_family_resource_requirements: dict = (
self.variants.get(instance_type_family, {})
.get("properties", {})
.get("resource_requirements", {})
)

return {**instance_family_resource_requirements, **instance_specific_resource_requirements}

def _get_instance_specific_property(
self, instance_type: str, property_name: str
) -> Optional[str]:
Expand Down
7 changes: 6 additions & 1 deletion src/sagemaker/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

import logging
from typing import Optional
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

from sagemaker.jumpstart import utils as jumpstart_utils
from sagemaker.jumpstart import artifacts
Expand All@@ -33,7 +34,8 @@ def retrieve_default(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> str:
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model matching the given arguments.

Args:
Expand All@@ -56,6 +58,8 @@ def retrieve_default(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model.

Expand All@@ -79,4 +83,5 @@ def retrieve_default(
tolerate_vulnerable_model,
tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
instance_type=instance_type,
)
20 changes: 20 additions & 0 deletions tests/unit/sagemaker/jumpstart/constants.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -840,8 +840,22 @@
"model_package_arn": "$gpu_model_package_arn",
}
},
"g5": {
"properties": {
"resource_requirements": {
"num_accelerators": 888810,
"randon-field-2": 2222,
}
}
},
"m2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"c2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"ml.g5.xlarge": {
"properties": {
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"},
"resource_requirements": {"num_accelerators": 10},
}
},
"ml.g5.48xlarge": {
"properties": {"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"}}
},
Expand All@@ -857,6 +871,12 @@
"framework_version": "1.5.0",
"py_version": "py3",
},
"dynamic_container_deployment_supported": True,
"hosting_resource_requirements": {
"min_memory_mb": 81999,
"num_accelerators": 1,
"random_field_1": 1,
},
"hosting_artifact_key": "pytorch-infer/infer-pytorch-ic-mobilenet-v2.tar.gz",
"training_artifact_key": "pytorch-training/train-pytorch-ic-mobilenet-v2.tar.gz",
"hosting_script_key": "source-directory-tarballs/pytorch/inference/ic/v1.0.0/sourcedir.tar.gz",
Expand Down
23 changes: 23 additions & 0 deletions tests/unit/sagemaker/jumpstart/test_types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
"variants": {
"ml.p2.12xlarge": {
"properties": {
"resource_requirements": {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9},
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "4"},
"supported_inference_instance_types": ["ml.p5.xlarge"],
"default_inference_instance_type": "ml.p5.xlarge",
Expand All@@ -60,6 +61,11 @@
"p2": {
"regional_properties": {"image_uri": "$gpu_image_uri"},
"properties": {
"resource_requirements": {
"req2": {"2": 5, "9": 999},
"req3": 999,
"req4": "blah",
},
"supported_inference_instance_types": ["ml.p2.xlarge", "ml.p3.xlarge"],
"default_inference_instance_type": "ml.p2.xlarge",
"metrics": [
Expand DownExpand Up@@ -879,3 +885,20 @@ def test_jumpstart_training_artifact_key_instance_variants():
)
is None
)


def test_jumpstart_resource_requirements_instance_variants():
assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.xlarge"
) == {"req2": {"2": 5, "9": 999}, "req3": 999, "req4": "blah"}

assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.12xlarge"
) == {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9, "req4": "blah"}

assert (
INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p99.12xlarge"
)
== {}
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,10 @@
import pytest

from sagemaker import resource_requirements
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements
from sagemaker.jumpstart.artifacts.resource_requirements import (
REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP,
)

from tests.unit.sagemaker.jumpstart.utils import get_spec_from_base_spec, get_special_model_spec

Expand DownExpand Up@@ -50,6 +54,55 @@ def test_jumpstart_resource_requirements(patched_get_model_specs):
patched_get_model_specs.reset_mock()


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_resource_requirements_instance_type_variants(patched_get_model_specs):

patched_get_model_specs.side_effect = get_special_model_spec
region = "us-west-2"
mock_client = boto3.client("s3")
mock_session = Mock(s3_client=mock_client)

model_id, model_version = "variant-model", "*"
default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 10,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 888810,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.f9.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 1,
}


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
patched_get_model_specs.side_effect = get_special_model_spec
Expand DownExpand Up@@ -80,3 +133,18 @@ def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
resource_requirements.retrieve_default(
region=region, model_id=model_id, model_version=model_version, scope="training"
)


def test_jumpstart_supports_all_resource_requirement_fields():

all_tracked_resource_requirement_fields = {
field
for requirements in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.values()
for _, field in requirements.values()
}

excluded_resource_requirement_fields = {"requests", "limits"}
assert (
set(ResourceRequirements().__dict__.keys()) - excluded_resource_requirement_fields
== all_tracked_resource_requirement_fields
)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
66 changes: 52 additions & 14 deletions src/sagemaker/jumpstart/artifacts/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
"""This module contains functions for obtaining JumpStart resoure requirements."""
from __future__ import absolute_import

from typing import Optional
from typing import Dict, Optional, Tuple

from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
Expand All@@ -28,6 +28,20 @@
from sagemaker.session import Session
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP: Dict[
str, Dict[str, Tuple[str, str]]
] = {
"requests": {
"num_accelerators": ("num_accelerators", "num_accelerators"),
"num_cpus": ("num_cpus", "num_cpus"),
"copies": ("copies", "copy_count"),
"min_memory_mb": ("memory", "min_memory"),
},
"limits": {
"max_memory_mb": ("memory", "max_memory"),
},
}


def _retrieve_default_resources(
model_id: str,
Expand All@@ -37,6 +51,7 @@ def _retrieve_default_resources(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model.

Expand All@@ -60,6 +75,8 @@ def _retrieve_default_resources(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model or None.

Expand DownExpand Up@@ -87,23 +104,44 @@ def _retrieve_default_resources(
is_dynamic_container_deployment_supported = (
model_specs.dynamic_container_deployment_supported
)
default_resource_requirements = model_specs.hosting_resource_requirements
default_resource_requirements: Dict[str, int] = (
model_specs.hosting_resource_requirements or {}
)
else:
raise NotImplementedError(
f"Unsupported script scope for retrieving default resource requirements: '{scope}'"
)

instance_specific_resource_requirements: Dict[str, int] = (
model_specs.hosting_instance_type_variants.get_instance_specific_resource_requirements(
instance_type
)
if instance_type
and getattr(model_specs, "hosting_instance_type_variants", None) is not None

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could we simplify to hasattr()?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this because model_specs.hosting_instance_type_variants could be defined but equal None

else {}
)

default_resource_requirements = {
**default_resource_requirements,
**instance_specific_resource_requirements,
}

if is_dynamic_container_deployment_supported:
requests = {}
if "num_accelerators" in default_resource_requirements:
requests["num_accelerators"] = default_resource_requirements["num_accelerators"]
if "min_memory_mb" in default_resource_requirements:
requests["memory"] = default_resource_requirements["min_memory_mb"]
if "num_cpus" in default_resource_requirements:
requests["num_cpus"] = default_resource_requirements["num_cpus"]

limits = {}
if "max_memory_mb" in default_resource_requirements:
limits["memory"] = default_resource_requirements["max_memory_mb"]
return ResourceRequirements(requests=requests, limits=limits)

all_resource_requirement_kwargs = {}

for (
requirement_type,
spec_field_to_resource_requirement_map,
) in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.items():
requirement_kwargs = {}
for spec_field, resource_requirement in spec_field_to_resource_requirement_map.items():
if spec_field in default_resource_requirements:
requirement_kwargs[resource_requirement[0]] = default_resource_requirements[
spec_field
]

all_resource_requirement_kwargs[requirement_type] = requirement_kwargs

return ResourceRequirements(**all_resource_requirement_kwargs)
return None
1 change: 1 addition & 0 deletions src/sagemaker/jumpstart/factory/model.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -481,6 +481,7 @@ def _add_resources_to_kwargs(kwargs: JumpStartModelInitKwargs) -> JumpStartModel
tolerate_deprecated_model=kwargs.tolerate_deprecated_model,
tolerate_vulnerable_model=kwargs.tolerate_vulnerable_model,
sagemaker_session=kwargs.sagemaker_session,
instance_type=kwargs.instance_type,
)

return kwargs
Expand Down
23 changes: 23 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,29 @@ def get_instance_specific_artifact_key(self, instance_type: str) -> Optional[str
instance_type=instance_type, property_name="artifact_key"
)

def get_instance_specific_resource_requirements(self, instance_type: str) -> Optional[str]:
"""Returns instance specific resource requirements.

If a value exists for both the instance family and instance type, the instance type value
is chosen.
"""

instance_specific_resource_requirements: dict = (
self.variants.get(instance_type, {})
.get("properties", {})
.get("resource_requirements", {})
)

instance_type_family = get_instance_type_family(instance_type)

instance_family_resource_requirements: dict = (
self.variants.get(instance_type_family, {})
.get("properties", {})
.get("resource_requirements", {})
)

return {**instance_family_resource_requirements, **instance_specific_resource_requirements}

def _get_instance_specific_property(
self, instance_type: str, property_name: str
) -> Optional[str]:
Expand Down
7 changes: 6 additions & 1 deletion src/sagemaker/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

import logging
from typing import Optional
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

from sagemaker.jumpstart import utils as jumpstart_utils
from sagemaker.jumpstart import artifacts
Expand All@@ -33,7 +34,8 @@ def retrieve_default(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> str:
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model matching the given arguments.

Args:
Expand All@@ -56,6 +58,8 @@ def retrieve_default(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model.

Expand All@@ -79,4 +83,5 @@ def retrieve_default(
tolerate_vulnerable_model,
tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
instance_type=instance_type,
)
20 changes: 20 additions & 0 deletions tests/unit/sagemaker/jumpstart/constants.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -840,8 +840,22 @@
"model_package_arn": "$gpu_model_package_arn",
}
},
"g5": {
"properties": {
"resource_requirements": {
"num_accelerators": 888810,
"randon-field-2": 2222,
}
}
},
"m2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"c2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"ml.g5.xlarge": {
"properties": {
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"},
"resource_requirements": {"num_accelerators": 10},
}
},
"ml.g5.48xlarge": {
"properties": {"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"}}
},
Expand All@@ -857,6 +871,12 @@
"framework_version": "1.5.0",
"py_version": "py3",
},
"dynamic_container_deployment_supported": True,
"hosting_resource_requirements": {
"min_memory_mb": 81999,
"num_accelerators": 1,
"random_field_1": 1,
},
"hosting_artifact_key": "pytorch-infer/infer-pytorch-ic-mobilenet-v2.tar.gz",
"training_artifact_key": "pytorch-training/train-pytorch-ic-mobilenet-v2.tar.gz",
"hosting_script_key": "source-directory-tarballs/pytorch/inference/ic/v1.0.0/sourcedir.tar.gz",
Expand Down
23 changes: 23 additions & 0 deletions tests/unit/sagemaker/jumpstart/test_types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
"variants": {
"ml.p2.12xlarge": {
"properties": {
"resource_requirements": {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9},
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "4"},
"supported_inference_instance_types": ["ml.p5.xlarge"],
"default_inference_instance_type": "ml.p5.xlarge",
Expand All@@ -60,6 +61,11 @@
"p2": {
"regional_properties": {"image_uri": "$gpu_image_uri"},
"properties": {
"resource_requirements": {
"req2": {"2": 5, "9": 999},
"req3": 999,
"req4": "blah",
},
"supported_inference_instance_types": ["ml.p2.xlarge", "ml.p3.xlarge"],
"default_inference_instance_type": "ml.p2.xlarge",
"metrics": [
Expand DownExpand Up@@ -879,3 +885,20 @@ def test_jumpstart_training_artifact_key_instance_variants():
)
is None
)


def test_jumpstart_resource_requirements_instance_variants():
assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.xlarge"
) == {"req2": {"2": 5, "9": 999}, "req3": 999, "req4": "blah"}

assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.12xlarge"
) == {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9, "req4": "blah"}

assert (
INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p99.12xlarge"
)
== {}
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,10 @@
import pytest

from sagemaker import resource_requirements
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements
from sagemaker.jumpstart.artifacts.resource_requirements import (
REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP,
)

from tests.unit.sagemaker.jumpstart.utils import get_spec_from_base_spec, get_special_model_spec

Expand DownExpand Up@@ -50,6 +54,55 @@ def test_jumpstart_resource_requirements(patched_get_model_specs):
patched_get_model_specs.reset_mock()


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_resource_requirements_instance_type_variants(patched_get_model_specs):

patched_get_model_specs.side_effect = get_special_model_spec
region = "us-west-2"
mock_client = boto3.client("s3")
mock_session = Mock(s3_client=mock_client)

model_id, model_version = "variant-model", "*"
default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 10,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 888810,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.f9.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 1,
}


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
patched_get_model_specs.side_effect = get_special_model_spec
Expand DownExpand Up@@ -80,3 +133,18 @@ def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
resource_requirements.retrieve_default(
region=region, model_id=model_id, model_version=model_version, scope="training"
)


def test_jumpstart_supports_all_resource_requirement_fields():

all_tracked_resource_requirement_fields = {
field
for requirements in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.values()
for _, field in requirements.values()
}

excluded_resource_requirement_fields = {"requests", "limits"}
assert (
set(ResourceRequirements().__dict__.keys()) - excluded_resource_requirement_fields
== all_tracked_resource_requirement_fields
)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
66 changes: 52 additions & 14 deletions src/sagemaker/jumpstart/artifacts/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
"""This module contains functions for obtaining JumpStart resoure requirements."""
from __future__ import absolute_import

from typing import Optional
from typing import Dict, Optional, Tuple

from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
Expand All@@ -28,6 +28,20 @@
from sagemaker.session import Session
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP: Dict[
str, Dict[str, Tuple[str, str]]
] = {
"requests": {
"num_accelerators": ("num_accelerators", "num_accelerators"),
"num_cpus": ("num_cpus", "num_cpus"),
"copies": ("copies", "copy_count"),
"min_memory_mb": ("memory", "min_memory"),
},
"limits": {
"max_memory_mb": ("memory", "max_memory"),
},
}


def _retrieve_default_resources(
model_id: str,
Expand All@@ -37,6 +51,7 @@ def _retrieve_default_resources(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model.

Expand All@@ -60,6 +75,8 @@ def _retrieve_default_resources(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model or None.

Expand DownExpand Up@@ -87,23 +104,44 @@ def _retrieve_default_resources(
is_dynamic_container_deployment_supported = (
model_specs.dynamic_container_deployment_supported
)
default_resource_requirements = model_specs.hosting_resource_requirements
default_resource_requirements: Dict[str, int] = (
model_specs.hosting_resource_requirements or {}
)
else:
raise NotImplementedError(
f"Unsupported script scope for retrieving default resource requirements: '{scope}'"
)

instance_specific_resource_requirements: Dict[str, int] = (
model_specs.hosting_instance_type_variants.get_instance_specific_resource_requirements(
instance_type
)
if instance_type
and getattr(model_specs, "hosting_instance_type_variants", None) is not None

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could we simplify to hasattr()?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this because model_specs.hosting_instance_type_variants could be defined but equal None

else {}
)

default_resource_requirements = {
**default_resource_requirements,
**instance_specific_resource_requirements,
}

if is_dynamic_container_deployment_supported:
requests = {}
if "num_accelerators" in default_resource_requirements:
requests["num_accelerators"] = default_resource_requirements["num_accelerators"]
if "min_memory_mb" in default_resource_requirements:
requests["memory"] = default_resource_requirements["min_memory_mb"]
if "num_cpus" in default_resource_requirements:
requests["num_cpus"] = default_resource_requirements["num_cpus"]

limits = {}
if "max_memory_mb" in default_resource_requirements:
limits["memory"] = default_resource_requirements["max_memory_mb"]
return ResourceRequirements(requests=requests, limits=limits)

all_resource_requirement_kwargs = {}

for (
requirement_type,
spec_field_to_resource_requirement_map,
) in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.items():
requirement_kwargs = {}
for spec_field, resource_requirement in spec_field_to_resource_requirement_map.items():
if spec_field in default_resource_requirements:
requirement_kwargs[resource_requirement[0]] = default_resource_requirements[
spec_field
]

all_resource_requirement_kwargs[requirement_type] = requirement_kwargs

return ResourceRequirements(**all_resource_requirement_kwargs)
return None
1 change: 1 addition & 0 deletions src/sagemaker/jumpstart/factory/model.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -481,6 +481,7 @@ def _add_resources_to_kwargs(kwargs: JumpStartModelInitKwargs) -> JumpStartModel
tolerate_deprecated_model=kwargs.tolerate_deprecated_model,
tolerate_vulnerable_model=kwargs.tolerate_vulnerable_model,
sagemaker_session=kwargs.sagemaker_session,
instance_type=kwargs.instance_type,
)

return kwargs
Expand Down
23 changes: 23 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,29 @@ def get_instance_specific_artifact_key(self, instance_type: str) -> Optional[str
instance_type=instance_type, property_name="artifact_key"
)

def get_instance_specific_resource_requirements(self, instance_type: str) -> Optional[str]:
"""Returns instance specific resource requirements.

If a value exists for both the instance family and instance type, the instance type value
is chosen.
"""

instance_specific_resource_requirements: dict = (
self.variants.get(instance_type, {})
.get("properties", {})
.get("resource_requirements", {})
)

instance_type_family = get_instance_type_family(instance_type)

instance_family_resource_requirements: dict = (
self.variants.get(instance_type_family, {})
.get("properties", {})
.get("resource_requirements", {})
)

return {**instance_family_resource_requirements, **instance_specific_resource_requirements}

def _get_instance_specific_property(
self, instance_type: str, property_name: str
) -> Optional[str]:
Expand Down
7 changes: 6 additions & 1 deletion src/sagemaker/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

import logging
from typing import Optional
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

from sagemaker.jumpstart import utils as jumpstart_utils
from sagemaker.jumpstart import artifacts
Expand All@@ -33,7 +34,8 @@ def retrieve_default(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> str:
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model matching the given arguments.

Args:
Expand All@@ -56,6 +58,8 @@ def retrieve_default(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model.

Expand All@@ -79,4 +83,5 @@ def retrieve_default(
tolerate_vulnerable_model,
tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
instance_type=instance_type,
)
20 changes: 20 additions & 0 deletions tests/unit/sagemaker/jumpstart/constants.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -840,8 +840,22 @@
"model_package_arn": "$gpu_model_package_arn",
}
},
"g5": {
"properties": {
"resource_requirements": {
"num_accelerators": 888810,
"randon-field-2": 2222,
}
}
},
"m2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"c2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"ml.g5.xlarge": {
"properties": {
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"},
"resource_requirements": {"num_accelerators": 10},
}
},
"ml.g5.48xlarge": {
"properties": {"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"}}
},
Expand All@@ -857,6 +871,12 @@
"framework_version": "1.5.0",
"py_version": "py3",
},
"dynamic_container_deployment_supported": True,
"hosting_resource_requirements": {
"min_memory_mb": 81999,
"num_accelerators": 1,
"random_field_1": 1,
},
"hosting_artifact_key": "pytorch-infer/infer-pytorch-ic-mobilenet-v2.tar.gz",
"training_artifact_key": "pytorch-training/train-pytorch-ic-mobilenet-v2.tar.gz",
"hosting_script_key": "source-directory-tarballs/pytorch/inference/ic/v1.0.0/sourcedir.tar.gz",
Expand Down
23 changes: 23 additions & 0 deletions tests/unit/sagemaker/jumpstart/test_types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
"variants": {
"ml.p2.12xlarge": {
"properties": {
"resource_requirements": {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9},
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "4"},
"supported_inference_instance_types": ["ml.p5.xlarge"],
"default_inference_instance_type": "ml.p5.xlarge",
Expand All@@ -60,6 +61,11 @@
"p2": {
"regional_properties": {"image_uri": "$gpu_image_uri"},
"properties": {
"resource_requirements": {
"req2": {"2": 5, "9": 999},
"req3": 999,
"req4": "blah",
},
"supported_inference_instance_types": ["ml.p2.xlarge", "ml.p3.xlarge"],
"default_inference_instance_type": "ml.p2.xlarge",
"metrics": [
Expand DownExpand Up@@ -879,3 +885,20 @@ def test_jumpstart_training_artifact_key_instance_variants():
)
is None
)


def test_jumpstart_resource_requirements_instance_variants():
assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.xlarge"
) == {"req2": {"2": 5, "9": 999}, "req3": 999, "req4": "blah"}

assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.12xlarge"
) == {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9, "req4": "blah"}

assert (
INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p99.12xlarge"
)
== {}
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,10 @@
import pytest

from sagemaker import resource_requirements
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements
from sagemaker.jumpstart.artifacts.resource_requirements import (
REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP,
)

from tests.unit.sagemaker.jumpstart.utils import get_spec_from_base_spec, get_special_model_spec

Expand DownExpand Up@@ -50,6 +54,55 @@ def test_jumpstart_resource_requirements(patched_get_model_specs):
patched_get_model_specs.reset_mock()


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_resource_requirements_instance_type_variants(patched_get_model_specs):

patched_get_model_specs.side_effect = get_special_model_spec
region = "us-west-2"
mock_client = boto3.client("s3")
mock_session = Mock(s3_client=mock_client)

model_id, model_version = "variant-model", "*"
default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 10,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 888810,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.f9.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 1,
}


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
patched_get_model_specs.side_effect = get_special_model_spec
Expand DownExpand Up@@ -80,3 +133,18 @@ def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
resource_requirements.retrieve_default(
region=region, model_id=model_id, model_version=model_version, scope="training"
)


def test_jumpstart_supports_all_resource_requirement_fields():

all_tracked_resource_requirement_fields = {
field
for requirements in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.values()
for _, field in requirements.values()
}

excluded_resource_requirement_fields = {"requests", "limits"}
assert (
set(ResourceRequirements().__dict__.keys()) - excluded_resource_requirement_fields
== all_tracked_resource_requirement_fields
)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
66 changes: 52 additions & 14 deletions src/sagemaker/jumpstart/artifacts/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
"""This module contains functions for obtaining JumpStart resoure requirements."""
from __future__ import absolute_import

from typing import Optional
from typing import Dict, Optional, Tuple

from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
Expand All@@ -28,6 +28,20 @@
from sagemaker.session import Session
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP: Dict[
str, Dict[str, Tuple[str, str]]
] = {
"requests": {
"num_accelerators": ("num_accelerators", "num_accelerators"),
"num_cpus": ("num_cpus", "num_cpus"),
"copies": ("copies", "copy_count"),
"min_memory_mb": ("memory", "min_memory"),
},
"limits": {
"max_memory_mb": ("memory", "max_memory"),
},
}


def _retrieve_default_resources(
model_id: str,
Expand All@@ -37,6 +51,7 @@ def _retrieve_default_resources(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model.

Expand All@@ -60,6 +75,8 @@ def _retrieve_default_resources(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model or None.

Expand DownExpand Up@@ -87,23 +104,44 @@ def _retrieve_default_resources(
is_dynamic_container_deployment_supported = (
model_specs.dynamic_container_deployment_supported
)
default_resource_requirements = model_specs.hosting_resource_requirements
default_resource_requirements: Dict[str, int] = (
model_specs.hosting_resource_requirements or {}
)
else:
raise NotImplementedError(
f"Unsupported script scope for retrieving default resource requirements: '{scope}'"
)

instance_specific_resource_requirements: Dict[str, int] = (
model_specs.hosting_instance_type_variants.get_instance_specific_resource_requirements(
instance_type
)
if instance_type
and getattr(model_specs, "hosting_instance_type_variants", None) is not None

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could we simplify to hasattr()?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this because model_specs.hosting_instance_type_variants could be defined but equal None

else {}
)

default_resource_requirements = {
**default_resource_requirements,
**instance_specific_resource_requirements,
}

if is_dynamic_container_deployment_supported:
requests = {}
if "num_accelerators" in default_resource_requirements:
requests["num_accelerators"] = default_resource_requirements["num_accelerators"]
if "min_memory_mb" in default_resource_requirements:
requests["memory"] = default_resource_requirements["min_memory_mb"]
if "num_cpus" in default_resource_requirements:
requests["num_cpus"] = default_resource_requirements["num_cpus"]

limits = {}
if "max_memory_mb" in default_resource_requirements:
limits["memory"] = default_resource_requirements["max_memory_mb"]
return ResourceRequirements(requests=requests, limits=limits)

all_resource_requirement_kwargs = {}

for (
requirement_type,
spec_field_to_resource_requirement_map,
) in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.items():
requirement_kwargs = {}
for spec_field, resource_requirement in spec_field_to_resource_requirement_map.items():
if spec_field in default_resource_requirements:
requirement_kwargs[resource_requirement[0]] = default_resource_requirements[
spec_field
]

all_resource_requirement_kwargs[requirement_type] = requirement_kwargs

return ResourceRequirements(**all_resource_requirement_kwargs)
return None
1 change: 1 addition & 0 deletions src/sagemaker/jumpstart/factory/model.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -481,6 +481,7 @@ def _add_resources_to_kwargs(kwargs: JumpStartModelInitKwargs) -> JumpStartModel
tolerate_deprecated_model=kwargs.tolerate_deprecated_model,
tolerate_vulnerable_model=kwargs.tolerate_vulnerable_model,
sagemaker_session=kwargs.sagemaker_session,
instance_type=kwargs.instance_type,
)

return kwargs
Expand Down
23 changes: 23 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,29 @@ def get_instance_specific_artifact_key(self, instance_type: str) -> Optional[str
instance_type=instance_type, property_name="artifact_key"
)

def get_instance_specific_resource_requirements(self, instance_type: str) -> Optional[str]:
"""Returns instance specific resource requirements.

If a value exists for both the instance family and instance type, the instance type value
is chosen.
"""

instance_specific_resource_requirements: dict = (
self.variants.get(instance_type, {})
.get("properties", {})
.get("resource_requirements", {})
)

instance_type_family = get_instance_type_family(instance_type)

instance_family_resource_requirements: dict = (
self.variants.get(instance_type_family, {})
.get("properties", {})
.get("resource_requirements", {})
)

return {**instance_family_resource_requirements, **instance_specific_resource_requirements}

def _get_instance_specific_property(
self, instance_type: str, property_name: str
) -> Optional[str]:
Expand Down
7 changes: 6 additions & 1 deletion src/sagemaker/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

import logging
from typing import Optional
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

from sagemaker.jumpstart import utils as jumpstart_utils
from sagemaker.jumpstart import artifacts
Expand All@@ -33,7 +34,8 @@ def retrieve_default(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> str:
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model matching the given arguments.

Args:
Expand All@@ -56,6 +58,8 @@ def retrieve_default(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model.

Expand All@@ -79,4 +83,5 @@ def retrieve_default(
tolerate_vulnerable_model,
tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
instance_type=instance_type,
)
20 changes: 20 additions & 0 deletions tests/unit/sagemaker/jumpstart/constants.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -840,8 +840,22 @@
"model_package_arn": "$gpu_model_package_arn",
}
},
"g5": {
"properties": {
"resource_requirements": {
"num_accelerators": 888810,
"randon-field-2": 2222,
}
}
},
"m2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"c2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"ml.g5.xlarge": {
"properties": {
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"},
"resource_requirements": {"num_accelerators": 10},
}
},
"ml.g5.48xlarge": {
"properties": {"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"}}
},
Expand All@@ -857,6 +871,12 @@
"framework_version": "1.5.0",
"py_version": "py3",
},
"dynamic_container_deployment_supported": True,
"hosting_resource_requirements": {
"min_memory_mb": 81999,
"num_accelerators": 1,
"random_field_1": 1,
},
"hosting_artifact_key": "pytorch-infer/infer-pytorch-ic-mobilenet-v2.tar.gz",
"training_artifact_key": "pytorch-training/train-pytorch-ic-mobilenet-v2.tar.gz",
"hosting_script_key": "source-directory-tarballs/pytorch/inference/ic/v1.0.0/sourcedir.tar.gz",
Expand Down
23 changes: 23 additions & 0 deletions tests/unit/sagemaker/jumpstart/test_types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
"variants": {
"ml.p2.12xlarge": {
"properties": {
"resource_requirements": {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9},
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "4"},
"supported_inference_instance_types": ["ml.p5.xlarge"],
"default_inference_instance_type": "ml.p5.xlarge",
Expand All@@ -60,6 +61,11 @@
"p2": {
"regional_properties": {"image_uri": "$gpu_image_uri"},
"properties": {
"resource_requirements": {
"req2": {"2": 5, "9": 999},
"req3": 999,
"req4": "blah",
},
"supported_inference_instance_types": ["ml.p2.xlarge", "ml.p3.xlarge"],
"default_inference_instance_type": "ml.p2.xlarge",
"metrics": [
Expand DownExpand Up@@ -879,3 +885,20 @@ def test_jumpstart_training_artifact_key_instance_variants():
)
is None
)


def test_jumpstart_resource_requirements_instance_variants():
assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.xlarge"
) == {"req2": {"2": 5, "9": 999}, "req3": 999, "req4": "blah"}

assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.12xlarge"
) == {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9, "req4": "blah"}

assert (
INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p99.12xlarge"
)
== {}
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,10 @@
import pytest

from sagemaker import resource_requirements
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements
from sagemaker.jumpstart.artifacts.resource_requirements import (
REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP,
)

from tests.unit.sagemaker.jumpstart.utils import get_spec_from_base_spec, get_special_model_spec

Expand DownExpand Up@@ -50,6 +54,55 @@ def test_jumpstart_resource_requirements(patched_get_model_specs):
patched_get_model_specs.reset_mock()


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_resource_requirements_instance_type_variants(patched_get_model_specs):

patched_get_model_specs.side_effect = get_special_model_spec
region = "us-west-2"
mock_client = boto3.client("s3")
mock_session = Mock(s3_client=mock_client)

model_id, model_version = "variant-model", "*"
default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 10,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 888810,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.f9.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 1,
}


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
patched_get_model_specs.side_effect = get_special_model_spec
Expand DownExpand Up@@ -80,3 +133,18 @@ def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
resource_requirements.retrieve_default(
region=region, model_id=model_id, model_version=model_version, scope="training"
)


def test_jumpstart_supports_all_resource_requirement_fields():

all_tracked_resource_requirement_fields = {
field
for requirements in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.values()
for _, field in requirements.values()
}

excluded_resource_requirement_fields = {"requests", "limits"}
assert (
set(ResourceRequirements().__dict__.keys()) - excluded_resource_requirement_fields
== all_tracked_resource_requirement_fields
)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
66 changes: 52 additions & 14 deletions src/sagemaker/jumpstart/artifacts/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
"""This module contains functions for obtaining JumpStart resoure requirements."""
from __future__ import absolute_import

from typing import Optional
from typing import Dict, Optional, Tuple

from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
Expand All@@ -28,6 +28,20 @@
from sagemaker.session import Session
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP: Dict[
str, Dict[str, Tuple[str, str]]
] = {
"requests": {
"num_accelerators": ("num_accelerators", "num_accelerators"),
"num_cpus": ("num_cpus", "num_cpus"),
"copies": ("copies", "copy_count"),
"min_memory_mb": ("memory", "min_memory"),
},
"limits": {
"max_memory_mb": ("memory", "max_memory"),
},
}


def _retrieve_default_resources(
model_id: str,
Expand All@@ -37,6 +51,7 @@ def _retrieve_default_resources(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model.

Expand All@@ -60,6 +75,8 @@ def _retrieve_default_resources(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model or None.

Expand DownExpand Up@@ -87,23 +104,44 @@ def _retrieve_default_resources(
is_dynamic_container_deployment_supported = (
model_specs.dynamic_container_deployment_supported
)
default_resource_requirements = model_specs.hosting_resource_requirements
default_resource_requirements: Dict[str, int] = (
model_specs.hosting_resource_requirements or {}
)
else:
raise NotImplementedError(
f"Unsupported script scope for retrieving default resource requirements: '{scope}'"
)

instance_specific_resource_requirements: Dict[str, int] = (
model_specs.hosting_instance_type_variants.get_instance_specific_resource_requirements(
instance_type
)
if instance_type
and getattr(model_specs, "hosting_instance_type_variants", None) is not None

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could we simplify to hasattr()?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this because model_specs.hosting_instance_type_variants could be defined but equal None

else {}
)

default_resource_requirements = {
**default_resource_requirements,
**instance_specific_resource_requirements,
}

if is_dynamic_container_deployment_supported:
requests = {}
if "num_accelerators" in default_resource_requirements:
requests["num_accelerators"] = default_resource_requirements["num_accelerators"]
if "min_memory_mb" in default_resource_requirements:
requests["memory"] = default_resource_requirements["min_memory_mb"]
if "num_cpus" in default_resource_requirements:
requests["num_cpus"] = default_resource_requirements["num_cpus"]

limits = {}
if "max_memory_mb" in default_resource_requirements:
limits["memory"] = default_resource_requirements["max_memory_mb"]
return ResourceRequirements(requests=requests, limits=limits)

all_resource_requirement_kwargs = {}

for (
requirement_type,
spec_field_to_resource_requirement_map,
) in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.items():
requirement_kwargs = {}
for spec_field, resource_requirement in spec_field_to_resource_requirement_map.items():
if spec_field in default_resource_requirements:
requirement_kwargs[resource_requirement[0]] = default_resource_requirements[
spec_field
]

all_resource_requirement_kwargs[requirement_type] = requirement_kwargs

return ResourceRequirements(**all_resource_requirement_kwargs)
return None
1 change: 1 addition & 0 deletions src/sagemaker/jumpstart/factory/model.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -481,6 +481,7 @@ def _add_resources_to_kwargs(kwargs: JumpStartModelInitKwargs) -> JumpStartModel
tolerate_deprecated_model=kwargs.tolerate_deprecated_model,
tolerate_vulnerable_model=kwargs.tolerate_vulnerable_model,
sagemaker_session=kwargs.sagemaker_session,
instance_type=kwargs.instance_type,
)

return kwargs
Expand Down
23 changes: 23 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,29 @@ def get_instance_specific_artifact_key(self, instance_type: str) -> Optional[str
instance_type=instance_type, property_name="artifact_key"
)

def get_instance_specific_resource_requirements(self, instance_type: str) -> Optional[str]:
"""Returns instance specific resource requirements.

If a value exists for both the instance family and instance type, the instance type value
is chosen.
"""

instance_specific_resource_requirements: dict = (
self.variants.get(instance_type, {})
.get("properties", {})
.get("resource_requirements", {})
)

instance_type_family = get_instance_type_family(instance_type)

instance_family_resource_requirements: dict = (
self.variants.get(instance_type_family, {})
.get("properties", {})
.get("resource_requirements", {})
)

return {**instance_family_resource_requirements, **instance_specific_resource_requirements}

def _get_instance_specific_property(
self, instance_type: str, property_name: str
) -> Optional[str]:
Expand Down
7 changes: 6 additions & 1 deletion src/sagemaker/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

import logging
from typing import Optional
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

from sagemaker.jumpstart import utils as jumpstart_utils
from sagemaker.jumpstart import artifacts
Expand All@@ -33,7 +34,8 @@ def retrieve_default(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> str:
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model matching the given arguments.

Args:
Expand All@@ -56,6 +58,8 @@ def retrieve_default(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model.

Expand All@@ -79,4 +83,5 @@ def retrieve_default(
tolerate_vulnerable_model,
tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
instance_type=instance_type,
)
20 changes: 20 additions & 0 deletions tests/unit/sagemaker/jumpstart/constants.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -840,8 +840,22 @@
"model_package_arn": "$gpu_model_package_arn",
}
},
"g5": {
"properties": {
"resource_requirements": {
"num_accelerators": 888810,
"randon-field-2": 2222,
}
}
},
"m2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"c2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"ml.g5.xlarge": {
"properties": {
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"},
"resource_requirements": {"num_accelerators": 10},
}
},
"ml.g5.48xlarge": {
"properties": {"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"}}
},
Expand All@@ -857,6 +871,12 @@
"framework_version": "1.5.0",
"py_version": "py3",
},
"dynamic_container_deployment_supported": True,
"hosting_resource_requirements": {
"min_memory_mb": 81999,
"num_accelerators": 1,
"random_field_1": 1,
},
"hosting_artifact_key": "pytorch-infer/infer-pytorch-ic-mobilenet-v2.tar.gz",
"training_artifact_key": "pytorch-training/train-pytorch-ic-mobilenet-v2.tar.gz",
"hosting_script_key": "source-directory-tarballs/pytorch/inference/ic/v1.0.0/sourcedir.tar.gz",
Expand Down
23 changes: 23 additions & 0 deletions tests/unit/sagemaker/jumpstart/test_types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
"variants": {
"ml.p2.12xlarge": {
"properties": {
"resource_requirements": {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9},
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "4"},
"supported_inference_instance_types": ["ml.p5.xlarge"],
"default_inference_instance_type": "ml.p5.xlarge",
Expand All@@ -60,6 +61,11 @@
"p2": {
"regional_properties": {"image_uri": "$gpu_image_uri"},
"properties": {
"resource_requirements": {
"req2": {"2": 5, "9": 999},
"req3": 999,
"req4": "blah",
},
"supported_inference_instance_types": ["ml.p2.xlarge", "ml.p3.xlarge"],
"default_inference_instance_type": "ml.p2.xlarge",
"metrics": [
Expand DownExpand Up@@ -879,3 +885,20 @@ def test_jumpstart_training_artifact_key_instance_variants():
)
is None
)


def test_jumpstart_resource_requirements_instance_variants():
assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.xlarge"
) == {"req2": {"2": 5, "9": 999}, "req3": 999, "req4": "blah"}

assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.12xlarge"
) == {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9, "req4": "blah"}

assert (
INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p99.12xlarge"
)
== {}
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,10 @@
import pytest

from sagemaker import resource_requirements
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements
from sagemaker.jumpstart.artifacts.resource_requirements import (
REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP,
)

from tests.unit.sagemaker.jumpstart.utils import get_spec_from_base_spec, get_special_model_spec

Expand DownExpand Up@@ -50,6 +54,55 @@ def test_jumpstart_resource_requirements(patched_get_model_specs):
patched_get_model_specs.reset_mock()


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_resource_requirements_instance_type_variants(patched_get_model_specs):

patched_get_model_specs.side_effect = get_special_model_spec
region = "us-west-2"
mock_client = boto3.client("s3")
mock_session = Mock(s3_client=mock_client)

model_id, model_version = "variant-model", "*"
default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 10,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 888810,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.f9.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 1,
}


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
patched_get_model_specs.side_effect = get_special_model_spec
Expand DownExpand Up@@ -80,3 +133,18 @@ def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
resource_requirements.retrieve_default(
region=region, model_id=model_id, model_version=model_version, scope="training"
)


def test_jumpstart_supports_all_resource_requirement_fields():

all_tracked_resource_requirement_fields = {
field
for requirements in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.values()
for _, field in requirements.values()
}

excluded_resource_requirement_fields = {"requests", "limits"}
assert (
set(ResourceRequirements().__dict__.keys()) - excluded_resource_requirement_fields
== all_tracked_resource_requirement_fields
)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
66 changes: 52 additions & 14 deletions src/sagemaker/jumpstart/artifacts/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
"""This module contains functions for obtaining JumpStart resoure requirements."""
from __future__ import absolute_import

from typing import Optional
from typing import Dict, Optional, Tuple

from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
Expand All@@ -28,6 +28,20 @@
from sagemaker.session import Session
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP: Dict[
str, Dict[str, Tuple[str, str]]
] = {
"requests": {
"num_accelerators": ("num_accelerators", "num_accelerators"),
"num_cpus": ("num_cpus", "num_cpus"),
"copies": ("copies", "copy_count"),
"min_memory_mb": ("memory", "min_memory"),
},
"limits": {
"max_memory_mb": ("memory", "max_memory"),
},
}


def _retrieve_default_resources(
model_id: str,
Expand All@@ -37,6 +51,7 @@ def _retrieve_default_resources(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model.

Expand All@@ -60,6 +75,8 @@ def _retrieve_default_resources(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model or None.

Expand DownExpand Up@@ -87,23 +104,44 @@ def _retrieve_default_resources(
is_dynamic_container_deployment_supported = (
model_specs.dynamic_container_deployment_supported
)
default_resource_requirements = model_specs.hosting_resource_requirements
default_resource_requirements: Dict[str, int] = (
model_specs.hosting_resource_requirements or {}
)
else:
raise NotImplementedError(
f"Unsupported script scope for retrieving default resource requirements: '{scope}'"
)

instance_specific_resource_requirements: Dict[str, int] = (
model_specs.hosting_instance_type_variants.get_instance_specific_resource_requirements(
instance_type
)
if instance_type
and getattr(model_specs, "hosting_instance_type_variants", None) is not None

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could we simplify to hasattr()?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this because model_specs.hosting_instance_type_variants could be defined but equal None

else {}
)

default_resource_requirements = {
**default_resource_requirements,
**instance_specific_resource_requirements,
}

if is_dynamic_container_deployment_supported:
requests = {}
if "num_accelerators" in default_resource_requirements:
requests["num_accelerators"] = default_resource_requirements["num_accelerators"]
if "min_memory_mb" in default_resource_requirements:
requests["memory"] = default_resource_requirements["min_memory_mb"]
if "num_cpus" in default_resource_requirements:
requests["num_cpus"] = default_resource_requirements["num_cpus"]

limits = {}
if "max_memory_mb" in default_resource_requirements:
limits["memory"] = default_resource_requirements["max_memory_mb"]
return ResourceRequirements(requests=requests, limits=limits)

all_resource_requirement_kwargs = {}

for (
requirement_type,
spec_field_to_resource_requirement_map,
) in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.items():
requirement_kwargs = {}
for spec_field, resource_requirement in spec_field_to_resource_requirement_map.items():
if spec_field in default_resource_requirements:
requirement_kwargs[resource_requirement[0]] = default_resource_requirements[
spec_field
]

all_resource_requirement_kwargs[requirement_type] = requirement_kwargs

return ResourceRequirements(**all_resource_requirement_kwargs)
return None
1 change: 1 addition & 0 deletions src/sagemaker/jumpstart/factory/model.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -481,6 +481,7 @@ def _add_resources_to_kwargs(kwargs: JumpStartModelInitKwargs) -> JumpStartModel
tolerate_deprecated_model=kwargs.tolerate_deprecated_model,
tolerate_vulnerable_model=kwargs.tolerate_vulnerable_model,
sagemaker_session=kwargs.sagemaker_session,
instance_type=kwargs.instance_type,
)

return kwargs
Expand Down
23 changes: 23 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,29 @@ def get_instance_specific_artifact_key(self, instance_type: str) -> Optional[str
instance_type=instance_type, property_name="artifact_key"
)

def get_instance_specific_resource_requirements(self, instance_type: str) -> Optional[str]:
"""Returns instance specific resource requirements.

If a value exists for both the instance family and instance type, the instance type value
is chosen.
"""

instance_specific_resource_requirements: dict = (
self.variants.get(instance_type, {})
.get("properties", {})
.get("resource_requirements", {})
)

instance_type_family = get_instance_type_family(instance_type)

instance_family_resource_requirements: dict = (
self.variants.get(instance_type_family, {})
.get("properties", {})
.get("resource_requirements", {})
)

return {**instance_family_resource_requirements, **instance_specific_resource_requirements}

def _get_instance_specific_property(
self, instance_type: str, property_name: str
) -> Optional[str]:
Expand Down
7 changes: 6 additions & 1 deletion src/sagemaker/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

import logging
from typing import Optional
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

from sagemaker.jumpstart import utils as jumpstart_utils
from sagemaker.jumpstart import artifacts
Expand All@@ -33,7 +34,8 @@ def retrieve_default(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> str:
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model matching the given arguments.

Args:
Expand All@@ -56,6 +58,8 @@ def retrieve_default(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model.

Expand All@@ -79,4 +83,5 @@ def retrieve_default(
tolerate_vulnerable_model,
tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
instance_type=instance_type,
)
20 changes: 20 additions & 0 deletions tests/unit/sagemaker/jumpstart/constants.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -840,8 +840,22 @@
"model_package_arn": "$gpu_model_package_arn",
}
},
"g5": {
"properties": {
"resource_requirements": {
"num_accelerators": 888810,
"randon-field-2": 2222,
}
}
},
"m2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"c2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"ml.g5.xlarge": {
"properties": {
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"},
"resource_requirements": {"num_accelerators": 10},
}
},
"ml.g5.48xlarge": {
"properties": {"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"}}
},
Expand All@@ -857,6 +871,12 @@
"framework_version": "1.5.0",
"py_version": "py3",
},
"dynamic_container_deployment_supported": True,
"hosting_resource_requirements": {
"min_memory_mb": 81999,
"num_accelerators": 1,
"random_field_1": 1,
},
"hosting_artifact_key": "pytorch-infer/infer-pytorch-ic-mobilenet-v2.tar.gz",
"training_artifact_key": "pytorch-training/train-pytorch-ic-mobilenet-v2.tar.gz",
"hosting_script_key": "source-directory-tarballs/pytorch/inference/ic/v1.0.0/sourcedir.tar.gz",
Expand Down
23 changes: 23 additions & 0 deletions tests/unit/sagemaker/jumpstart/test_types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
"variants": {
"ml.p2.12xlarge": {
"properties": {
"resource_requirements": {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9},
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "4"},
"supported_inference_instance_types": ["ml.p5.xlarge"],
"default_inference_instance_type": "ml.p5.xlarge",
Expand All@@ -60,6 +61,11 @@
"p2": {
"regional_properties": {"image_uri": "$gpu_image_uri"},
"properties": {
"resource_requirements": {
"req2": {"2": 5, "9": 999},
"req3": 999,
"req4": "blah",
},
"supported_inference_instance_types": ["ml.p2.xlarge", "ml.p3.xlarge"],
"default_inference_instance_type": "ml.p2.xlarge",
"metrics": [
Expand DownExpand Up@@ -879,3 +885,20 @@ def test_jumpstart_training_artifact_key_instance_variants():
)
is None
)


def test_jumpstart_resource_requirements_instance_variants():
assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.xlarge"
) == {"req2": {"2": 5, "9": 999}, "req3": 999, "req4": "blah"}

assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.12xlarge"
) == {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9, "req4": "blah"}

assert (
INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p99.12xlarge"
)
== {}
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,10 @@
import pytest

from sagemaker import resource_requirements
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements
from sagemaker.jumpstart.artifacts.resource_requirements import (
REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP,
)

from tests.unit.sagemaker.jumpstart.utils import get_spec_from_base_spec, get_special_model_spec

Expand DownExpand Up@@ -50,6 +54,55 @@ def test_jumpstart_resource_requirements(patched_get_model_specs):
patched_get_model_specs.reset_mock()


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_resource_requirements_instance_type_variants(patched_get_model_specs):

patched_get_model_specs.side_effect = get_special_model_spec
region = "us-west-2"
mock_client = boto3.client("s3")
mock_session = Mock(s3_client=mock_client)

model_id, model_version = "variant-model", "*"
default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 10,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 888810,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.f9.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 1,
}


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
patched_get_model_specs.side_effect = get_special_model_spec
Expand DownExpand Up@@ -80,3 +133,18 @@ def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
resource_requirements.retrieve_default(
region=region, model_id=model_id, model_version=model_version, scope="training"
)


def test_jumpstart_supports_all_resource_requirement_fields():

all_tracked_resource_requirement_fields = {
field
for requirements in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.values()
for _, field in requirements.values()
}

excluded_resource_requirement_fields = {"requests", "limits"}
assert (
set(ResourceRequirements().__dict__.keys()) - excluded_resource_requirement_fields
== all_tracked_resource_requirement_fields
)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
66 changes: 52 additions & 14 deletions src/sagemaker/jumpstart/artifacts/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
"""This module contains functions for obtaining JumpStart resoure requirements."""
from __future__ import absolute_import

from typing import Optional
from typing import Dict, Optional, Tuple

from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
Expand All@@ -28,6 +28,20 @@
from sagemaker.session import Session
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP: Dict[
str, Dict[str, Tuple[str, str]]
] = {
"requests": {
"num_accelerators": ("num_accelerators", "num_accelerators"),
"num_cpus": ("num_cpus", "num_cpus"),
"copies": ("copies", "copy_count"),
"min_memory_mb": ("memory", "min_memory"),
},
"limits": {
"max_memory_mb": ("memory", "max_memory"),
},
}


def _retrieve_default_resources(
model_id: str,
Expand All@@ -37,6 +51,7 @@ def _retrieve_default_resources(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model.

Expand All@@ -60,6 +75,8 @@ def _retrieve_default_resources(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model or None.

Expand DownExpand Up@@ -87,23 +104,44 @@ def _retrieve_default_resources(
is_dynamic_container_deployment_supported = (
model_specs.dynamic_container_deployment_supported
)
default_resource_requirements = model_specs.hosting_resource_requirements
default_resource_requirements: Dict[str, int] = (
model_specs.hosting_resource_requirements or {}
)
else:
raise NotImplementedError(
f"Unsupported script scope for retrieving default resource requirements: '{scope}'"
)

instance_specific_resource_requirements: Dict[str, int] = (
model_specs.hosting_instance_type_variants.get_instance_specific_resource_requirements(
instance_type
)
if instance_type
and getattr(model_specs, "hosting_instance_type_variants", None) is not None

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could we simplify to hasattr()?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this because model_specs.hosting_instance_type_variants could be defined but equal None

else {}
)

default_resource_requirements = {
**default_resource_requirements,
**instance_specific_resource_requirements,
}

if is_dynamic_container_deployment_supported:
requests = {}
if "num_accelerators" in default_resource_requirements:
requests["num_accelerators"] = default_resource_requirements["num_accelerators"]
if "min_memory_mb" in default_resource_requirements:
requests["memory"] = default_resource_requirements["min_memory_mb"]
if "num_cpus" in default_resource_requirements:
requests["num_cpus"] = default_resource_requirements["num_cpus"]

limits = {}
if "max_memory_mb" in default_resource_requirements:
limits["memory"] = default_resource_requirements["max_memory_mb"]
return ResourceRequirements(requests=requests, limits=limits)

all_resource_requirement_kwargs = {}

for (
requirement_type,
spec_field_to_resource_requirement_map,
) in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.items():
requirement_kwargs = {}
for spec_field, resource_requirement in spec_field_to_resource_requirement_map.items():
if spec_field in default_resource_requirements:
requirement_kwargs[resource_requirement[0]] = default_resource_requirements[
spec_field
]

all_resource_requirement_kwargs[requirement_type] = requirement_kwargs

return ResourceRequirements(**all_resource_requirement_kwargs)
return None
1 change: 1 addition & 0 deletions src/sagemaker/jumpstart/factory/model.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -481,6 +481,7 @@ def _add_resources_to_kwargs(kwargs: JumpStartModelInitKwargs) -> JumpStartModel
tolerate_deprecated_model=kwargs.tolerate_deprecated_model,
tolerate_vulnerable_model=kwargs.tolerate_vulnerable_model,
sagemaker_session=kwargs.sagemaker_session,
instance_type=kwargs.instance_type,
)

return kwargs
Expand Down
23 changes: 23 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,29 @@ def get_instance_specific_artifact_key(self, instance_type: str) -> Optional[str
instance_type=instance_type, property_name="artifact_key"
)

def get_instance_specific_resource_requirements(self, instance_type: str) -> Optional[str]:
"""Returns instance specific resource requirements.

If a value exists for both the instance family and instance type, the instance type value
is chosen.
"""

instance_specific_resource_requirements: dict = (
self.variants.get(instance_type, {})
.get("properties", {})
.get("resource_requirements", {})
)

instance_type_family = get_instance_type_family(instance_type)

instance_family_resource_requirements: dict = (
self.variants.get(instance_type_family, {})
.get("properties", {})
.get("resource_requirements", {})
)

return {**instance_family_resource_requirements, **instance_specific_resource_requirements}

def _get_instance_specific_property(
self, instance_type: str, property_name: str
) -> Optional[str]:
Expand Down
7 changes: 6 additions & 1 deletion src/sagemaker/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

import logging
from typing import Optional
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

from sagemaker.jumpstart import utils as jumpstart_utils
from sagemaker.jumpstart import artifacts
Expand All@@ -33,7 +34,8 @@ def retrieve_default(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> str:
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model matching the given arguments.

Args:
Expand All@@ -56,6 +58,8 @@ def retrieve_default(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model.

Expand All@@ -79,4 +83,5 @@ def retrieve_default(
tolerate_vulnerable_model,
tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
instance_type=instance_type,
)
20 changes: 20 additions & 0 deletions tests/unit/sagemaker/jumpstart/constants.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -840,8 +840,22 @@
"model_package_arn": "$gpu_model_package_arn",
}
},
"g5": {
"properties": {
"resource_requirements": {
"num_accelerators": 888810,
"randon-field-2": 2222,
}
}
},
"m2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"c2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"ml.g5.xlarge": {
"properties": {
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"},
"resource_requirements": {"num_accelerators": 10},
}
},
"ml.g5.48xlarge": {
"properties": {"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"}}
},
Expand All@@ -857,6 +871,12 @@
"framework_version": "1.5.0",
"py_version": "py3",
},
"dynamic_container_deployment_supported": True,
"hosting_resource_requirements": {
"min_memory_mb": 81999,
"num_accelerators": 1,
"random_field_1": 1,
},
"hosting_artifact_key": "pytorch-infer/infer-pytorch-ic-mobilenet-v2.tar.gz",
"training_artifact_key": "pytorch-training/train-pytorch-ic-mobilenet-v2.tar.gz",
"hosting_script_key": "source-directory-tarballs/pytorch/inference/ic/v1.0.0/sourcedir.tar.gz",
Expand Down
23 changes: 23 additions & 0 deletions tests/unit/sagemaker/jumpstart/test_types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
"variants": {
"ml.p2.12xlarge": {
"properties": {
"resource_requirements": {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9},
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "4"},
"supported_inference_instance_types": ["ml.p5.xlarge"],
"default_inference_instance_type": "ml.p5.xlarge",
Expand All@@ -60,6 +61,11 @@
"p2": {
"regional_properties": {"image_uri": "$gpu_image_uri"},
"properties": {
"resource_requirements": {
"req2": {"2": 5, "9": 999},
"req3": 999,
"req4": "blah",
},
"supported_inference_instance_types": ["ml.p2.xlarge", "ml.p3.xlarge"],
"default_inference_instance_type": "ml.p2.xlarge",
"metrics": [
Expand DownExpand Up@@ -879,3 +885,20 @@ def test_jumpstart_training_artifact_key_instance_variants():
)
is None
)


def test_jumpstart_resource_requirements_instance_variants():
assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.xlarge"
) == {"req2": {"2": 5, "9": 999}, "req3": 999, "req4": "blah"}

assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.12xlarge"
) == {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9, "req4": "blah"}

assert (
INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p99.12xlarge"
)
== {}
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,10 @@
import pytest

from sagemaker import resource_requirements
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements
from sagemaker.jumpstart.artifacts.resource_requirements import (
REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP,
)

from tests.unit.sagemaker.jumpstart.utils import get_spec_from_base_spec, get_special_model_spec

Expand DownExpand Up@@ -50,6 +54,55 @@ def test_jumpstart_resource_requirements(patched_get_model_specs):
patched_get_model_specs.reset_mock()


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_resource_requirements_instance_type_variants(patched_get_model_specs):

patched_get_model_specs.side_effect = get_special_model_spec
region = "us-west-2"
mock_client = boto3.client("s3")
mock_session = Mock(s3_client=mock_client)

model_id, model_version = "variant-model", "*"
default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 10,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 888810,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.f9.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 1,
}


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
patched_get_model_specs.side_effect = get_special_model_spec
Expand DownExpand Up@@ -80,3 +133,18 @@ def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
resource_requirements.retrieve_default(
region=region, model_id=model_id, model_version=model_version, scope="training"
)


def test_jumpstart_supports_all_resource_requirement_fields():

all_tracked_resource_requirement_fields = {
field
for requirements in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.values()
for _, field in requirements.values()
}

excluded_resource_requirement_fields = {"requests", "limits"}
assert (
set(ResourceRequirements().__dict__.keys()) - excluded_resource_requirement_fields
== all_tracked_resource_requirement_fields
)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
66 changes: 52 additions & 14 deletions src/sagemaker/jumpstart/artifacts/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
"""This module contains functions for obtaining JumpStart resoure requirements."""
from __future__ import absolute_import

from typing import Optional
from typing import Dict, Optional, Tuple

from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
Expand All@@ -28,6 +28,20 @@
from sagemaker.session import Session
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP: Dict[
str, Dict[str, Tuple[str, str]]
] = {
"requests": {
"num_accelerators": ("num_accelerators", "num_accelerators"),
"num_cpus": ("num_cpus", "num_cpus"),
"copies": ("copies", "copy_count"),
"min_memory_mb": ("memory", "min_memory"),
},
"limits": {
"max_memory_mb": ("memory", "max_memory"),
},
}


def _retrieve_default_resources(
model_id: str,
Expand All@@ -37,6 +51,7 @@ def _retrieve_default_resources(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model.

Expand All@@ -60,6 +75,8 @@ def _retrieve_default_resources(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model or None.

Expand DownExpand Up@@ -87,23 +104,44 @@ def _retrieve_default_resources(
is_dynamic_container_deployment_supported = (
model_specs.dynamic_container_deployment_supported
)
default_resource_requirements = model_specs.hosting_resource_requirements
default_resource_requirements: Dict[str, int] = (
model_specs.hosting_resource_requirements or {}
)
else:
raise NotImplementedError(
f"Unsupported script scope for retrieving default resource requirements: '{scope}'"
)

instance_specific_resource_requirements: Dict[str, int] = (
model_specs.hosting_instance_type_variants.get_instance_specific_resource_requirements(
instance_type
)
if instance_type
and getattr(model_specs, "hosting_instance_type_variants", None) is not None

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could we simplify to hasattr()?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this because model_specs.hosting_instance_type_variants could be defined but equal None

else {}
)

default_resource_requirements = {
**default_resource_requirements,
**instance_specific_resource_requirements,
}

if is_dynamic_container_deployment_supported:
requests = {}
if "num_accelerators" in default_resource_requirements:
requests["num_accelerators"] = default_resource_requirements["num_accelerators"]
if "min_memory_mb" in default_resource_requirements:
requests["memory"] = default_resource_requirements["min_memory_mb"]
if "num_cpus" in default_resource_requirements:
requests["num_cpus"] = default_resource_requirements["num_cpus"]

limits = {}
if "max_memory_mb" in default_resource_requirements:
limits["memory"] = default_resource_requirements["max_memory_mb"]
return ResourceRequirements(requests=requests, limits=limits)

all_resource_requirement_kwargs = {}

for (
requirement_type,
spec_field_to_resource_requirement_map,
) in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.items():
requirement_kwargs = {}
for spec_field, resource_requirement in spec_field_to_resource_requirement_map.items():
if spec_field in default_resource_requirements:
requirement_kwargs[resource_requirement[0]] = default_resource_requirements[
spec_field
]

all_resource_requirement_kwargs[requirement_type] = requirement_kwargs

return ResourceRequirements(**all_resource_requirement_kwargs)
return None
1 change: 1 addition & 0 deletions src/sagemaker/jumpstart/factory/model.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -481,6 +481,7 @@ def _add_resources_to_kwargs(kwargs: JumpStartModelInitKwargs) -> JumpStartModel
tolerate_deprecated_model=kwargs.tolerate_deprecated_model,
tolerate_vulnerable_model=kwargs.tolerate_vulnerable_model,
sagemaker_session=kwargs.sagemaker_session,
instance_type=kwargs.instance_type,
)

return kwargs
Expand Down
23 changes: 23 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,29 @@ def get_instance_specific_artifact_key(self, instance_type: str) -> Optional[str
instance_type=instance_type, property_name="artifact_key"
)

def get_instance_specific_resource_requirements(self, instance_type: str) -> Optional[str]:
"""Returns instance specific resource requirements.

If a value exists for both the instance family and instance type, the instance type value
is chosen.
"""

instance_specific_resource_requirements: dict = (
self.variants.get(instance_type, {})
.get("properties", {})
.get("resource_requirements", {})
)

instance_type_family = get_instance_type_family(instance_type)

instance_family_resource_requirements: dict = (
self.variants.get(instance_type_family, {})
.get("properties", {})
.get("resource_requirements", {})
)

return {**instance_family_resource_requirements, **instance_specific_resource_requirements}

def _get_instance_specific_property(
self, instance_type: str, property_name: str
) -> Optional[str]:
Expand Down
7 changes: 6 additions & 1 deletion src/sagemaker/resource_requirements.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

import logging
from typing import Optional
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements

from sagemaker.jumpstart import utils as jumpstart_utils
from sagemaker.jumpstart import artifacts
Expand All@@ -33,7 +34,8 @@ def retrieve_default(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> str:
instance_type: Optional[str] = None,
) -> ResourceRequirements:
"""Retrieves the default resource requirements for the model matching the given arguments.

Args:
Expand All@@ -56,6 +58,8 @@ def retrieve_default(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
host requirements specific for the instance type.
Returns:
str: The default resource requirements to use for the model.

Expand All@@ -79,4 +83,5 @@ def retrieve_default(
tolerate_vulnerable_model,
tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
instance_type=instance_type,
)
20 changes: 20 additions & 0 deletions tests/unit/sagemaker/jumpstart/constants.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -840,8 +840,22 @@
"model_package_arn": "$gpu_model_package_arn",
}
},
"g5": {
"properties": {
"resource_requirements": {
"num_accelerators": 888810,
"randon-field-2": 2222,
}
}
},
"m2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"c2": {"regional_properties": {"image_uri": "$cpu_image_uri"}},
"ml.g5.xlarge": {
"properties": {
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"},
"resource_requirements": {"num_accelerators": 10},
}
},
"ml.g5.48xlarge": {
"properties": {"environment_variables": {"TENSOR_PARALLEL_DEGREE": "8"}}
},
Expand All@@ -857,6 +871,12 @@
"framework_version": "1.5.0",
"py_version": "py3",
},
"dynamic_container_deployment_supported": True,
"hosting_resource_requirements": {
"min_memory_mb": 81999,
"num_accelerators": 1,
"random_field_1": 1,
},
"hosting_artifact_key": "pytorch-infer/infer-pytorch-ic-mobilenet-v2.tar.gz",
"training_artifact_key": "pytorch-training/train-pytorch-ic-mobilenet-v2.tar.gz",
"hosting_script_key": "source-directory-tarballs/pytorch/inference/ic/v1.0.0/sourcedir.tar.gz",
Expand Down
23 changes: 23 additions & 0 deletions tests/unit/sagemaker/jumpstart/test_types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
"variants": {
"ml.p2.12xlarge": {
"properties": {
"resource_requirements": {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9},
"environment_variables": {"TENSOR_PARALLEL_DEGREE": "4"},
"supported_inference_instance_types": ["ml.p5.xlarge"],
"default_inference_instance_type": "ml.p5.xlarge",
Expand All@@ -60,6 +61,11 @@
"p2": {
"regional_properties": {"image_uri": "$gpu_image_uri"},
"properties": {
"resource_requirements": {
"req2": {"2": 5, "9": 999},
"req3": 999,
"req4": "blah",
},
"supported_inference_instance_types": ["ml.p2.xlarge", "ml.p3.xlarge"],
"default_inference_instance_type": "ml.p2.xlarge",
"metrics": [
Expand DownExpand Up@@ -879,3 +885,20 @@ def test_jumpstart_training_artifact_key_instance_variants():
)
is None
)


def test_jumpstart_resource_requirements_instance_variants():
assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.xlarge"
) == {"req2": {"2": 5, "9": 999}, "req3": 999, "req4": "blah"}

assert INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p2.12xlarge"
) == {"req1": 1, "req2": {"1": 2, "2": 3}, "req3": 9, "req4": "blah"}

assert (
INSTANCE_TYPE_VARIANT.get_instance_specific_resource_requirements(
instance_type="ml.p99.12xlarge"
)
== {}
)
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,10 @@
import pytest

from sagemaker import resource_requirements
from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements
from sagemaker.jumpstart.artifacts.resource_requirements import (
REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP,
)

from tests.unit.sagemaker.jumpstart.utils import get_spec_from_base_spec, get_special_model_spec

Expand DownExpand Up@@ -50,6 +54,55 @@ def test_jumpstart_resource_requirements(patched_get_model_specs):
patched_get_model_specs.reset_mock()


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_resource_requirements_instance_type_variants(patched_get_model_specs):

patched_get_model_specs.side_effect = get_special_model_spec
region = "us-west-2"
mock_client = boto3.client("s3")
mock_session = Mock(s3_client=mock_client)

model_id, model_version = "variant-model", "*"
default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 10,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.g5.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 888810,
}

default_inference_resource_requirements = resource_requirements.retrieve_default(
region=region,
model_id=model_id,
model_version=model_version,
scope="inference",
sagemaker_session=mock_session,
instance_type="ml.f9.555xlarge",
)
assert default_inference_resource_requirements.requests == {
"memory": 81999,
"num_accelerators": 1,
}


@patch("sagemaker.jumpstart.accessors.JumpStartModelsAccessor.get_model_specs")
def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
patched_get_model_specs.side_effect = get_special_model_spec
Expand DownExpand Up@@ -80,3 +133,18 @@ def test_jumpstart_no_supported_resource_requirements(patched_get_model_specs):
resource_requirements.retrieve_default(
region=region, model_id=model_id, model_version=model_version, scope="training"
)


def test_jumpstart_supports_all_resource_requirement_fields():

all_tracked_resource_requirement_fields = {
field
for requirements in REQUIREMENT_TYPE_TO_SPEC_FIELD_NAME_TO_RESOURCE_REQUIREMENT_NAME_MAP.values()
for _, field in requirements.values()
}

excluded_resource_requirement_fields = {"requests", "limits"}
assert (
set(ResourceRequirements().__dict__.keys()) - excluded_resource_requirement_fields
== all_tracked_resource_requirement_fields
)